mirror of
https://github.com/znc/znc.git
synced 2026-06-27 13:31:32 +02:00
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
This commit is contained in:
+1
-1
@@ -15,7 +15,7 @@ includedir := @includedir@
|
|||||||
sbindir := @sbindir@
|
sbindir := @sbindir@
|
||||||
localstatedir := @localstatedir@
|
localstatedir := @localstatedir@
|
||||||
CXX := @CXX@
|
CXX := @CXX@
|
||||||
CXXFLAGS := @CPPFLAGS@ @CXXFLAGS@
|
CXXFLAGS := @DEFS@ @CPPFLAGS@ @CXXFLAGS@
|
||||||
LDFLAGS := @LDFLAGS@
|
LDFLAGS := @LDFLAGS@
|
||||||
LIBS := @LIBS@
|
LIBS := @LIBS@
|
||||||
LIBZNC := @LIBZNC@
|
LIBZNC := @LIBZNC@
|
||||||
|
|||||||
+1
-1
@@ -17,7 +17,7 @@ sbindir := @sbindir@
|
|||||||
localstatedir := @localstatedir@
|
localstatedir := @localstatedir@
|
||||||
CXX := @CXX@
|
CXX := @CXX@
|
||||||
# CXXFLAGS are for the main binary, so don't use them here, use MODFLAGS instead
|
# 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@
|
MODLINK := @MODLINK@
|
||||||
LDFLAGS := @LDFLAGS@
|
LDFLAGS := @LDFLAGS@
|
||||||
# LIBS are not and should not be used in here.
|
# LIBS are not and should not be used in here.
|
||||||
|
|||||||
+1
-1
@@ -7,7 +7,7 @@ bindir="@bindir@"
|
|||||||
datadir="@datadir@"
|
datadir="@datadir@"
|
||||||
|
|
||||||
CXX="@CXX@"
|
CXX="@CXX@"
|
||||||
CXXFLAGS="@CPPFLAGS@ @MODFLAGS@ -I@prefix@/include/znc"
|
CXXFLAGS="@DEFS@ @CPPFLAGS@ @MODFLAGS@ -I@prefix@/include/znc"
|
||||||
MODLINK="@MODLINK@"
|
MODLINK="@MODLINK@"
|
||||||
# LIBS="@LIBS@"
|
# LIBS="@LIBS@"
|
||||||
# No libs needed, ZNC links against $LIBS and thus modules don't need to.
|
# No libs needed, ZNC links against $LIBS and thus modules don't need to.
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ datadir=@datadir@
|
|||||||
includedir=@includedir@
|
includedir=@includedir@
|
||||||
|
|
||||||
cxx=@CXX@
|
cxx=@CXX@
|
||||||
|
DEFS=@DEFS@
|
||||||
CPPFLAGS=@CPPFLAGS@
|
CPPFLAGS=@CPPFLAGS@
|
||||||
MODFLAGS=@MODFLAGS@
|
MODFLAGS=@MODFLAGS@
|
||||||
version=@PACKAGE_VERSION@
|
version=@PACKAGE_VERSION@
|
||||||
@@ -22,4 +23,4 @@ Name: ZNC
|
|||||||
Description: An advanced IRC proxy
|
Description: An advanced IRC proxy
|
||||||
Version: ${version}
|
Version: ${version}
|
||||||
URL: http://znc.in
|
URL: http://znc.in
|
||||||
Cflags: ${CPPFLAGS} ${MODFLAGS} ${INC_PATH}
|
Cflags: ${DEFS} ${CPPFLAGS} ${MODFLAGS} ${INC_PATH}
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ datadir=@datadir@
|
|||||||
includedir=@includedir@
|
includedir=@includedir@
|
||||||
|
|
||||||
cxx=@CXX@
|
cxx=@CXX@
|
||||||
|
DEFS=@DEFS@
|
||||||
CPPFLAGS=@CPPFLAGS@
|
CPPFLAGS=@CPPFLAGS@
|
||||||
MODFLAGS=@MODFLAGS@
|
MODFLAGS=@MODFLAGS@
|
||||||
version=@PACKAGE_VERSION@
|
version=@PACKAGE_VERSION@
|
||||||
@@ -20,4 +21,4 @@ Name: ZNC
|
|||||||
Description: An advanced IRC proxy
|
Description: An advanced IRC proxy
|
||||||
Version: ${version}
|
Version: ${version}
|
||||||
URL: http://znc.in
|
URL: http://znc.in
|
||||||
Cflags: ${CPPFLAGS} ${MODFLAGS} ${INC_PATH}
|
Cflags: ${DEFS} ${CPPFLAGS} ${MODFLAGS} ${INC_PATH}
|
||||||
|
|||||||
Reference in New Issue
Block a user