changes to allow making samples/demos with non GNU make as well

[wxWidgets.git] / samples / configure

diff --git a/samples/configure b/samples/configure
index 59f6f4652d76f4fa763e3d75174ca6444a0e0e41..602f6a1054c21d9784fbe58e91b537d898a48ba9 100755 (executable)
--- a/samples/configure
+++ b/samples/configure
@@ -2,7 +2,7 @@
 
 # From configure.in Id: configure.in
 # Guess values for system-dependent variables and create Makefiles.
-# Generated automatically using autoconf version 2.14 
+# Generated automatically using autoconf version 2.13 
 # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
 #
 # This configure script is free software; the Free Software Foundation
@@ -334,7 +334,7 @@ EOF
     verbose=yes ;;
 
   -version | --version | --versio | --versi | --vers)
-    echo "configure generated by autoconf version 2.14"
+    echo "configure generated by autoconf version 2.13"
     exit 0 ;;
 
   -with-* | --with-*)
@@ -526,6 +526,18 @@ 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
+
+
+
+
+
+
+
 trap '' 1 2 15
 cat > confcache <<\EOF
 # This file is a shell script that caches the results of configure
@@ -628,7 +640,7 @@ do
     echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
     exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
   -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
-    echo "$CONFIG_STATUS generated by autoconf version 2.14"
+    echo "$CONFIG_STATUS generated by autoconf version 2.13"
     exit 0 ;;
   -help | --help | --hel | --he | --h)
     echo "\$ac_cs_usage"; exit 0 ;;
@@ -652,7 +664,11 @@ trap 'rm -fr `echo "
             docview/Makefile
             docvwmdi/Makefile
             dnd/Makefile
+            dragimag/Makefile
             drawing/Makefile
+            dynamic/Makefile
+            erase/Makefile
+            event/Makefile
             exec/Makefile
             font/Makefile
             grid/Makefile
@@ -660,14 +676,16 @@ trap 'rm -fr `echo "
             image/Makefile
             internat/Makefile
             ipc/Makefile
+            joytest/Makefile
             layout/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
@@ -678,15 +696,17 @@ trap 'rm -fr `echo "
             sashtest/Makefile
             scroll/Makefile
             scrollsub/Makefile
+            sockets/Makefile
             splitter/Makefile
             statbar/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
@@ -697,6 +717,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
@@ -730,6 +754,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
@@ -784,7 +813,11 @@ CONFIG_FILES=\${CONFIG_FILES-"Makefile
             docview/Makefile
             docvwmdi/Makefile
             dnd/Makefile
+            dragimag/Makefile
             drawing/Makefile
+            dynamic/Makefile
+            erase/Makefile
+            event/Makefile
             exec/Makefile
             font/Makefile
             grid/Makefile
@@ -792,14 +825,16 @@ CONFIG_FILES=\${CONFIG_FILES-"Makefile
             image/Makefile
             internat/Makefile
             ipc/Makefile
+            joytest/Makefile
             layout/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
@@ -810,15 +845,17 @@ CONFIG_FILES=\${CONFIG_FILES-"Makefile
             sashtest/Makefile
             scroll/Makefile
             scrollsub/Makefile
+            sockets/Makefile
             splitter/Makefile
             statbar/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
@@ -829,6 +866,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