wxUSE_IOSTREAMH changes

[wxWidgets.git] / setup / maketmpl.in

diff --git a/setup/maketmpl.in b/setup/maketmpl.in
index 25051c1affc0b6be5bdb942993411b5d98dcd2ee..1c9a405bfbccc24a4bf565caf855a689450e624d 100644 (file)
--- a/setup/maketmpl.in
+++ b/setup/maketmpl.in
@@ -31,12 +31,13 @@ DEBUG = @WXDEBUG@ @WXDEBUG_DEFINE@
 
 # c-compiler stuff
 CC = @CC@
-CFLAGS = @CFLAGS@ $(OPTIMISE) $(PROFILE) $(DEBUG)
 CPP = @CPP@
+CPPFLAGS=@CPPFLAGS@
+CFLAGS = @CFLAGS@ $(CPPFLAGS) $(OPTIMISE) $(PROFILE) $(DEBUG)
 
 # c++-compiler stuff
 CXX = @CXX@
-CXXFLAGS = @CXXFLAGS@ $(OPTIMISE) $(PROFILE) $(DEBUG)
+CXXFLAGS = @CXXFLAGS@ $(CPPFLAGS) $(OPTIMISE) $(PROFILE) $(DEBUG)
 CXXCPP = @CXXCPP@
 
 # shared compile stuff
@@ -61,18 +62,18 @@ DJPEG_PROG =
 GIFTOPNM_PROG = 
 NETPBM_PATH = 
 
+# Base directories for installation
 prefix = @prefix@
 exec_prefix = @exec_prefix@
 
-# Directory in which to install scripts.
-#bindir = @bindir@
+# Directory in which to install headers
+includedir = @includedir@
 
-# Directory in which to install library files.
-datadir = @datadir@
-acdatadir = $(datadir)/autoconf
+# Directory in which to install library files
+libdir = @libdir@
 
-# Directory in which to install documentation info files.
-infodir = @infodir@
+# Directory in which to install executable files
+bindir = @bindir@
 
 X_CFLAGS = @X_CFLAGS@
 X_LIBS = @X_LIBS@
@@ -109,7 +110,7 @@ WX_LIBS = -L$(GLOBAL_LIB_DIR) -lwx_gtk
 
 OPENGL_LIBS = $(OPENGL_LIBRARY) $(OPENGL_LINK)
 
-GUI_TK_LIBS = $(GUI_TK_LIBRARY) $(GUI_TK_LINK) -ldl
+GUI_TK_LIBS = $(GUI_TK_LIBRARY) $(GUI_TK_LINK) @DL_LIBRARY@
 
 LINK = $(CXX) -o $@
 LINK_LIBS= \