Add PIC/PCH condition in stdinc.h.

charybdis-ircd · Aug 13, 2016 · 0e62b5a · 0e62b5a
1 parent 1ffc492
commit 0e62b5a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/configure.ac b/configure.ac
@@ -197,6 +197,7 @@ AC_ARG_ENABLE(pch, AC_HELP_STRING([--disable-pch], [Disable precompiled header g
 	AC_MSG_RESULT([no])
 ], [
 	build_pch="yes"
+	CPPDEFINE([PCH])
 	AC_MSG_RESULT([yes])
 ])
 

diff --git a/include/ircd/stdinc.h b/include/ircd/stdinc.h
@@ -21,7 +21,12 @@
  *
  */
 
+#if defined(PIC) && defined(PCH)
+#include <rb/rb.pic.h>
+#else
 #include <rb/rb.h>
+#endif
+
 #include "util.h"
 #include "defaults.h"
 #include "fs.h"
diff --git a/ircd/Makefile.am b/ircd/Makefile.am
@@ -11,10 +11,6 @@ AM_CPPFLAGS = \
 	@LTDLINCL@ \
 	@BOOST_CPPFLAGS@
 
-if BUILD_PCH
-AM_CPPFLAGS += -include $(top_srcdir)/include/rb/rb.pic.h
-endif
-
 if MINGW
 PLATFORM_LDFLAGS = -Wl,--enable-runtime-pseudo-reloc -export-symbols-regex '*'
 endif