From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Mon, 5 Nov 2012 20:38:25 +0000 (+0000)
Subject: Fix redefinition issues by undefining conflicting defines if were building a module
X-Git-Tag: release_3_0_0_beta1~1601^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f775518e3ed7551e1923a20634be4abb6cd69a92;p=thirdparty%2Ffreeradius-server.git

Fix redefinition issues by undefining conflicting defines if were building a module
---

diff --git a/configure.in b/configure.in
index 29532ee41cc..7f26156090d 100644
--- a/configure.in
+++ b/configure.in
@@ -1199,6 +1199,12 @@ dnl #  Configure in any module directories.
 dnl #
 dnl #############################################################
 
+dnl ############################################################
+dnl # Remove any conflicting definitions if autoconf.h
+dnl # is being included by a module.
+dnl #############################################################
+AH_BOTTOM([#include <freeradius-devel/automask.h>])
+
 mysubdirs=""
 if test "x$EXPERIMENTAL" = "xyes"; then
   bar=`ls -1 "${srcdir}"/src/modules/rlm_*/configure | sed 's%/configure%%'`
diff --git a/src/include/autoconf.h.in b/src/include/autoconf.h.in
index e41ab8b278f..91b2b694448 100644
--- a/src/include/autoconf.h.in
+++ b/src/include/autoconf.h.in
@@ -530,3 +530,5 @@
 
 /* define to something if you don't have ut_xtime in struct utmpx */
 #undef ut_xtime
+
+#include <freeradius-devel/automask.h>
diff --git a/src/include/automask.h b/src/include/automask.h
new file mode 100644
index 00000000000..baca51d22f2
--- /dev/null
+++ b/src/include/automask.h
@@ -0,0 +1,21 @@
+/*
+ *  C Preprocessor definitions we do *NOT* want to leave defined autoconf.h
+ *  Which are dependent on where the header is being used.
+ *
+ *  Version: $Id$
+ */
+
+
+/*
+ *  If were building a module we may have local PACKAGE_* defines if  
+ *  AC_INIT() was called with full arguments.  
+ */
+#ifdef IS_MODULE
+#	undef PACKAGE_BUGREPORT
+#	undef PACKAGE_NAME
+#	undef PACKAGE_STRING
+#	undef PACKAGE_TARNAME
+#	undef PACKAGE_URL
+#	undef PACKAGE_VERSION
+#endif
+
diff --git a/src/modules/rules.mak b/src/modules/rules.mak
index a6c4b5e5393..d8b98b2bd84 100644
--- a/src/modules/rules.mak
+++ b/src/modules/rules.mak
@@ -44,6 +44,8 @@ LT_OBJS		:= $(patsubst %.c,%.lo,$(filter %.c,$(SRCS)))
 LT_OBJS		+= $(patsubst %.cxx,%.lo,$(filter %.cxx,$(SRCS)))
 LT_OBJS		+= $(patsubst %.cpp,%.lo,$(filter %.cpp,$(SRCS)))
 CFLAGS		+= -I$(top_builddir)/src $(INCLTDL)
+CFLAGS		+= -DIS_MODULE=1
+
 
 #######################################################################
 #