Don't wire into "config.h.win32" files an indication of whether we have

GNU ADNS or not - set it based on whether ADNS_DIR is defined by
"config.nmake", and make "config.h.win32" files that specify whether we
have GNU ADNS dependent on "config.nmake".

Note in "config.nmake" that:

	if you have GNU ADNS, ADNS_DIR should be defined as the
	directory in which the ADNS .lib file resides;

	if you don't have GNU ADNS, ADNS_DIR shouldn't be defined.

svn path=/trunk/; revision=7860

diff --git a/Makefile.nmake b/Makefile.nmake
index 6cfa681b6b2e2ddfb01d31de2969e17e2c04d7a1..43040a5a6736ea6a1348af821781f875ccfe9f26 100644 (file)
--- a/Makefile.nmake
+++ b/Makefile.nmake
@@ -1,7 +1,7 @@
 ## Makefile for building ethereal.exe with Microsoft C and nmake
 ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake
 #
-# $Id: Makefile.nmake,v 1.306 2003/06/11 22:36:17 guy Exp $
+# $Id: Makefile.nmake,v 1.307 2003/06/12 09:45:42 guy Exp $
 
 include config.nmake
 include <win32.mak>
@@ -542,8 +542,12 @@ randpkt.exe        : $(randpkt_OBJECTS) $(EXTRA_OBJECTS)
                /OUT:randpkt.exe $(conflags) $(conlibsdll) $(LDFLAGS) /SUBSYSTEM:console $(randpkt_LIBS) $(randpkt_OBJECTS)
 <<
 
-config.h       : config.h.win32
-       sed -e s/@VERSION@/$(VERSION)/ < config.h.win32 > $@
+config.h       : config.h.win32 config.nmake
+!IFDEF ADNS_DIR
+       sed -e s/@VERSION@/$(VERSION)/ -e "s;@HAVE_GNU_ADNS@;#define HAVE_GNU_ADNS 1;" < config.h.win32 > $@
+!ELSE
+       sed -e s/@VERSION@/$(VERSION)/ -e "s;@HAVE_GNU_ADNS@;/* #undef HAVE_GNU_ADNS */;" < config.h.win32 > $@
+!ENDIF
 
 ps.c   : rdps.exe print.ps
        rdps print.ps ps.c

diff --git a/config.h.win32 b/config.h.win32
index d013fbe242244536beb5812f9707a37f8a5230aa..15b1380ff6e141ca3d3f1c3da4ac5b4a591b951a 100644 (file)
--- a/config.h.win32
+++ b/config.h.win32
@@ -1,4 +1,4 @@
-/* $Id: config.h.win32,v 1.39 2003/06/02 18:40:00 gerald Exp $ */
+/* $Id: config.h.win32,v 1.40 2003/06/12 09:45:42 guy Exp $ */
 /* config.h.win32 Generated manually. :-) */
 /* config.h.  Generated automatically by configure.  */
 /* config.h.in.  Generated automatically from configure.in by autoheader.  */
@@ -110,7 +110,7 @@
 #define HAVE_LIBZ 1
 
 /* Define to use GNU ADNS library */
-#define HAVE_GNU_ADNS 1
+@HAVE_GNU_ADNS@
 #define ADNS_JGAA_WIN32 1
 
 #ifndef WIN32

diff --git a/config.nmake b/config.nmake
index 4a5a79d383b6d1e6e4ffda6a96fc5a9d30da43f5..68bac6b3c57ccb62776c53b8400a882874cc5d56 100644 (file)
--- a/config.nmake
+++ b/config.nmake
@@ -1,4 +1,4 @@
-# $Id: config.nmake,v 1.40 2003/06/10 01:47:33 gerald Exp $
+# $Id: config.nmake,v 1.41 2003/06/12 09:45:42 guy Exp $
 
 VERSION=0.9.13
 RC_VERSION=0.9.13
@@ -12,6 +12,14 @@ GTK_DIR=C:\ethereal-win32-libs\gtk+
 ZLIB_DIR=C:\ethereal-win32-libs\zlib-1.1.3
 PCAP_DIR=C:\ethereal-win32-libs\WPdpack
 NET_SNMP_DIR=C:\ethereal-win32-libs\net-snmp-5.0.6
+
+#
+# If you have GNU ADNS, set this to the pathname of the directory in
+# which the GNU ADNS .lib file is stored.
+#
+# If you don't have GNU ADNS, comment this line out, so that ADNS_DIR
+# isn't defined.
+#
 ADNS_DIR=C:\ethereal-win32-libs\adns-1.0-win32-01
 
 COMMON_FILES_GNU=c:\program files\common files\gnu

diff --git a/epan/Makefile.nmake b/epan/Makefile.nmake
index 47c6f8e395c0124ebec836194a37a4ed6d493487..28186e967f8f0ebf83e622e4ade6a388bbd003e8 100644 (file)
--- a/epan/Makefile.nmake
+++ b/epan/Makefile.nmake
@@ -1,7 +1,7 @@
 ## Makefile for building ethereal.exe with Microsoft C and nmake
 ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake
 #
-# $Id: Makefile.nmake,v 1.24 2003/06/02 18:40:01 gerald Exp $
+# $Id: Makefile.nmake,v 1.25 2003/06/12 09:45:42 guy Exp $
 
 include ..\config.nmake
 
@@ -59,8 +59,12 @@ all: ftypes dfilter ethereal.lib
 ethereal.lib   : config.h $(OBJECTS)
        lib /out:ethereal.lib $(OBJECTS)
 
-config.h       : config.h.win32
-       sed -e s/@VERSION@/$(VERSION)/ < config.h.win32 > $@
+config.h       : config.h.win32 ..\config.nmake
+!IFDEF ADNS_DIR
+       sed -e s/@VERSION@/$(VERSION)/ -e "s;@HAVE_GNU_ADNS@;#define HAVE_GNU_ADNS 1;" < config.h.win32 > $@
+!ELSE
+       sed -e s/@VERSION@/$(VERSION)/ -e "s;@HAVE_GNU_ADNS@;/* #undef HAVE_GNU_ADNS */;" < config.h.win32 > $@
+!ENDIF
 
 clean:
        rm -f $(OBJECTS) ethereal.lib config.h $(PDB_FILE)

diff --git a/epan/config.h.win32 b/epan/config.h.win32
index dfbefc7372ad01873b200c73dd406148db386062..40a6a88e8d40252a3bcc652a14d0f05b0df9dfe2 100644 (file)
--- a/epan/config.h.win32
+++ b/epan/config.h.win32
@@ -1,4 +1,4 @@
-/* $Id: config.h.win32,v 1.11 2003/06/02 18:40:01 gerald Exp $ */
+/* $Id: config.h.win32,v 1.12 2003/06/12 09:45:42 guy Exp $ */
 /* config.h.win32 Generated manually. :-) */
 /* config.h.  Generated automatically by configure.  */
 /* config.h.in.  Generated automatically from configure.in by autoheader.  */
@@ -72,7 +72,7 @@
 /* #undef HAVE_UNISTD_H */
 
 /* Define to use GNU ADNS library */
-#define HAVE_GNU_ADNS 1
+@HAVE_GNU_ADNS@
 #define ADNS_JGAA_WIN32 1
 
 #define HAVE_PLUGINS           1