wxMotif now uses src/x11/region.cpp, change makefiles accordingly.

[wxWidgets.git] / utils / configure

diff --git a/utils/configure b/utils/configure
index 3626b629fb41373213ccaedfb7ec75b884d1f084..a85526b8190232b672c6350bdfd45797844274d8 100755 (executable)
--- a/utils/configure
+++ b/utils/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-*)
@@ -523,7 +523,15 @@ fi
 
 
 
+if test "x$wx_cv_use_gui" = "x"; then
+    { echo "configure: error: Please run configure from the top level directory." 1>&2; exit 1; }
+fi
+
 GL_TOOLKIT_DIR=$wx_cv_path_glcanvas
+USE_GUI=$wx_cv_use_gui
+USE_RESOURCES=$wx_cv_use_resources
+
+
 
 
 trap '' 1 2 15
@@ -628,7 +636,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 ;;
@@ -640,9 +648,6 @@ ac_given_srcdir=$srcdir
 
 trap 'rm -fr `echo "
             Makefile
-            wxMMedia2/Makefile
-            wxMMedia2/lib/Makefile
-            wxMMedia2/sample/Makefile
             makegen/Makefile
             HelpGen/Makefile
             HelpGen/src/Makefile
@@ -651,6 +656,10 @@ trap 'rm -fr `echo "
             hhp2cached/Makefile
             dialoged/Makefile
             dialoged/src/Makefile
+            emulator/Makefile
+            emulator/src/Makefile
+            helpview/Makefile
+            helpview/src/Makefile
          " | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
 EOF
 cat >> $CONFIG_STATUS <<EOF
@@ -684,6 +693,8 @@ s%@oldincludedir@%$oldincludedir%g
 s%@infodir@%$infodir%g
 s%@mandir@%$mandir%g
 s%@GL_TOOLKIT_DIR@%$GL_TOOLKIT_DIR%g
+s%@USE_GUI@%$USE_GUI%g
+s%@USE_RESOURCES@%$USE_RESOURCES%g
 
 CEOF
 EOF
@@ -726,9 +737,6 @@ EOF
 cat >> $CONFIG_STATUS <<EOF
 
 CONFIG_FILES=\${CONFIG_FILES-"Makefile
-            wxMMedia2/Makefile
-            wxMMedia2/lib/Makefile
-            wxMMedia2/sample/Makefile
             makegen/Makefile
             HelpGen/Makefile
             HelpGen/src/Makefile
@@ -737,6 +745,10 @@ CONFIG_FILES=\${CONFIG_FILES-"Makefile
             hhp2cached/Makefile
             dialoged/Makefile
             dialoged/src/Makefile
+            emulator/Makefile
+            emulator/src/Makefile
+            helpview/Makefile
+            helpview/src/Makefile
          "}
 EOF
 cat >> $CONFIG_STATUS <<\EOF