Moved the cleanup code to an EVT_WINDOW_DESTROY handler.

[wxWidgets.git] / contrib / configure

diff --git a/contrib/configure b/contrib/configure
index ecbf3c7f4214043e4f2f3b76cc040cc4c252b133..054e0c7389aa552d4aeb85aff0a10fe8890653da 100755 (executable)
--- a/contrib/configure
+++ b/contrib/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 
 #! /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.
 # 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
 
 
 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
   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,45 @@ done
 ac_given_srcdir=$srcdir
 
 trap 'rm -fr `echo "
 ac_given_srcdir=$srcdir
 
 trap 'rm -fr `echo "

-            Makefile

             src/Makefile
             src/ogl/Makefile
             src/mmedia/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
+            src/net/Makefile

             samples/Makefile
             samples/mmedia/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/gizmos/dynsash/Makefile
+            samples/gizmos/dynsash_switch/Makefile
+            samples/xrc/Makefile
+            samples/plot/Makefile
+            samples/applet/Makefile
+            samples/fl/Makefile
+            samples/fl/fl_demo1/Makefile
+            samples/fl/fl_demo2/Makefile
+            samples/fl/fl_sample1/Makefile
+            samples/fl/fl_sample2/Makefile
+            samples/fl/fl_sample3/Makefile
+            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
          " | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
 EOF
 cat >> $CONFIG_STATUS <<EOF


@@ -852,6 +887,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%@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
 
 CEOF
 EOF


@@ -893,12 +929,45 @@ EOF
 
 cat >> $CONFIG_STATUS <<EOF
 
 
 cat >> $CONFIG_STATUS <<EOF
 

-CONFIG_FILES=\${CONFIG_FILES-"Makefile
-            src/Makefile
+CONFIG_FILES=\${CONFIG_FILES-"src/Makefile

             src/ogl/Makefile
             src/mmedia/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
+            src/net/Makefile

             samples/Makefile
             samples/mmedia/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/gizmos/dynsash/Makefile
+            samples/gizmos/dynsash_switch/Makefile
+            samples/xrc/Makefile
+            samples/plot/Makefile
+            samples/applet/Makefile
+            samples/fl/Makefile
+            samples/fl/fl_demo1/Makefile
+            samples/fl/fl_demo2/Makefile
+            samples/fl/fl_sample1/Makefile
+            samples/fl/fl_sample2/Makefile
+            samples/fl/fl_sample3/Makefile
+            utils/Makefile
+            utils/wxrc/Makefile
+            utils/wxrcedit/Makefile
+            utils/convertrc/Makefile

          "}
 EOF
 cat >> $CONFIG_STATUS <<\EOF
          "}
 EOF
 cat >> $CONFIG_STATUS <<\EOF