merged 2.2 branch

[wxWidgets.git] / samples / configure

diff --git a/samples/configure b/samples/configure
index cb782ff5abfc4ce496a75824a768cabb4b5a6d67..ebbe38a6eba7180d221acab624614591d47233ba 100755 (executable)
--- a/samples/configure
+++ b/samples/configure
@@ -523,6 +523,17 @@ fi
 
 
 
+SAMPLES_SUBDIRS=$wx_cv_path_samplesubdirs
+
+
+PATH_IFS=$wx_cv_path_ifs
+PROGRAM_EXT=$wx_cv_program_ext
+WX_TARGET_LIBRARY=$wx_cv_target_library
+
+
+
+
+
 trap '' 1 2 15
 cat > confcache <<\EOF
 # This file is a shell script that caches the results of configure
@@ -645,10 +656,13 @@ trap 'rm -fr `echo "
             console/Makefile
             db/Makefile
             dialogs/Makefile
+            dialup/Makefile
             docview/Makefile
             docvwmdi/Makefile
             dnd/Makefile
+            dragimag/Makefile
             drawing/Makefile
+            dynamic/Makefile
             exec/Makefile
             font/Makefile
             grid/Makefile
@@ -656,20 +670,23 @@ trap 'rm -fr `echo "
             image/Makefile
             internat/Makefile
             ipc/Makefile
+            joytest/Makefile
             layout/Makefile
             listctrl/Makefile
             mdi/Makefile
+            menu/Makefile
             minifram/Makefile
             minimal/Makefile
-            dialup/Makefile
             newgrid/Makefile
             notebook/Makefile
+            plot/Makefile
             png/Makefile
             printing/Makefile
             proplist/Makefile
             propsize/Makefile
             richedit/Makefile
             resource/Makefile
+            rotate/Makefile
             sashtest/Makefile
             scroll/Makefile
             scrollsub/Makefile
@@ -679,6 +696,7 @@ trap 'rm -fr `echo "
             thread/Makefile
             toolbar/Makefile
             treectrl/Makefile
+            treelay/Makefile
             typetest/Makefile
             validate/Makefile
             sockets/Makefile
@@ -692,6 +710,10 @@ trap 'rm -fr `echo "
             html/zip/Makefile
             html/virtual/Makefile
             html/widget/Makefile
+            opengl/Makefile
+            opengl/cube/Makefile
+            opengl/penguin/Makefile
+            opengl/isosurf/Makefile
         " | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
 EOF
 cat >> $CONFIG_STATUS <<EOF
@@ -724,6 +746,10 @@ s%@includedir@%$includedir%g
 s%@oldincludedir@%$oldincludedir%g
 s%@infodir@%$infodir%g
 s%@mandir@%$mandir%g
+s%@SAMPLES_SUBDIRS@%$SAMPLES_SUBDIRS%g
+s%@PATH_IFS@%$PATH_IFS%g
+s%@PROGRAM_EXT@%$PROGRAM_EXT%g
+s%@WX_TARGET_LIBRARY@%$WX_TARGET_LIBRARY%g
 
 CEOF
 EOF
@@ -774,10 +800,13 @@ CONFIG_FILES=\${CONFIG_FILES-"Makefile
             console/Makefile
             db/Makefile
             dialogs/Makefile
+            dialup/Makefile
             docview/Makefile
             docvwmdi/Makefile
             dnd/Makefile
+            dragimag/Makefile
             drawing/Makefile
+            dynamic/Makefile
             exec/Makefile
             font/Makefile
             grid/Makefile
@@ -785,20 +814,23 @@ CONFIG_FILES=\${CONFIG_FILES-"Makefile
             image/Makefile
             internat/Makefile
             ipc/Makefile
+            joytest/Makefile
             layout/Makefile
             listctrl/Makefile
             mdi/Makefile
+            menu/Makefile
             minifram/Makefile
             minimal/Makefile
-            dialup/Makefile
             newgrid/Makefile
             notebook/Makefile
+            plot/Makefile
             png/Makefile
             printing/Makefile
             proplist/Makefile
             propsize/Makefile
             richedit/Makefile
             resource/Makefile
+            rotate/Makefile
             sashtest/Makefile
             scroll/Makefile
             scrollsub/Makefile
@@ -808,6 +840,7 @@ CONFIG_FILES=\${CONFIG_FILES-"Makefile
             thread/Makefile
             toolbar/Makefile
             treectrl/Makefile
+            treelay/Makefile
             typetest/Makefile
             validate/Makefile
             sockets/Makefile
@@ -821,6 +854,10 @@ CONFIG_FILES=\${CONFIG_FILES-"Makefile
             html/zip/Makefile
             html/virtual/Makefile
             html/widget/Makefile
+            opengl/Makefile
+            opengl/cube/Makefile
+            opengl/penguin/Makefile
+            opengl/isosurf/Makefile
         "}
 EOF
 cat >> $CONFIG_STATUS <<\EOF