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

diff --git a/configure b/configure
index 810faa0828bc62bb185c3885c0d4f0612ad1065e..875ebebf09ea9e342a2ba929f6ba30f458d9c67e 100755 (executable)
--- a/configure
+++ b/configure
@@ -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"
 

diff --git a/configure.in b/configure.in
index 32007dc5c0be29d8f306bd350cf3f8a2397f2c3c..d97cc61ae733ccd787ec95acfcb1b8b39b51fb80 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -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

diff --git a/demos/configure b/demos/configure
index 64e6c8917074b281e43636750a34306a3ed73782..7c762cba56877a94617157feda96cd3f9a1a5d52 100755 (executable)
--- a/demos/configure
+++ b/demos/configure
@@ -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

diff --git a/demos/configure.in b/demos/configure.in
index 3ea43d881401eab65ad3ac20d6c02e4aaa6d4148..983747c7ca6f166a9e9f4a1c1d8f4453a7dbe258 100644 (file)
--- a/demos/configure.in
+++ b/demos/configure.in
@@ -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

diff --git a/samples/configure b/samples/configure
index 6476a00c55135b0f923f5fe0a668c6f78a41dce1..602f6a1054c21d9784fbe58e91b537d898a48ba9 100755 (executable)
--- a/samples/configure
+++ b/samples/configure
@@ -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

diff --git a/samples/configure.in b/samples/configure.in
index 6152ff2426700da55938755d8c32d76a7892844d..dba162606c226f655d513c288e487a8ebe6e0b47 100644 (file)
--- a/samples/configure.in
+++ b/samples/configure.in
@@ -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)