Applied patch [ 735948 ] wxStaticPicture contrib

[wxWidgets.git] / samples / configure

diff --git a/samples/configure b/samples/configure
index 0a88efd4cb6a6dbd7c98f3dedebf450ab05f196e..b5012fc6736d6e9d54b766f020548363db863f71 100755 (executable)
--- a/samples/configure
+++ b/samples/configure
@@ -523,9 +523,25 @@ 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
 
 
 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
+
+
+
+
+
+
+

 trap '' 1 2 15
 cat > confcache <<\EOF
 # This file is a shell script that caches the results of configure
 trap '' 1 2 15
 cat > confcache <<\EOF
 # This file is a shell script that caches the results of configure


@@ -640,6 +656,8 @@ ac_given_srcdir=$srcdir
 
 trap 'rm -fr `echo "
             Makefile
 
 trap 'rm -fr `echo "
             Makefile

+            access/Makefile
+            artprov/Makefile

             caret/Makefile
             calendar/Makefile
             checklst/Makefile
             caret/Makefile
             calendar/Makefile
             checklst/Makefile


@@ -648,10 +666,15 @@ trap 'rm -fr `echo "
             console/Makefile
             db/Makefile
             dialogs/Makefile
             console/Makefile
             db/Makefile
             dialogs/Makefile

+            dialup/Makefile

             docview/Makefile
             docvwmdi/Makefile
             dnd/Makefile
             docview/Makefile
             docvwmdi/Makefile
             dnd/Makefile

+            dragimag/Makefile

             drawing/Makefile
             drawing/Makefile

+            dynamic/Makefile
+            erase/Makefile
+            event/Makefile

             exec/Makefile
             font/Makefile
             grid/Makefile
             exec/Makefile
             font/Makefile
             grid/Makefile


@@ -659,33 +682,43 @@ trap 'rm -fr `echo "
             image/Makefile
             internat/Makefile
             ipc/Makefile
             image/Makefile
             internat/Makefile
             ipc/Makefile

+            joytest/Makefile
+            keyboard/Makefile

             layout/Makefile
             listctrl/Makefile
             mdi/Makefile
             layout/Makefile
             listctrl/Makefile
             mdi/Makefile

+            menu/Makefile
+            memcheck/Makefile

             minifram/Makefile
             minimal/Makefile
             minifram/Makefile
             minimal/Makefile

-            dialup/Makefile
-            newgrid/Makefile
+            mobile/Makefile
+            mobile/wxedit/Makefile
+            mobile/styles/Makefile
+            multimon/Makefile
+            nativedlg/Makefile

             notebook/Makefile
             notebook/Makefile

+            oleauto/Makefile
+            ownerdrw/Makefile

             png/Makefile
             printing/Makefile
             png/Makefile
             printing/Makefile

-            proplist/Makefile

             propsize/Makefile
             propsize/Makefile

-            richedit/Makefile
-            resource/Makefile
+            regtest/Makefile

             rotate/Makefile
             sashtest/Makefile
             rotate/Makefile
             sashtest/Makefile

+            shaped/Makefile

             scroll/Makefile
             scrollsub/Makefile
             scroll/Makefile
             scrollsub/Makefile

+            sockets/Makefile

             splitter/Makefile
             statbar/Makefile
             splitter/Makefile
             statbar/Makefile

+            taskbar/Makefile

             text/Makefile
             thread/Makefile
             toolbar/Makefile
             treectrl/Makefile
             typetest/Makefile
             validate/Makefile
             text/Makefile
             thread/Makefile
             toolbar/Makefile
             treectrl/Makefile
             typetest/Makefile
             validate/Makefile

-            sockets/Makefile
+            widgets/Makefile

             wizard/Makefile
             html/Makefile
             html/about/Makefile
             wizard/Makefile
             html/Makefile
             html/about/Makefile


@@ -696,6 +729,10 @@ trap 'rm -fr `echo "
             html/zip/Makefile
             html/virtual/Makefile
             html/widget/Makefile
             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
         " | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
 EOF
 cat >> $CONFIG_STATUS <<EOF


@@ -729,6 +766,11 @@ s%@oldincludedir@%$oldincludedir%g
 s%@infodir@%$infodir%g
 s%@mandir@%$mandir%g
 s%@SAMPLES_SUBDIRS@%$SAMPLES_SUBDIRS%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
 
 CEOF
 EOF


@@ -771,6 +813,8 @@ EOF
 cat >> $CONFIG_STATUS <<EOF
 
 CONFIG_FILES=\${CONFIG_FILES-"Makefile
 cat >> $CONFIG_STATUS <<EOF
 
 CONFIG_FILES=\${CONFIG_FILES-"Makefile

+            access/Makefile
+            artprov/Makefile

             caret/Makefile
             calendar/Makefile
             checklst/Makefile
             caret/Makefile
             calendar/Makefile
             checklst/Makefile


@@ -779,10 +823,15 @@ CONFIG_FILES=\${CONFIG_FILES-"Makefile
             console/Makefile
             db/Makefile
             dialogs/Makefile
             console/Makefile
             db/Makefile
             dialogs/Makefile

+            dialup/Makefile

             docview/Makefile
             docvwmdi/Makefile
             dnd/Makefile
             docview/Makefile
             docvwmdi/Makefile
             dnd/Makefile

+            dragimag/Makefile

             drawing/Makefile
             drawing/Makefile

+            dynamic/Makefile
+            erase/Makefile
+            event/Makefile

             exec/Makefile
             font/Makefile
             grid/Makefile
             exec/Makefile
             font/Makefile
             grid/Makefile


@@ -790,33 +839,43 @@ CONFIG_FILES=\${CONFIG_FILES-"Makefile
             image/Makefile
             internat/Makefile
             ipc/Makefile
             image/Makefile
             internat/Makefile
             ipc/Makefile

+            joytest/Makefile
+            keyboard/Makefile

             layout/Makefile
             listctrl/Makefile
             mdi/Makefile
             layout/Makefile
             listctrl/Makefile
             mdi/Makefile

+            menu/Makefile
+            memcheck/Makefile

             minifram/Makefile
             minimal/Makefile
             minifram/Makefile
             minimal/Makefile

-            dialup/Makefile
-            newgrid/Makefile
+            mobile/Makefile
+            mobile/wxedit/Makefile
+            mobile/styles/Makefile
+            multimon/Makefile
+            nativedlg/Makefile

             notebook/Makefile
             notebook/Makefile

+            oleauto/Makefile
+            ownerdrw/Makefile

             png/Makefile
             printing/Makefile
             png/Makefile
             printing/Makefile

-            proplist/Makefile

             propsize/Makefile
             propsize/Makefile

-            richedit/Makefile
-            resource/Makefile
+            regtest/Makefile

             rotate/Makefile
             sashtest/Makefile
             rotate/Makefile
             sashtest/Makefile

+            shaped/Makefile

             scroll/Makefile
             scrollsub/Makefile
             scroll/Makefile
             scrollsub/Makefile

+            sockets/Makefile

             splitter/Makefile
             statbar/Makefile
             splitter/Makefile
             statbar/Makefile

+            taskbar/Makefile

             text/Makefile
             thread/Makefile
             toolbar/Makefile
             treectrl/Makefile
             typetest/Makefile
             validate/Makefile
             text/Makefile
             thread/Makefile
             toolbar/Makefile
             treectrl/Makefile
             typetest/Makefile
             validate/Makefile

-            sockets/Makefile
+            widgets/Makefile

             wizard/Makefile
             html/Makefile
             html/about/Makefile
             wizard/Makefile
             html/Makefile
             html/about/Makefile


@@ -827,6 +886,10 @@ CONFIG_FILES=\${CONFIG_FILES-"Makefile
             html/zip/Makefile
             html/virtual/Makefile
             html/widget/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
         "}
 EOF
 cat >> $CONFIG_STATUS <<\EOF