diff options
| author | Guy Harris <guy@alum.mit.edu> | 2003-06-16 07:58:26 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2003-06-16 07:58:26 +0000 |
| commit | c70953341cb3e5984ff6fcf53c43a982f6645927 (patch) | |
| tree | 193377965b914bb8b320f3761d0e9d43f8042167 | |
| parent | 0bdb498bdb8febe168263b8a4b19b05a34a6cfc3 (diff) | |
"!IFDEF" just takes the name of the variable as an argument.
We do have to look for headers in $(GTK_DIR)\gdk when using the
development packages from the Ethereal Web site, as "gdkconfig.h" is in
that directory but it's included as <gdkconfig.h>.
The commented string for ADNS_CONFIG doesn't appear to get substituted
as we want it to be; just use an empty string for now.
svn path=/trunk/; revision=7892
| -rw-r--r-- | config.nmake | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/config.nmake b/config.nmake index cf9bc7e3d2..d3613c40eb 100644 --- a/config.nmake +++ b/config.nmake @@ -1,4 +1,4 @@ -# $Id: config.nmake,v 1.47 2003/06/15 23:04:47 guy Exp $ +# $Id: config.nmake,v 1.48 2003/06/16 07:58:26 guy Exp $ VERSION=0.9.13 # @@ -84,7 +84,7 @@ MAKENSIS="C:/program files/nsis/makensis.exe" # send us the patches, along with details of why the change # was necessary. # -!IFDEF $(GLIB_GTK_DIR) +!IFDEF GLIB_GTK_DIR GLIB_CFLAGS=/I$(GTK_GLIB_DIR)\include\glib-$(GLIB_VERSION) GTK_CFLAGS=$(GLIB_CFLAGS) /I$(GTK_GLIB_DIR)\include\gtk-$(GTK_VERSION) \ /I$(GTK_GLIB_DIR)\include\atk-1.0 \ @@ -98,7 +98,7 @@ GTK_LIBS=$(GLIB_GTK_DIR)\lib\gtk-win32-$(GTK_VERSION).lib \ $(GLIB_LIBS) !ELSE GLIB_CFLAGS=/I$(GLIB_DIR) /I$(GLIB_DIR)\gmodule -GTK_CFLAGS=$(GLIB_CFLAGS) /I$(GTK_DIR) +GTK_CFLAGS=$(GLIB_CFLAGS) /I$(GTK_DIR) /I$(GTK_DIR)\gdk GLIB_LIBS=$(GLIB_DIR)\glib-$(GLIB_VERSION).lib \ $(GLIB_DIR)\gmodule\gmodule-$(GLIB_VERSION).lib GTK_LIBS=$(GTK_DIR)\gtk\gtk-$(GTK_VERSION).lib \ @@ -113,5 +113,5 @@ ADNS_CONFIG="#define HAVE_GNU_ADNS 1" !else ADNS_CFLAGS= ADNS_LIBS= -ADNS_CONFIG="/* #undef HAVE_GNU_ADNS */" +ADNS_CONFIG= !ENDIF |