changes to allow making samples/demos with non GNU make as well
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13797 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
4
configure
vendored
4
configure
vendored
@@ -19822,12 +19822,14 @@ fi
|
||||
|
||||
if test "$wxUSE_GUI" = "yes"; then
|
||||
wx_cv_path_samplesubdirs=$SAMPLES_SUBDIRS
|
||||
wx_cv_if_gnu_make=$IF_GNU_MAKE
|
||||
wx_cv_path_ifs=$PATH_IFS
|
||||
wx_cv_program_ext=$PROGRAM_EXT
|
||||
wx_cv_target_library=$WX_TARGET_LIBRARY
|
||||
wx_cv_target_library_gl=$WX_TARGET_LIBRARY_GL
|
||||
wx_cv_target_libtype=$WX_TARGET_LIBRARY_TYPE
|
||||
export wx_cv_path_samplesubdirs wx_cv_path_ifs wx_cv_program_ext \
|
||||
export wx_cv_path_samplesubdirs wx_cv_if_gnu_make \
|
||||
wx_cv_path_ifs wx_cv_program_ext \
|
||||
wx_cv_target_library wx_cv_target_library_gl wx_cv_target_libtype
|
||||
subdirs="demos samples utils contrib"
|
||||
|
||||
|
@@ -4731,6 +4731,7 @@ if test "$wxUSE_GUI" = "yes"; then
|
||||
dnl we need to pass SAMPLES_SUBDIRS (and some other) to the configure in
|
||||
dnl samples and the only way to do it is, again, use the cache
|
||||
wx_cv_path_samplesubdirs=$SAMPLES_SUBDIRS
|
||||
wx_cv_if_gnu_make=$IF_GNU_MAKE
|
||||
wx_cv_path_ifs=$PATH_IFS
|
||||
wx_cv_program_ext=$PROGRAM_EXT
|
||||
wx_cv_target_library=$WX_TARGET_LIBRARY
|
||||
@@ -4738,7 +4739,8 @@ if test "$wxUSE_GUI" = "yes"; then
|
||||
wx_cv_target_libtype=$WX_TARGET_LIBRARY_TYPE
|
||||
dnl we need to export them because passing them through cache won't
|
||||
dnl work when cache=/dev/null (which is default for autoconf 2.50)
|
||||
export wx_cv_path_samplesubdirs wx_cv_path_ifs wx_cv_program_ext \
|
||||
export wx_cv_path_samplesubdirs wx_cv_if_gnu_make \
|
||||
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)
|
||||
fi
|
||||
|
6
demos/configure
vendored
6
demos/configure
vendored
@@ -1,6 +1,6 @@
|
||||
#! /bin/sh
|
||||
|
||||
# From configure.in Id
|
||||
# From configure.in Id: configure.in
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated automatically using autoconf version 2.13
|
||||
# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
|
||||
@@ -523,6 +523,9 @@ fi
|
||||
|
||||
|
||||
|
||||
IF_GNU_MAKE=$wx_cv_if_gnu_make
|
||||
|
||||
|
||||
trap '' 1 2 15
|
||||
cat > confcache <<\EOF
|
||||
# This file is a shell script that caches the results of configure
|
||||
@@ -675,6 +678,7 @@ s%@includedir@%$includedir%g
|
||||
s%@oldincludedir@%$oldincludedir%g
|
||||
s%@infodir@%$infodir%g
|
||||
s%@mandir@%$mandir%g
|
||||
s%@IF_GNU_MAKE@%$IF_GNU_MAKE%g
|
||||
|
||||
CEOF
|
||||
EOF
|
||||
|
@@ -3,6 +3,9 @@ AC_REVISION($Id$)dnl
|
||||
|
||||
AC_INIT(Makefile.in)
|
||||
|
||||
IF_GNU_MAKE=$wx_cv_if_gnu_make
|
||||
AC_SUBST(IF_GNU_MAKE)
|
||||
|
||||
AC_OUTPUT([
|
||||
Makefile
|
||||
bombs/Makefile
|
||||
|
3
samples/configure
vendored
3
samples/configure
vendored
@@ -526,6 +526,7 @@ fi
|
||||
SAMPLES_SUBDIRS=$wx_cv_path_samplesubdirs
|
||||
|
||||
|
||||
IF_GNU_MAKE=$wx_cv_if_gnu_make
|
||||
PATH_IFS=$wx_cv_path_ifs
|
||||
PROGRAM_EXT=$wx_cv_program_ext
|
||||
WX_TARGET_LIBRARY=$wx_cv_target_library
|
||||
@@ -536,6 +537,7 @@ WX_TARGET_LIBRARY_GL=$wx_cv_target_library_gl
|
||||
|
||||
|
||||
|
||||
|
||||
trap '' 1 2 15
|
||||
cat > confcache <<\EOF
|
||||
# This file is a shell script that caches the results of configure
|
||||
@@ -752,6 +754,7 @@ s%@oldincludedir@%$oldincludedir%g
|
||||
s%@infodir@%$infodir%g
|
||||
s%@mandir@%$mandir%g
|
||||
s%@SAMPLES_SUBDIRS@%$SAMPLES_SUBDIRS%g
|
||||
s%@IF_GNU_MAKE@%$IF_GNU_MAKE%g
|
||||
s%@PATH_IFS@%$PATH_IFS%g
|
||||
s%@PROGRAM_EXT@%$PROGRAM_EXT%g
|
||||
s%@WX_TARGET_LIBRARY@%$WX_TARGET_LIBRARY%g
|
||||
|
@@ -6,11 +6,13 @@ AC_INIT(Makefile.in)
|
||||
SAMPLES_SUBDIRS=$wx_cv_path_samplesubdirs
|
||||
AC_SUBST(SAMPLES_SUBDIRS)
|
||||
|
||||
IF_GNU_MAKE=$wx_cv_if_gnu_make
|
||||
PATH_IFS=$wx_cv_path_ifs
|
||||
PROGRAM_EXT=$wx_cv_program_ext
|
||||
WX_TARGET_LIBRARY=$wx_cv_target_library
|
||||
WX_TARGET_LIBRARY_GL=$wx_cv_target_library_gl
|
||||
|
||||
AC_SUBST(IF_GNU_MAKE)
|
||||
AC_SUBST(PATH_IFS)
|
||||
AC_SUBST(PROGRAM_EXT)
|
||||
AC_SUBST(WX_TARGET_LIBRARY)
|
||||
|
Reference in New Issue
Block a user