Added conversion of menu labels (&->~)

[wxWidgets.git] / samples / configure

diff --git a/samples/configure b/samples/configure
index 0a88efd4cb6a6dbd7c98f3dedebf450ab05f196e..1a376c1a05a001daae4cc2cceb0d98d4d1d86f27 100755 (executable)
--- a/samples/configure
+++ b/samples/configure
@@ -526,6 +526,14 @@ fi
 SAMPLES_SUBDIRS=$wx_cv_path_samplesubdirs
 
 
 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
 trap '' 1 2 15
 cat > confcache <<\EOF
 # This file is a shell script that caches the results of configure


@@ -648,9 +656,11 @@ 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
             exec/Makefile
             font/Makefile
             drawing/Makefile
             exec/Makefile
             font/Makefile


@@ -662,11 +672,12 @@ trap 'rm -fr `echo "
             layout/Makefile
             listctrl/Makefile
             mdi/Makefile
             layout/Makefile
             listctrl/Makefile
             mdi/Makefile

+            menu/Makefile

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

-            dialup/Makefile

             newgrid/Makefile
             notebook/Makefile
             newgrid/Makefile
             notebook/Makefile

+            plot/Makefile

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


@@ -683,6 +694,7 @@ trap 'rm -fr `echo "
             thread/Makefile
             toolbar/Makefile
             treectrl/Makefile
             thread/Makefile
             toolbar/Makefile
             treectrl/Makefile

+            treelay/Makefile

             typetest/Makefile
             validate/Makefile
             sockets/Makefile
             typetest/Makefile
             validate/Makefile
             sockets/Makefile


@@ -696,6 +708,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 +745,9 @@ 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%@PATH_IFS@%$PATH_IFS%g
+s%@PROGRAM_EXT@%$PROGRAM_EXT%g
+s%@WX_TARGET_LIBRARY@%$WX_TARGET_LIBRARY%g

 
 CEOF
 EOF
 
 CEOF
 EOF


@@ -779,9 +798,11 @@ 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
             exec/Makefile
             font/Makefile
             drawing/Makefile
             exec/Makefile
             font/Makefile


@@ -793,11 +814,12 @@ CONFIG_FILES=\${CONFIG_FILES-"Makefile
             layout/Makefile
             listctrl/Makefile
             mdi/Makefile
             layout/Makefile
             listctrl/Makefile
             mdi/Makefile

+            menu/Makefile

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

-            dialup/Makefile

             newgrid/Makefile
             notebook/Makefile
             newgrid/Makefile
             notebook/Makefile

+            plot/Makefile

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


@@ -814,6 +836,7 @@ CONFIG_FILES=\${CONFIG_FILES-"Makefile
             thread/Makefile
             toolbar/Makefile
             treectrl/Makefile
             thread/Makefile
             toolbar/Makefile
             treectrl/Makefile

+            treelay/Makefile

             typetest/Makefile
             validate/Makefile
             sockets/Makefile
             typetest/Makefile
             validate/Makefile
             sockets/Makefile


@@ -827,6 +850,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