Make the top-level "config.h.win32" more closely resemble the top-level

"config.h", and update it to include stuff added to "config.h" and
remove stuff removed from "config.h".

Give libethereal a "config.h.win32" and make its "Makefile.nmake" file
copy it to "config.h".

svn path=/trunk/; revision=2504

4 files changed, 148 insertions, 19 deletions

diff --git a/config.h.win32 b/config.h.win32
index 677bc1ed6c..e7760b280f 100644
--- a/config.h.win32
+++ b/config.h.win32
@@ -1,4 +1,4 @@
-/* $Id: config.h.win32,v 1.17 2000/09/14 10:02:59 gram Exp $ */
+/* $Id: config.h.win32,v 1.18 2000/10/17 09:25:36 guy Exp $ */
 /* config.h.win32 Generated manually. :-) */
 /* config.h.  Generated automatically by configure.  */
 /* config.h.in.  Generated automatically from configure.in by autoheader.  */
@@ -10,13 +10,15 @@
    byte first (like Motorola and SPARC, unlike Intel and VAX).  */
 /* #undef WORDS_BIGENDIAN */
 
+/* Define if lex declares yytext as a char * by default, not a char[].  */
+/* #undef YYTEXT_POINTER */
+
+#define HAVE_PLUGINS		1
+#define PLUGINS_NEED_ADDRESS_TABLE 1
+
 /* #undef HAVE_SA_LEN */
 
 #define DATAFILE_DIR "/usr/local/etc"
-#define PLUGIN_DIR "/usr/local/lib/ethereal/plugins/0.8.12"
-
-/* Version number of package */
-#define VERSION "0.8.12"
 
 /* #undef NEED_SNPRINTF_H */
 
@@ -24,21 +26,47 @@
 
 #define NEED_MKSTEMP 1
 
+#define HAVE_LIBPCAP 1
+
+/* Define if you have the gethostbyname2 function.  */
+/* #undef HAVE_GETHOSTBYNAME2 */
+
+/* Define if you have the getprotobynumber function.  */
+/* #undef HAVE_GETPROTOBYNUMBER */
+
+/* Define if you have the <arpa/inet.h> header file.  */
+/* #undef HAVE_ARPA_INET_H */
+
+/* Define if you have the <dlfcn.h> header file.  */
+/* #undef HAVE_DLFCN_H */
+
 /* Define if you have the <fcntl.h> header file.  */
 #define HAVE_FCNTL_H 1
 
+/* Define if you have the <netdb.h> header file.  */
+/* #undef HAVE_NETDB_H */
+
 /* Define if you have the <netinet/in.h> header file.  */
 /* #define HAVE_NETINET_IN_H 1 */
 
 /* Define if you have the <snmp/snmp.h> header file.  */
 /* #undef HAVE_SNMP_SNMP_H */
 
+/* Define if you have the <snmp/version.h> header file.  */
+/* #undef HAVE_SNMP_VERSION_H */
+
 /* Define if you have the <stdarg.h> header file.  */
 #define HAVE_STDARG_H 1
 
+/* Define if you have the <stddef.h> header file.  */
+/* #undef HAVE_STDDEF_H */
+
 /* Define if you have the <sys/ioctl.h> header file.  */
 /* #undef HAVE_SYS_IOCTL_H */
 
+/* Define if you have the <sys/socket.h> header file.  */
+/* #undef HAVE_SYS_SOCKET_H */
+
 /* Define if you have the <sys/sockio.h> header file.  */
 /* #undef HAVE_SYS_SOCKIO_H */
 
@@ -47,26 +75,25 @@
 
 /* Define if you have the <sys/time.h> header file.  */
 /* #define HAVE_SYS_TIME_H 1 */
-/* #undef HAVE_DIRENT_H 1 */
 
 /* Define if you have the <sys/types.h> header file.  */
 #define HAVE_SYS_TYPES_H 1
 
+/* Define if you have the <sys/wait.h> header file.  */
+/* #undef HAVE_SYS_WAIT_H */
+
 /* Define if you have the <ucd-snmp/snmp.h> header file.  */
 /* #undef HAVE_UCD_SNMP_SNMP_H */
 
+/* Define if you have the <ucd-snmp/version.h> header file.  */
+/* #undef HAVE_UCD_SNMP_VERSION_H */
+
 /* Define if you have the <unistd.h> header file.  */
 /* #define HAVE_UNISTD_H 1 */
 
-/* Define if you have the pcap library (-lpcap).  */
-#define HAVE_LIBPCAP 1
-
 /* Define if you have the z library (-lz).  */
 /*#define HAVE_LIBZ 1*/
 
-/* Name of package */
-#define PACKAGE "ethereal"
-
 #ifndef WIN32
 #define WIN32			1
 #endif
@@ -91,5 +118,12 @@
 /*#define ZLIB_DLL                1
 #define _WINDOWS                1*/
 
-#define HAVE_PLUGINS		1
-#define PLUGINS_NEED_ADDRESS_TABLE 1
+/* Name of package */
+#define PACKAGE "ethereal"
+
+/* Version number of package */
+#define VERSION "0.8.12"
+
+/* Plugin installation directory */
+#define PLUGIN_DIR "/usr/local/lib/ethereal/plugins/0.8.12"
+
diff --git a/epan/Makefile.am b/epan/Makefile.am
index 5d12aeeac1..d1c2610f4f 100644
--- a/epan/Makefile.am
+++ b/epan/Makefile.am
@@ -2,7 +2,7 @@
 # Automake file for the EPAN library
 # (Ethereal Protocol ANalyzer Library)
 #
-# $Id: Makefile.am,v 1.10 2000/10/16 23:17:39 guy Exp $
+# $Id: Makefile.am,v 1.11 2000/10/17 09:25:36 guy Exp $
 #
 # Ethereal - Network traffic analyzer
 # By Gerald Combs <gerald@zing.org>
@@ -79,6 +79,7 @@ EXTRA_libethereal_a_SOURCES =	\
 	inet_v6defs.h
 
 EXTRA_DIST = \
+	config.h.win32		\
 	Makefile.nmake
 
 CLEANFILES = \
diff --git a/epan/Makefile.nmake b/epan/Makefile.nmake
index 3b59aefc02..4ed7939fcf 100644
--- a/epan/Makefile.nmake
+++ b/epan/Makefile.nmake
@@ -35,10 +35,10 @@ OBJECTS=conversation.obj \
 	tvbuff.obj       \
 
 # For use when making ethereal.dll
-#ethereal.dll ethereal.lib	: ..\config.h $(OBJECTS)
+#ethereal.dll ethereal.lib	: config.h $(OBJECTS)
 #	link /DLL /out:ethereal.dll $(OBJECTS) $(libethereal_LIBS)
 
-ethereal.lib	: ..\config.h $(OBJECTS)
+ethereal.lib	: config.h $(OBJECTS)
 	lib /out:ethereal.lib $(OBJECTS)
 
 dfilter-scanner.obj : dfilter-scanner.c dfilter-grammar.h
@@ -49,8 +49,8 @@ dfilter-scanner.c : dfilter-scanner.l
 dfilter-grammar.c dfilter-grammar.h : dfilter-grammar.y
 	$(YACC) $(YACC_OPTS) -d -p dfilter_ dfilter-grammar.y -o dfilter-grammar.c
 
-..\config.h	: ..\config.h.win32
-	copy ..\config.h.win32 ..\config.h
+config.h	: config.h.win32
+	copy config.h.win32 $@
 
 clean:
 	rm -f $(OBJECTS) ethereal.lib
diff --git a/epan/config.h.win32 b/epan/config.h.win32
new file mode 100644
index 0000000000..fdb429ec67
--- /dev/null
+++ b/epan/config.h.win32
@@ -0,0 +1,94 @@
+/* $Id: config.h.win32,v 1.1 2000/10/17 09:25:37 guy Exp $ */
+/* config.h.win32 Generated manually. :-) */
+/* config.h.  Generated automatically by configure.  */
+/* config.h.in.  Generated automatically from configure.in by autoheader.  */
+
+/* Define if you have the ANSI C header files.  */
+#define STDC_HEADERS 1
+
+/* Define if lex declares yytext as a char * by default, not a char[].  */
+#define YYTEXT_POINTER 1
+
+#define HAVE_PLUGINS 1
+
+#define DATAFILE_DIR "/usr/local/etc"
+
+#define NEED_INET_ATON_H 1
+
+#define NEED_INET_V6DEFS_H 1
+
+/* Define if you have the <arpa/inet.h> header file.  */
+/* #undef HAVE_ARPA_INET_H */
+
+/* Define if you have the <arpa/nameser.h> header file.  */
+/* #undef HAVE_ARPA_NAMESER_H */
+
+/* Define if you have the <direct.h> header file.  */
+#define HAVE_DIRECT_H 1
+
+/* Define if you have the <dirent.h> header file.  */
+/* #undef HAVE_DIRENT_H */
+
+/* Define if you have the <dlfcn.h> header file.  */
+/* #undef HAVE_DLFCN_H */
+
+/* Define if you have the <fcntl.h> header file.  */
+#define HAVE_FCNTL_H 1
+
+/* Define if you have the <netdb.h> header file.  */
+/* #undef HAVE_NETDB_H */
+
+/* Define if you have the <netinet/in.h> header file.  */
+/* #define HAVE_NETINET_IN_H 1 */
+
+/* Define if you have the <stdarg.h> header file.  */
+#define HAVE_STDARG_H 1
+
+/* Define if you have the <sys/param.h> header file.  */
+/* #undef HAVE_SYS_PARAM_H */
+
+/* Define if you have the <sys/socket.h> header file.  */
+/* #undef HAVE_SYS_SOCKET_H */
+
+/* Define if you have the <sys/stat.h> header file.  */
+#define HAVE_SYS_STAT_H 1
+
+/* Define if you have the <sys/time.h> header file.  */
+/* #undef HAVE_SYS_TIME_H */
+
+/* Define if you have the <sys/types.h> header file.  */
+#define HAVE_SYS_TYPES_H 1
+
+/* Define if you have the <unistd.h> header file.  */
+/* #undef HAVE_UNISTD_H */
+
+#define HAVE_PLUGINS		1
+#define PLUGINS_NEED_ADDRESS_TABLE 1
+
+#ifndef WIN32
+#define WIN32			1
+#endif
+
+#define HAVE_WINDOWS_H		1
+#define HAVE_WINSOCK_H		1
+#define HAVE_DIRECT_H		1
+#define HAVE_IO_H		1
+#define NEED_GETOPT_H		1
+#define snprintf 		_snprintf
+#define vsnprintf 		_vsnprintf
+#define strcasecmp		stricmp
+#define strncasecmp		strnicmp
+#define open			_open
+#define close			_close
+#define popen			_popen
+#define pclose			_pclose
+
+/* Needed for zlib, according to http://www.winimage.com/zLibDll/ */
+/*#define ZLIB_DLL                1
+#define _WINDOWS                1*/
+
+/* Name of package */
+#define PACKAGE "libethereal.a"
+
+/* Version number of package */
+#define VERSION "0.0.0"