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

pass IF_GNU_MAKE and other configure params to the samples configure in wxUSE_GUI==0 case too

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15603 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-05-18 23:33:48 +00:00
parent 3ebfd15048
commit 57973b9c8a
2 changed files with 33 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
configure vendored
View File

@@ -20398,8 +20398,10 @@ else
fi fi
INCLUDES="-I\${top_builddir}/lib/wx/include/${TOOLCHAIN_NAME} -I\${top_srcdir}/include \ INCLUDES="-I\${top_builddir}/lib/wx/include/${TOOLCHAIN_NAME} \
$REGEX_INCLUDE $ZLIB_INCLUDE $PNG_INCLUDE $JPEG_INCLUDE $TIFF_INCLUDE $TOOLKIT_INCLUDE" -I\${top_srcdir}/include \
$REGEX_INCLUDE $ZLIB_INCLUDE $PNG_INCLUDE $JPEG_INCLUDE $TIFF_INCLUDE \
$TOOLKIT_INCLUDE"
if test "$wxUSE_GTK" = 1; then if test "$wxUSE_GTK" = 1; then
WXCONFIG_INCLUDE= WXCONFIG_INCLUDE=
@@ -20515,7 +20517,7 @@ SAMPLES_SUBDIRS="`echo $SAMPLES_SUBDIRS | tr -s ' ' | tr ' ' '\n' | sort | uniq
echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
echo "configure:20519: checking whether ${MAKE-make} sets \${MAKE}" >&5 echo "configure:20521: checking whether ${MAKE-make} sets \${MAKE}" >&5
set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
@@ -20548,20 +20550,19 @@ fi
if test "$wxUSE_GUI" = "yes"; then wx_cv_path_samplesubdirs=$SAMPLES_SUBDIRS
wx_cv_path_samplesubdirs=$SAMPLES_SUBDIRS wx_cv_if_gnu_make=$IF_GNU_MAKE
wx_cv_if_gnu_make=$IF_GNU_MAKE wx_cv_path_ifs=$PATH_IFS
wx_cv_path_ifs=$PATH_IFS wx_cv_program_ext=$PROGRAM_EXT
wx_cv_program_ext=$PROGRAM_EXT wx_cv_target_library=$WX_TARGET_LIBRARY
wx_cv_target_library=$WX_TARGET_LIBRARY wx_cv_target_library_gl=$WX_TARGET_LIBRARY_GL
wx_cv_target_library_gl=$WX_TARGET_LIBRARY_GL wx_cv_target_libtype=$WX_TARGET_LIBRARY_TYPE
wx_cv_target_libtype=$WX_TARGET_LIBRARY_TYPE export wx_cv_path_samplesubdirs wx_cv_if_gnu_make \
export wx_cv_path_samplesubdirs wx_cv_if_gnu_make \ wx_cv_path_ifs wx_cv_program_ext \
wx_cv_path_ifs wx_cv_program_ext \ wx_cv_target_library wx_cv_target_library_gl wx_cv_target_libtype
wx_cv_target_library wx_cv_target_library_gl wx_cv_target_libtype
subdirs="demos samples utils contrib" subdirs="demos samples utils contrib"
fi
trap '' 1 2 15 trap '' 1 2 15
cat > confcache <<\EOF cat > confcache <<\EOF

34
configure.in
View File

@@ -4926,24 +4926,22 @@ fi
AC_CONFIG_HEADER(setup.h:setup.h.in) AC_CONFIG_HEADER(setup.h:setup.h.in)
dnl some more GUI only things dnl we need to pass SAMPLES_SUBDIRS (and some other) to the configure in
if test "$wxUSE_GUI" = "yes"; then dnl samples and the only way to do it is to use the environment (another
dnl we need to pass SAMPLES_SUBDIRS (and some other) to the configure in dnl idea could have been to use the cache but this wouldn't work when
dnl samples and the only way to do it is, again, use the cache dnl configure doesn't use cache at all which is the default with autoconf 2.50)
wx_cv_path_samplesubdirs=$SAMPLES_SUBDIRS wx_cv_path_samplesubdirs=$SAMPLES_SUBDIRS
wx_cv_if_gnu_make=$IF_GNU_MAKE wx_cv_if_gnu_make=$IF_GNU_MAKE
wx_cv_path_ifs=$PATH_IFS wx_cv_path_ifs=$PATH_IFS
wx_cv_program_ext=$PROGRAM_EXT wx_cv_program_ext=$PROGRAM_EXT
wx_cv_target_library=$WX_TARGET_LIBRARY wx_cv_target_library=$WX_TARGET_LIBRARY
wx_cv_target_library_gl=$WX_TARGET_LIBRARY_GL wx_cv_target_library_gl=$WX_TARGET_LIBRARY_GL
wx_cv_target_libtype=$WX_TARGET_LIBRARY_TYPE wx_cv_target_libtype=$WX_TARGET_LIBRARY_TYPE
dnl we need to export them because passing them through cache won't export wx_cv_path_samplesubdirs wx_cv_if_gnu_make \
dnl work when cache=/dev/null (which is default for autoconf 2.50) wx_cv_path_ifs wx_cv_program_ext \
export wx_cv_path_samplesubdirs wx_cv_if_gnu_make \ wx_cv_target_library wx_cv_target_library_gl wx_cv_target_libtype
wx_cv_path_ifs wx_cv_program_ext \
wx_cv_target_library wx_cv_target_library_gl wx_cv_target_libtype AC_CONFIG_SUBDIRS(demos samples utils contrib)
AC_CONFIG_SUBDIRS(demos samples utils contrib)
fi
dnl create each of the files in the space separated list from the file.in dnl create each of the files in the space separated list from the file.in
dnl (the original file name may be overriden by appending another name after a dnl (the original file name may be overriden by appending another name after a