Updated makewx... scripts

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

diff --git a/docs/gtk/makewxgtk b/docs/gtk/makewxgtk
index cf8ac225e021a07132db18793e95d9ddd646ffb3..b726bd480503aeb88a20539b4684d52aeae3d7d9 100644 (file)
--- a/docs/gtk/makewxgtk
+++ b/docs/gtk/makewxgtk
@@ -1,11 +1,19 @@
 # makewxgtk
-# Sets permissions (in case we extracted wxGTK from zip files)
-# and makes wxGTK.
-# Call from top-level wxWindows directory.
-# Note that this uses standard (but commonly-used) configure options;
-# if you're feeling brave, you may wish to compile with threads.
-# -- Julian Smart
+# Configures and makes wxGTK from either the root wxWindows directory
+# or a build directory underneath it.
+
+CONFIG=./configure
+
+if [ ! -f ./configure ]; then
+  CONFIG=../configure
+fi
+
+CONFIG="$CONFIG --disable-shared --enable-gui --with-gtk --enable-debug_flag --enable-log --enable-debug_info --enable-debug --enable-threads --enable-sockets -with-odbc -with-libjpeg --enable-debug_cntxt"
+
+echo Invoking $CONFIG
+
 rm -f *.cache
-chmod a+x configure config.sub config.guess samples/configure demos/configure contrib/configure
-./configure --disable-shared --with-gtk --with-debug_flag --with-debug_info --enable-debug --without-threads --without-sockets -without-odbc -without-libjpeg
+$CONFIG
+
 make
+

diff --git a/docs/motif/makewxmotif b/docs/motif/makewxmotif
index bed60a303b8fc4ee0f953066c00343ea74e68b8c..75ebec2b279d02e4fa7122e564f7c679854b0855 100644 (file)
--- a/docs/motif/makewxmotif
+++ b/docs/motif/makewxmotif
@@ -1,11 +1,17 @@
 # makewxmotif
-# Sets permissions (in case we extracted wxMotif from zip files)
-# and makes wxMotif.
-# Call from top-level wxWindows directory.
-# Note that this uses standard (but commonly-used) configure options;
-# if you're feeling brave, you may wish to compile with threads.
-# -- Julian Smart
+# Configures and makes wxMotif from either the root wxWindows directory
+# or a build directory underneath it.
+
+CONFIG=./configure
+
+if [ ! -f ./configure ]; then
+  CONFIG=../configure
+fi
+
+CONFIG="$CONFIG --disable-shared --with-motif --without-gtk --enable-debug_flag --enable-debug_info --enable-debug --disable-sockets --disable-odbc --enable-threads --enable-newgrid"
+
+echo Invoking $CONFIG
+
 rm -f *.cache
-chmod a+x configure config.sub config.guess samples/configure demos/configure contrib/configure
-./configure --disable-shared --with-motif --without-gtk --with-debug_flag --with-debug_info --enable-debug --without-sockets --without-odbc --without-threads --enable-newgrid
+$CONFIG
 make