mingw32/cygwin compilation fixes

[wxWidgets.git] / contrib / configure

diff --git a/contrib/configure b/contrib/configure
index ecbf3c7f4214043e4f2f3b76cc040cc4c252b133..9cb5da925ff351eedffd03d655726a20b7680887 100755 (executable)
--- a/contrib/configure
+++ b/contrib/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# From configure.in Id
+# From configure.in Id: configure.in
 # Guess values for system-dependent variables and create Makefiles.
 # Generated automatically using autoconf version 2.13 
 # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
@@ -683,13 +683,15 @@ else
 fi
 
 
-if test ! -z $ESD_LINK; then
+if test "$ESD_LINK" != "" ; then
   echo "ESound detected"
 fi
 
 
 PATH_IFS=$wx_cv_path_ifs
 WX_TARGET_LIBRARY=$wx_cv_target_library
+WX_TARGET_LIBRARY_TYPE=$wx_cv_target_libtype
+
 
 
 
@@ -810,12 +812,41 @@ done
 ac_given_srcdir=$srcdir
 
 trap 'rm -fr `echo "
-            Makefile
             src/Makefile
             src/ogl/Makefile
             src/mmedia/Makefile
+            src/stc/Makefile
+            src/xrc/Makefile
+            src/canvas/Makefile
+            src/gizmos/Makefile
+            src/plot/Makefile
+            src/applet/Makefile
+            src/fl/Makefile
             samples/Makefile
             samples/mmedia/Makefile
+            samples/ogl/Makefile
+            samples/ogl/ogledit/Makefile
+            samples/ogl/studio/Makefile
+            samples/stc/Makefile
+            samples/canvas/Makefile
+            samples/canvas/test/Makefile
+            samples/canvas/simple/Makefile
+            samples/gizmos/Makefile
+            samples/gizmos/multicell/Makefile
+            samples/gizmos/splittree/Makefile
+            samples/gizmos/editlbox/Makefile
+            samples/xrc/Makefile
+            samples/plot/Makefile
+            samples/applet/Makefile
+            samples/fl/fl_demo1
+            samples/fl/fl_demo2
+            samples/fl/fl_sample1
+            samples/fl/fl_sample2
+            samples/fl/fl_sample3
+            utils/Makefile
+            utils/wxrc/Makefile
+            utils/wxrcedit/Makefile
+            utils/convertrc/Makefile
          " | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
 EOF
 cat >> $CONFIG_STATUS <<EOF
@@ -852,6 +883,7 @@ s%@CPP@%$CPP%g
 s%@PATH_IFS@%$PATH_IFS%g
 s%@ESD_LINK@%$ESD_LINK%g
 s%@WX_TARGET_LIBRARY@%$WX_TARGET_LIBRARY%g
+s%@WX_TARGET_LIBRARY_TYPE@%$WX_TARGET_LIBRARY_TYPE%g
 
 CEOF
 EOF
@@ -897,8 +929,38 @@ CONFIG_FILES=\${CONFIG_FILES-"Makefile
             src/Makefile
             src/ogl/Makefile
             src/mmedia/Makefile
+            src/stc/Makefile
+            src/xrc/Makefile
+            src/canvas/Makefile
+            src/gizmos/Makefile
+            src/plot/Makefile
+            src/applet/Makefile
+            src/fl/Makefile
             samples/Makefile
             samples/mmedia/Makefile
+            samples/ogl/Makefile
+            samples/ogl/ogledit/Makefile
+            samples/ogl/studio/Makefile
+            samples/stc/Makefile
+            samples/canvas/Makefile
+            samples/canvas/test/Makefile
+            samples/canvas/simple/Makefile
+            samples/gizmos/Makefile
+            samples/gizmos/multicell/Makefile
+            samples/gizmos/splittree/Makefile
+            samples/gizmos/editlbox/Makefile
+            samples/xrc/Makefile
+            samples/plot/Makefile
+            samples/applet/Makefile
+            samples/fl/fl_demo1
+            samples/fl/fl_demo2
+            samples/fl/fl_sample1
+            samples/fl/fl_sample2
+            samples/fl/fl_sample3
+            utils/Makefile
+            utils/wxrc/Makefile
+            utils/wxrcedit/Makefile
+            utils/convertrc/Makefile
          "}
 EOF
 cat >> $CONFIG_STATUS <<\EOF