Reconcile HAVE_VARIADIC_MACROS and wxHAS_VARIADIC_MACROS definitions.

[wxWidgets.git] / wx-config-inplace.in

diff --git a/wx-config-inplace.in b/wx-config-inplace.in
index 06b07426313e42807da98cf879a26851eb62af3a..a95d45f30f1bdf5ba708622af43a072c2a85cf83 100644 (file)
--- a/wx-config-inplace.in
+++ b/wx-config-inplace.in
@@ -3,7 +3,7 @@
 # Name:        wx-config-inplace
 # Purpose:     wx configuration in tree search and query tool
 # Author:      Ron <ron@debian.org>
-# Modified by: VZ on 2005-09-21 to actually work with Bourne shell
+# Modified by: VZ on 2005-09-20 to make it work with Bourne shell
 # Created:     14/9/2004
 # RCS-ID:      $Id$
 # Copyright:   (c) 2004 Ron <ron@debian.org>
@@ -21,10 +21,19 @@ check_dirname()
         printf "             no longer exists.\n\n" 1>&2
         exit 1
     fi
+    ( cd $1 && pwd )
 }
 
-check_dirname "@abs_top_srcdir@"
-check_dirname "@abs_top_builddir@"
+# set the variables which allow the real wx-config to check if we're using it
+# in place or after installation
+this_prefix=`check_dirname "@abs_top_srcdir@"`
+if [ "x$this_prefix" = "x" ]; then
+    exit 1
+fi
+this_exec_prefix=`check_dirname "@abs_top_builddir@"`
+if [ "x$this_exec_prefix" = "x" ]; then
+    exit 1
+fi
 
-. "@abs_top_builddir@/lib/wx/config/@TOOLCHAIN_FULLNAME@"
+. "$this_exec_prefix/lib/wx/config/@TOOLCHAIN_FULLNAME@"