Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix for missing AC_SUBST(SAMPLES_SUBDIRS)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5892 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2000-02-07 17:33:23 +00:00
parent b089607b63
commit ec90f5e53a
4 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
configure vendored
View File

@@ -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' ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
cross_compiling=$ac_cv_prog_cxx_cross 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 echo "configure:12104: checking the type of the third argument of getsockname" >&5
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 12106 "configure" #line 12106 "configure"
@@ -13191,9 +13191,10 @@ fi
echo "$ac_t""$wx_cv_path_glcanvas" 1>&6 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" subdirs="demos samples utils"
fi fi

5
configure.in
View File

@@ -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! 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) 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) AC_CONFIG_SUBDIRS(demos samples utils)
fi fi
dnl from wxUSE_GUI dnl from wxUSE_GUI

10
samples/configure vendored
View File

@@ -2,7 +2,7 @@
# From configure.in Id: configure.in # From configure.in Id: configure.in
# Guess values for system-dependent variables and create Makefiles. # 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. # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
# #
# This configure script is free software; the Free Software Foundation # This configure script is free software; the Free Software Foundation
@@ -334,7 +334,7 @@ EOF
verbose=yes ;; verbose=yes ;;
-version | --version | --versio | --versi | --vers) -version | --version | --versio | --versi | --vers)
echo "configure generated by autoconf version 2.14" echo "configure generated by autoconf version 2.13"
exit 0 ;; exit 0 ;;
-with-* | --with-*) -with-* | --with-*)
@@ -523,6 +523,9 @@ fi
SAMPLES_SUBDIRS=$wx_cv_path_samplesubdirs
trap '' 1 2 15 trap '' 1 2 15
cat > confcache <<\EOF cat > confcache <<\EOF
# This file is a shell script that caches the results of configure # 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" 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 ;; exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
-version | --version | --versio | --versi | --vers | --ver | --ve | --v) -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 ;; exit 0 ;;
-help | --help | --hel | --he | --h) -help | --help | --hel | --he | --h)
echo "\$ac_cs_usage"; exit 0 ;; echo "\$ac_cs_usage"; exit 0 ;;
@@ -725,6 +728,7 @@ s%@includedir@%$includedir%g
s%@oldincludedir@%$oldincludedir%g s%@oldincludedir@%$oldincludedir%g
s%@infodir@%$infodir%g s%@infodir@%$infodir%g
s%@mandir@%$mandir%g s%@mandir@%$mandir%g
s%@SAMPLES_SUBDIRS@%$SAMPLES_SUBDIRS%g
CEOF CEOF
EOF EOF

3
samples/configure.in
View File

@@ -3,6 +3,9 @@ AC_REVISION($Id$)dnl
AC_INIT(Makefile.in) AC_INIT(Makefile.in)
SAMPLES_SUBDIRS=$wx_cv_path_samplesubdirs
AC_SUBST(SAMPLES_SUBDIRS)
AC_OUTPUT([ AC_OUTPUT([
Makefile Makefile
caret/Makefile caret/Makefile