post wxUniv merge fixes

[wxWidgets.git] / samples / configure

diff --git a/samples/configure b/samples/configure
index ebbe38a6eba7180d221acab624614591d47233ba..6476a00c55135b0f923f5fe0a668c6f78a41dce1 100755 (executable)
--- a/samples/configure
+++ b/samples/configure
@@ -529,6 +529,8 @@ 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
+WX_TARGET_LIBRARY_GL=$wx_cv_target_library_gl
+
 
 
 
@@ -663,6 +665,8 @@ trap 'rm -fr `echo "
             dragimag/Makefile
             drawing/Makefile
             dynamic/Makefile
+            erase/Makefile
+            event/Makefile
             exec/Makefile
             font/Makefile
             grid/Makefile
@@ -675,11 +679,11 @@ trap 'rm -fr `echo "
             listctrl/Makefile
             mdi/Makefile
             menu/Makefile
+            memcheck/Makefile
             minifram/Makefile
             minimal/Makefile
             newgrid/Makefile
             notebook/Makefile
-            plot/Makefile
             png/Makefile
             printing/Makefile
             proplist/Makefile
@@ -690,6 +694,7 @@ trap 'rm -fr `echo "
             sashtest/Makefile
             scroll/Makefile
             scrollsub/Makefile
+            sockets/Makefile
             splitter/Makefile
             statbar/Makefile
             text/Makefile
@@ -699,7 +704,7 @@ trap 'rm -fr `echo "
             treelay/Makefile
             typetest/Makefile
             validate/Makefile
-            sockets/Makefile
+            widgets/Makefile
             wizard/Makefile
             html/Makefile
             html/about/Makefile
@@ -750,6 +755,7 @@ 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
+s%@WX_TARGET_LIBRARY_GL@%$WX_TARGET_LIBRARY_GL%g
 
 CEOF
 EOF
@@ -807,6 +813,8 @@ CONFIG_FILES=\${CONFIG_FILES-"Makefile
             dragimag/Makefile
             drawing/Makefile
             dynamic/Makefile
+            erase/Makefile
+            event/Makefile
             exec/Makefile
             font/Makefile
             grid/Makefile
@@ -819,11 +827,11 @@ CONFIG_FILES=\${CONFIG_FILES-"Makefile
             listctrl/Makefile
             mdi/Makefile
             menu/Makefile
+            memcheck/Makefile
             minifram/Makefile
             minimal/Makefile
             newgrid/Makefile
             notebook/Makefile
-            plot/Makefile
             png/Makefile
             printing/Makefile
             proplist/Makefile
@@ -834,6 +842,7 @@ CONFIG_FILES=\${CONFIG_FILES-"Makefile
             sashtest/Makefile
             scroll/Makefile
             scrollsub/Makefile
+            sockets/Makefile
             splitter/Makefile
             statbar/Makefile
             text/Makefile
@@ -843,7 +852,7 @@ CONFIG_FILES=\${CONFIG_FILES-"Makefile
             treelay/Makefile
             typetest/Makefile
             validate/Makefile
-            sockets/Makefile
+            widgets/Makefile
             wizard/Makefile
             html/Makefile
             html/about/Makefile