fix for missing AC_SUBST(SAMPLES_SUBDIRS)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5892 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/configure b/configure
index 2c1b4889f9b03fcc066d59f2b5dc80057bb3a75e..7e29aed628049f36f2dc635d0b4fc0c00178b46f 100755 (executable)
--- a/configure
+++ b/configure
@@ -12099,7 +12099,7 @@ ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
 ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
 cross_compiling=$ac_cv_prog_cxx_cross
 
-        echo $ac_n "checking the type of the third argument of getsockname""... $ac_c" 1>&6
+            echo $ac_n "checking the type of the third argument of getsockname""... $ac_c" 1>&6
 echo "configure:12104: checking the type of the third argument of getsockname" >&5
     cat > conftest.$ac_ext <<EOF
 #line 12106 "configure"
@@ -13191,9 +13191,10 @@ fi
 
 echo "$ac_t""$wx_cv_path_glcanvas" 1>&6
 
-        GL_TOOLKIT_DIR=$wx_cv_PATH_glcanvas
+        GL_TOOLKIT_DIR=$wx_cv_path_glcanvas
     
 
+            wx_cv_path_samplesubdirs=$SAMPLES_SUBDIRS
     subdirs="demos samples utils"
 
 fi

diff --git a/configure.in b/configure.in
index 2fe6d5492eb8c295dc238b92ba5d2a6d7e088a15..4affbd399ba8bf642ecad2a581056faaf292e44d 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -3379,9 +3379,12 @@ if test "$wxUSE_GUI" = "yes"; then
     ])
 
     dnl It's needed in glcanvas/Makefile.in so we even have to subst this hack!
-    GL_TOOLKIT_DIR=$wx_cv_PATH_glcanvas
+    GL_TOOLKIT_DIR=$wx_cv_path_glcanvas
     AC_SUBST(GL_TOOLKIT_DIR)
 
+    dnl another hack: we need to pass SAMPLES_SUBDIRS to the configure in
+    dnl samples and the only way to do it is, again, use the cache
+    wx_cv_path_samplesubdirs=$SAMPLES_SUBDIRS
     AC_CONFIG_SUBDIRS(demos samples utils)
 fi
 dnl from wxUSE_GUI

diff --git a/samples/configure b/samples/configure
index d55867cfaba765c38ff4ac75c9d5a3aa88e77826..0a88efd4cb6a6dbd7c98f3dedebf450ab05f196e 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-*)
@@ -523,6 +523,9 @@ fi
 
 
 
+SAMPLES_SUBDIRS=$wx_cv_path_samplesubdirs
+
+
 trap '' 1 2 15
 cat > confcache <<\EOF
 # This file is a shell script that caches the results of configure
@@ -625,7 +628,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 ;;
@@ -725,6 +728,7 @@ s%@includedir@%$includedir%g
 s%@oldincludedir@%$oldincludedir%g
 s%@infodir@%$infodir%g
 s%@mandir@%$mandir%g
+s%@SAMPLES_SUBDIRS@%$SAMPLES_SUBDIRS%g
 
 CEOF
 EOF

diff --git a/samples/configure.in b/samples/configure.in
index 6d8561f9ffbc189c5231f8e7868986bcdf4065e2..633b12e9e00704d28106543085622eeab63abeb3 100644 (file)
--- a/samples/configure.in
+++ b/samples/configure.in
@@ -3,6 +3,9 @@ AC_REVISION($Id$)dnl
 
 AC_INIT(Makefile.in)
 
+SAMPLES_SUBDIRS=$wx_cv_path_samplesubdirs
+AC_SUBST(SAMPLES_SUBDIRS)
+
 AC_OUTPUT([
             Makefile
             caret/Makefile