Applied patch [ 735948 ] wxStaticPicture contrib

[wxWidgets.git] / samples / configure

diff --git a/samples/configure b/samples/configure
index 0d029ca065f59a91252b21408421889851566a97..b5012fc6736d6e9d54b766f020548363db863f71 100755 (executable)
--- a/samples/configure
+++ b/samples/configure
@@ -523,12 +523,20 @@ fi
 
 
 
+if test "x$wx_cv_path_samplesubdirs" = "x"; then
+    { echo "configure: error: Please run configure from the top level directory." 1>&2; exit 1; }
+fi
+
 SAMPLES_SUBDIRS=$wx_cv_path_samplesubdirs
 
 
+IF_GNU_MAKE=$wx_cv_if_gnu_make
 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
+
+
 
 
 
@@ -648,6 +656,8 @@ ac_given_srcdir=$srcdir
 
 trap 'rm -fr `echo "
             Makefile
+            access/Makefile
+            artprov/Makefile
             caret/Makefile
             calendar/Makefile
             checklst/Makefile
@@ -673,6 +683,7 @@ trap 'rm -fr `echo "
             internat/Makefile
             ipc/Makefile
             joytest/Makefile
+            keyboard/Makefile
             layout/Makefile
             listctrl/Makefile
             mdi/Makefile
@@ -680,28 +691,34 @@ trap 'rm -fr `echo "
             memcheck/Makefile
             minifram/Makefile
             minimal/Makefile
-            newgrid/Makefile
+            mobile/Makefile
+            mobile/wxedit/Makefile
+            mobile/styles/Makefile
+            multimon/Makefile
+            nativedlg/Makefile
             notebook/Makefile
+            oleauto/Makefile
+            ownerdrw/Makefile
             png/Makefile
             printing/Makefile
-            proplist/Makefile
             propsize/Makefile
-            richedit/Makefile
-            resource/Makefile
+            regtest/Makefile
             rotate/Makefile
             sashtest/Makefile
+            shaped/Makefile
             scroll/Makefile
             scrollsub/Makefile
+            sockets/Makefile
             splitter/Makefile
             statbar/Makefile
+            taskbar/Makefile
             text/Makefile
             thread/Makefile
             toolbar/Makefile
             treectrl/Makefile
-            treelay/Makefile
             typetest/Makefile
             validate/Makefile
-            sockets/Makefile
+            widgets/Makefile
             wizard/Makefile
             html/Makefile
             html/about/Makefile
@@ -749,9 +766,11 @@ s%@oldincludedir@%$oldincludedir%g
 s%@infodir@%$infodir%g
 s%@mandir@%$mandir%g
 s%@SAMPLES_SUBDIRS@%$SAMPLES_SUBDIRS%g
+s%@IF_GNU_MAKE@%$IF_GNU_MAKE%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
@@ -794,6 +813,8 @@ EOF
 cat >> $CONFIG_STATUS <<EOF
 
 CONFIG_FILES=\${CONFIG_FILES-"Makefile
+            access/Makefile
+            artprov/Makefile
             caret/Makefile
             calendar/Makefile
             checklst/Makefile
@@ -819,6 +840,7 @@ CONFIG_FILES=\${CONFIG_FILES-"Makefile
             internat/Makefile
             ipc/Makefile
             joytest/Makefile
+            keyboard/Makefile
             layout/Makefile
             listctrl/Makefile
             mdi/Makefile
@@ -826,28 +848,34 @@ CONFIG_FILES=\${CONFIG_FILES-"Makefile
             memcheck/Makefile
             minifram/Makefile
             minimal/Makefile
-            newgrid/Makefile
+            mobile/Makefile
+            mobile/wxedit/Makefile
+            mobile/styles/Makefile
+            multimon/Makefile
+            nativedlg/Makefile
             notebook/Makefile
+            oleauto/Makefile
+            ownerdrw/Makefile
             png/Makefile
             printing/Makefile
-            proplist/Makefile
             propsize/Makefile
-            richedit/Makefile
-            resource/Makefile
+            regtest/Makefile
             rotate/Makefile
             sashtest/Makefile
+            shaped/Makefile
             scroll/Makefile
             scrollsub/Makefile
+            sockets/Makefile
             splitter/Makefile
             statbar/Makefile
+            taskbar/Makefile
             text/Makefile
             thread/Makefile
             toolbar/Makefile
             treectrl/Makefile
-            treelay/Makefile
             typetest/Makefile
             validate/Makefile
-            sockets/Makefile
+            widgets/Makefile
             wizard/Makefile
             html/Makefile
             html/about/Makefile