[qmailadmin-cvs] qmailadmin ChangeLog,1.12,1.13 qmailadmin.c,1.5,1.6 template.c,1.6,1.7 user.c,1.9,1.10

[<tom...@pr...>]

Update of /cvsroot/qmailadmin/qmailadmin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22787

Modified Files:
	ChangeLog qmailadmin.c template.c user.c 
Log Message:
undef PACKAGE_* macros defined in vpopmail_config.h to avoid warnings when redefined in QmailAdmin's config.h. [883245]

Index: ChangeLog
===================================================================
RCS file: /cvsroot/qmailadmin/qmailadmin/ChangeLog,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- ChangeLog	24 Jan 2004 15:55:16 -0000	1.12
+++ ChangeLog	26 Jan 2004 00:41:07 -0000	1.13
@@ -7,6 +7,8 @@
 	- Changes to Makefile to avoid copying CVS directories on install.
 	  Fixes previous attempt that wasn't compatible with all platforms.
 	- Update all mentions of --with-htmllibdir to --enable-htmllibdir.
+	- undef some macros defined in vpopmail_config.h and later defined
+	  in QmailAdmin's config.h (PACKAGE_*). [883245]
 
 1.2.0-rc3 - released 19-Jan-04
 

Index: qmailadmin.c
===================================================================
RCS file: /cvsroot/qmailadmin/qmailadmin/qmailadmin.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- qmailadmin.c	8 Dec 2003 18:55:09 -0000	1.5
+++ qmailadmin.c	26 Jan 2004 00:41:07 -0000	1.6
@@ -25,10 +25,15 @@
 #include <unistd.h>
 #include <pwd.h>
 #include <dirent.h>
+#include <vpopmail_config.h>
+/* undef some macros that get redefined in config.h below */
+#undef PACKAGE_NAME
+#undef PACKAGE_STRING
+#undef PACKAGE_TARNAME
+#undef PACKAGE_VERSION
 #include "config.h"
 #include "qmailadmin.h"
 #include <vpopmail.h>
-#include <vpopmail_config.h>
 #include <vauth.h>
 #include <vlimits.h>
 

Index: template.c
===================================================================
RCS file: /cvsroot/qmailadmin/qmailadmin/template.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- template.c	7 Jan 2004 15:36:26 -0000	1.6
+++ template.c	26 Jan 2004 00:41:07 -0000	1.7
@@ -27,6 +27,11 @@
 #include <dirent.h>
 #include <vpopmail.h>
 #include <vpopmail_config.h>
+/* undef some macros that get redefined in config.h below */
+#undef PACKAGE_NAME
+#undef PACKAGE_STRING
+#undef PACKAGE_TARNAME
+#undef PACKAGE_VERSION
 #include <vauth.h>
 #include "config.h"
 #include "qmailadmin.h"

Index: user.c
===================================================================
RCS file: /cvsroot/qmailadmin/qmailadmin/user.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- user.c	14 Jan 2004 15:57:42 -0000	1.9
+++ user.c	26 Jan 2004 00:41:07 -0000	1.10
@@ -26,11 +26,16 @@
 #include <pwd.h>
 #include <dirent.h>
 #include <errno.h>
+#include <vpopmail_config.h>
+/* undef some macros that get redefined in config.h below */
+#undef PACKAGE_NAME  
+#undef PACKAGE_STRING 
+#undef PACKAGE_TARNAME
+#undef PACKAGE_VERSION
 #include "config.h"
 #include "qmailadmin.h"
 #include "qmailadminx.h"
 #include "vpopmail.h"
-#include "vpopmail_config.h"
 #include "vauth.h"