Committing in .

[wxWidgets.git] / samples / configure

diff --git a/samples/configure b/samples/configure
index ebbe38a6eba7180d221acab624614591d47233ba..602f6a1054c21d9784fbe58e91b537d898a48ba9 100755 (executable)
--- a/samples/configure
+++ b/samples/configure
@@ -526,9 +526,13 @@ 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
 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 +667,8 @@ trap 'rm -fr `echo "
             dragimag/Makefile
             drawing/Makefile
             dynamic/Makefile
             dragimag/Makefile
             drawing/Makefile
             dynamic/Makefile

+            erase/Makefile
+            event/Makefile

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


@@ -675,11 +681,11 @@ trap 'rm -fr `echo "
             listctrl/Makefile
             mdi/Makefile
             menu/Makefile
             listctrl/Makefile
             mdi/Makefile
             menu/Makefile

+            memcheck/Makefile

             minifram/Makefile
             minimal/Makefile
             newgrid/Makefile
             notebook/Makefile
             minifram/Makefile
             minimal/Makefile
             newgrid/Makefile
             notebook/Makefile

-            plot/Makefile

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


@@ -690,6 +696,7 @@ trap 'rm -fr `echo "
             sashtest/Makefile
             scroll/Makefile
             scrollsub/Makefile
             sashtest/Makefile
             scroll/Makefile
             scrollsub/Makefile

+            sockets/Makefile

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


@@ -699,7 +706,7 @@ trap 'rm -fr `echo "
             treelay/Makefile
             typetest/Makefile
             validate/Makefile
             treelay/Makefile
             typetest/Makefile
             validate/Makefile

-            sockets/Makefile
+            widgets/Makefile

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


@@ -747,9 +754,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%@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


@@ -807,6 +816,8 @@ CONFIG_FILES=\${CONFIG_FILES-"Makefile
             dragimag/Makefile
             drawing/Makefile
             dynamic/Makefile
             dragimag/Makefile
             drawing/Makefile
             dynamic/Makefile

+            erase/Makefile
+            event/Makefile

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


@@ -819,11 +830,11 @@ CONFIG_FILES=\${CONFIG_FILES-"Makefile
             listctrl/Makefile
             mdi/Makefile
             menu/Makefile
             listctrl/Makefile
             mdi/Makefile
             menu/Makefile

+            memcheck/Makefile

             minifram/Makefile
             minimal/Makefile
             newgrid/Makefile
             notebook/Makefile
             minifram/Makefile
             minimal/Makefile
             newgrid/Makefile
             notebook/Makefile

-            plot/Makefile

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


@@ -834,6 +845,7 @@ CONFIG_FILES=\${CONFIG_FILES-"Makefile
             sashtest/Makefile
             scroll/Makefile
             scrollsub/Makefile
             sashtest/Makefile
             scroll/Makefile
             scrollsub/Makefile

+            sockets/Makefile

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


@@ -843,7 +855,7 @@ CONFIG_FILES=\${CONFIG_FILES-"Makefile
             treelay/Makefile
             typetest/Makefile
             validate/Makefile
             treelay/Makefile
             typetest/Makefile
             validate/Makefile

-            sockets/Makefile
+            widgets/Makefile

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