Added regex to WXINC line (patch from Markus G)

[wxWidgets.git] / contrib / configure

diff --git a/contrib/configure b/contrib/configure
index 297027a299699ebec2fc32740a54c376e37324cf..27de39350808131fbd4ea515ebdf9f4fc1ac1bf1 100755 (executable)
--- a/contrib/configure
+++ b/contrib/configure
@@ -812,21 +812,42 @@ done
 ac_given_srcdir=$srcdir
 
 trap 'rm -fr `echo "
 ac_given_srcdir=$srcdir
 
 trap 'rm -fr `echo "

-            Makefile

             src/Makefile
             src/ogl/Makefile
             src/mmedia/Makefile
             src/stc/Makefile
             src/Makefile
             src/ogl/Makefile
             src/mmedia/Makefile
             src/stc/Makefile

-            src/xml/Makefile
+            src/xrc/Makefile
+            src/canvas/Makefile
+            src/gizmos/Makefile
+            src/plot/Makefile
+            src/applet/Makefile
+            src/fl/Makefile

             samples/Makefile
             samples/mmedia/Makefile
             samples/ogl/Makefile
             samples/ogl/ogledit/Makefile
             samples/ogl/studio/Makefile
             samples/stc/Makefile
             samples/Makefile
             samples/mmedia/Makefile
             samples/ogl/Makefile
             samples/ogl/ogledit/Makefile
             samples/ogl/studio/Makefile
             samples/stc/Makefile

+            samples/canvas/Makefile
+            samples/canvas/test/Makefile
+            samples/canvas/simple/Makefile
+            samples/gizmos/Makefile
+            samples/gizmos/multicell/Makefile
+            samples/gizmos/splittree/Makefile
+            samples/gizmos/editlbox/Makefile
+            samples/xrc/Makefile
+            samples/plot/Makefile
+            samples/applet/Makefile
+            samples/fl/Makefile
+            samples/fl/fl_demo1/Makefile
+            samples/fl/fl_demo2/Makefile
+            samples/fl/fl_sample1/Makefile
+            samples/fl/fl_sample2/Makefile
+            samples/fl/fl_sample3/Makefile

             utils/Makefile
             utils/wxrc/Makefile
             utils/wxrcedit/Makefile
             utils/Makefile
             utils/wxrc/Makefile
             utils/wxrcedit/Makefile

+            utils/convertrc/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


@@ -905,21 +926,42 @@ EOF
 
 cat >> $CONFIG_STATUS <<EOF
 
 
 cat >> $CONFIG_STATUS <<EOF
 

-CONFIG_FILES=\${CONFIG_FILES-"Makefile
-            src/Makefile
+CONFIG_FILES=\${CONFIG_FILES-"src/Makefile

             src/ogl/Makefile
             src/mmedia/Makefile
             src/stc/Makefile
             src/ogl/Makefile
             src/mmedia/Makefile
             src/stc/Makefile

-            src/xml/Makefile
+            src/xrc/Makefile
+            src/canvas/Makefile
+            src/gizmos/Makefile
+            src/plot/Makefile
+            src/applet/Makefile
+            src/fl/Makefile

             samples/Makefile
             samples/mmedia/Makefile
             samples/ogl/Makefile
             samples/ogl/ogledit/Makefile
             samples/ogl/studio/Makefile
             samples/stc/Makefile
             samples/Makefile
             samples/mmedia/Makefile
             samples/ogl/Makefile
             samples/ogl/ogledit/Makefile
             samples/ogl/studio/Makefile
             samples/stc/Makefile

+            samples/canvas/Makefile
+            samples/canvas/test/Makefile
+            samples/canvas/simple/Makefile
+            samples/gizmos/Makefile
+            samples/gizmos/multicell/Makefile
+            samples/gizmos/splittree/Makefile
+            samples/gizmos/editlbox/Makefile
+            samples/xrc/Makefile
+            samples/plot/Makefile
+            samples/applet/Makefile
+            samples/fl/Makefile
+            samples/fl/fl_demo1/Makefile
+            samples/fl/fl_demo2/Makefile
+            samples/fl/fl_sample1/Makefile
+            samples/fl/fl_sample2/Makefile
+            samples/fl/fl_sample3/Makefile

             utils/Makefile
             utils/wxrc/Makefile
             utils/wxrcedit/Makefile
             utils/Makefile
             utils/wxrc/Makefile
             utils/wxrcedit/Makefile

+            utils/convertrc/Makefile

          "}
 EOF
 cat >> $CONFIG_STATUS <<\EOF
          "}
 EOF
 cat >> $CONFIG_STATUS <<\EOF