From 8a1c2a4711745fbd97647cd3dab12e6680b9576e Mon Sep 17 00:00:00 2001
From: psychon <psychon@726aef4b-f618-498e-8847-2d620e286838>
Date: Sun, 2 Jan 2011 17:15:21 +0000
Subject: [PATCH] Include @DEFS@ into our compiler call

On most systems, this should only result in some useless defines being added to
the compiler's command line:

-DPACKAGE_NAME=\"znc\" -DPACKAGE_TARNAME=\"znc\" -DPACKAGE_VERSION=\"0.097\"
-DPACKAGE_STRING=\"znc\ 0.097\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE_URL=\"\"

However, on some weird arches like e.g. x86, this will make AC_SYS_LARGEFILE
actually work, because that macro adds "-D_FILE_OFFSET_BITS=64" to @DEPS@.

This was found by SilverLeo because modpython didn't compile for him, thanks. :)
(python has "#define _FILE_OFFSET_BITS 64" in pyconfig.h)

git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@2242 726aef4b-f618-498e-8847-2d620e286838
---
 Makefile.in           | 2 +-
 modules/Makefile.in   | 2 +-
 znc-config.in         | 2 +-
 znc-uninstalled.pc.in | 3 ++-
 znc.pc.in             | 3 ++-
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 32c6030f..554b2f48 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -15,7 +15,7 @@ includedir  := @includedir@
 sbindir     := @sbindir@
 localstatedir := @localstatedir@
 CXX      := @CXX@
-CXXFLAGS := @CPPFLAGS@ @CXXFLAGS@
+CXXFLAGS := @DEFS@ @CPPFLAGS@ @CXXFLAGS@
 LDFLAGS  := @LDFLAGS@
 LIBS     := @LIBS@
 LIBZNC   := @LIBZNC@
diff --git a/modules/Makefile.in b/modules/Makefile.in
index e53390e8..77822f85 100644
--- a/modules/Makefile.in
+++ b/modules/Makefile.in
@@ -17,7 +17,7 @@ sbindir     := @sbindir@
 localstatedir := @localstatedir@
 CXX      := @CXX@
 # CXXFLAGS are for the main binary, so don't use them here, use MODFLAGS instead
-MODFLAGS := @CPPFLAGS@ @MODFLAGS@ -I$(srcdir)/..
+MODFLAGS := @DEFS@ @CPPFLAGS@ @MODFLAGS@ -I$(srcdir)/..
 MODLINK  := @MODLINK@
 LDFLAGS  := @LDFLAGS@
 # LIBS are not and should not be used in here.
diff --git a/znc-config.in b/znc-config.in
index 9454e18d..1bb3f798 100755
--- a/znc-config.in
+++ b/znc-config.in
@@ -7,7 +7,7 @@ bindir="@bindir@"
 datadir="@datadir@"
 
 CXX="@CXX@"
-CXXFLAGS="@CPPFLAGS@ @MODFLAGS@ -I@prefix@/include/znc"
+CXXFLAGS="@DEFS@ @CPPFLAGS@ @MODFLAGS@ -I@prefix@/include/znc"
 MODLINK="@MODLINK@"
 # LIBS="@LIBS@"
 # No libs needed, ZNC links against $LIBS and thus modules don't need to.
diff --git a/znc-uninstalled.pc.in b/znc-uninstalled.pc.in
index 73570abb..6e0f9ade 100644
--- a/znc-uninstalled.pc.in
+++ b/znc-uninstalled.pc.in
@@ -7,6 +7,7 @@ datadir=@datadir@
 includedir=@includedir@
 
 cxx=@CXX@
+DEFS=@DEFS@
 CPPFLAGS=@CPPFLAGS@
 MODFLAGS=@MODFLAGS@
 version=@PACKAGE_VERSION@
@@ -22,4 +23,4 @@ Name: ZNC
 Description: An advanced IRC proxy
 Version: ${version}
 URL: http://znc.in
-Cflags: ${CPPFLAGS} ${MODFLAGS} ${INC_PATH}
+Cflags: ${DEFS} ${CPPFLAGS} ${MODFLAGS} ${INC_PATH}
diff --git a/znc.pc.in b/znc.pc.in
index c4588bea..88c6f614 100644
--- a/znc.pc.in
+++ b/znc.pc.in
@@ -7,6 +7,7 @@ datadir=@datadir@
 includedir=@includedir@
 
 cxx=@CXX@
+DEFS=@DEFS@
 CPPFLAGS=@CPPFLAGS@
 MODFLAGS=@MODFLAGS@
 version=@PACKAGE_VERSION@
@@ -20,4 +21,4 @@ Name: ZNC
 Description: An advanced IRC proxy
 Version: ${version}
 URL: http://znc.in
-Cflags: ${CPPFLAGS} ${MODFLAGS} ${INC_PATH}
+Cflags: ${DEFS} ${CPPFLAGS} ${MODFLAGS} ${INC_PATH}