experimental --inplace flag implementation

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

diff --git a/configure b/configure
index 0b71a579389b0d10c35a8da64b4b3be836a9881e..c27f0dd5e1b1874bb7b6924a3ebc0606a1fd982d 100755 (executable)
--- a/configure
+++ b/configure
@@ -21797,6 +21797,8 @@ cat >> confdefs.h <<EOF
 EOF
 
 
 EOF
 
 

+top_builddir=`pwd`
+

 
 
 
 
 
 


@@ -21812,12 +21814,12 @@ have_floor=0
 for ac_func in cos
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
 for ac_func in cos
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6

-echo "configure:21816: checking for $ac_func" >&5
+echo "configure:21818: checking for $ac_func" >&5

 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF

-#line 21821 "configure"
+#line 21823 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */


@@ -21840,7 +21842,7 @@ $ac_func();
 
 ; return 0; }
 EOF
 
 ; return 0; }
 EOF

-if { (eval echo configure:21844: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:21846: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else


@@ -21867,12 +21869,12 @@ done
 for ac_func in floor
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
 for ac_func in floor
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6

-echo "configure:21871: checking for $ac_func" >&5
+echo "configure:21873: checking for $ac_func" >&5

 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF

-#line 21876 "configure"
+#line 21878 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */


@@ -21895,7 +21897,7 @@ $ac_func();
 
 ; return 0; }
 EOF
 
 ; return 0; }
 EOF

-if { (eval echo configure:21899: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:21901: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else


@@ -21920,7 +21922,7 @@ fi
 done
 
 echo $ac_n "checking if floating point functions link without -lm""... $ac_c" 1>&6
 done
 
 echo $ac_n "checking if floating point functions link without -lm""... $ac_c" 1>&6

-echo "configure:21924: checking if floating point functions link without -lm" >&5
+echo "configure:21926: checking if floating point functions link without -lm" >&5

 if test "$have_cos" = 1 -a "$have_floor" = 1; then
     echo "$ac_t""yes" 1>&6
 else
 if test "$have_cos" = 1 -a "$have_floor" = 1; then
     echo "$ac_t""yes" 1>&6
 else


@@ -21932,12 +21934,12 @@ else
     for ac_func in sin
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
     for ac_func in sin
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6

-echo "configure:21936: checking for $ac_func" >&5
+echo "configure:21938: checking for $ac_func" >&5

 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF

-#line 21941 "configure"
+#line 21943 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */


@@ -21960,7 +21962,7 @@ $ac_func();
 
 ; return 0; }
 EOF
 
 ; return 0; }
 EOF

-if { (eval echo configure:21964: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:21966: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else


@@ -21987,12 +21989,12 @@ done
     for ac_func in ceil
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
     for ac_func in ceil
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6

-echo "configure:21991: checking for $ac_func" >&5
+echo "configure:21993: checking for $ac_func" >&5

 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF

-#line 21996 "configure"
+#line 21998 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */


@@ -22015,7 +22017,7 @@ $ac_func();
 
 ; return 0; }
 EOF
 
 ; return 0; }
 EOF

-if { (eval echo configure:22019: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:22021: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else


@@ -22040,7 +22042,7 @@ fi
 done
 
     echo $ac_n "checking if floating point functions link with -lm""... $ac_c" 1>&6
 done
 
     echo $ac_n "checking if floating point functions link with -lm""... $ac_c" 1>&6

-echo "configure:22044: checking if floating point functions link with -lm" >&5
+echo "configure:22046: checking if floating point functions link with -lm" >&5

     if test "$have_sin" = 1 -a "$have_ceil" = 1; then
         echo "$ac_t""yes" 1>&6
     else
     if test "$have_sin" = 1 -a "$have_ceil" = 1; then
         echo "$ac_t""yes" 1>&6
     else


@@ -22190,10 +22192,11 @@ 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:22197: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:22200: checking whether ${MAKE-make} sets \${MAKE}" >&5

 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
   echo $ac_n "(cached) $ac_c" 1>&6
 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
   echo $ac_n "(cached) $ac_c" 1>&6


@@ -22476,6 +22479,7 @@ s%@TOOLKIT_VPATH@%$TOOLKIT_VPATH%g
 s%@TOOLCHAIN_NAME@%$TOOLCHAIN_NAME%g
 s%@TOOLCHAIN_DEFS@%$TOOLCHAIN_DEFS%g
 s%@TOOLCHAIN_DLL_DEFS@%$TOOLCHAIN_DLL_DEFS%g
 s%@TOOLCHAIN_NAME@%$TOOLCHAIN_NAME%g
 s%@TOOLCHAIN_DEFS@%$TOOLCHAIN_DEFS%g
 s%@TOOLCHAIN_DLL_DEFS@%$TOOLCHAIN_DLL_DEFS%g

+s%@top_builddir@%$top_builddir%g

 s%@cross_compiling@%$cross_compiling%g
 s%@WXCONFIG_LIBS@%$WXCONFIG_LIBS%g
 s%@WXCONFIG_LIBS_GL@%$WXCONFIG_LIBS_GL%g
 s%@cross_compiling@%$cross_compiling%g
 s%@WXCONFIG_LIBS@%$WXCONFIG_LIBS%g
 s%@WXCONFIG_LIBS_GL@%$WXCONFIG_LIBS_GL%g

diff --git a/configure.in b/configure.in
index 33d93c5d228b4f832823a8d14d54d273d6c7361a..2fa40996fbd01ab991578a1f21e34445695d1028 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -5159,6 +5159,9 @@ fi
 
 AC_DEFINE_UNQUOTED(wxINSTALL_PREFIX, "$wxPREFIX")
 
 
 AC_DEFINE_UNQUOTED(wxINSTALL_PREFIX, "$wxPREFIX")
 

+dnl define the variables used in wx-config
+top_builddir=`pwd`
+

 dnl ---------------------------------------------------------------------------
 dnl Output the makefiles and such from the results found above
 dnl ---------------------------------------------------------------------------
 dnl ---------------------------------------------------------------------------
 dnl Output the makefiles and such from the results found above
 dnl ---------------------------------------------------------------------------


@@ -5348,6 +5351,7 @@ AC_SUBST(TOOLCHAIN_DEFS)
 AC_SUBST(TOOLCHAIN_DLL_DEFS)
 
 dnl wx-config options
 AC_SUBST(TOOLCHAIN_DLL_DEFS)
 
 dnl wx-config options

+AC_SUBST(top_builddir)

 AC_SUBST(host_alias)
 AC_SUBST(cross_compiling)
 AC_SUBST(WXCONFIG_LIBS)
 AC_SUBST(host_alias)
 AC_SUBST(cross_compiling)
 AC_SUBST(WXCONFIG_LIBS)

diff --git a/wx-config.in b/wx-config.in
index 7fd7a85af5aa383a55994a783f3da677422008b1..1e487ad56148f9d597b981351732273724f7a3ef 100755 (executable)
--- a/wx-config.in
+++ b/wx-config.in
@@ -7,10 +7,29 @@ CC="@CC@"
 GCC="@GCC@"
 CXX="@CXX@"
 LD="@SHARED_LD@"
 GCC="@GCC@"
 CXX="@CXX@"
 LD="@SHARED_LD@"

+srcdir=@top_srcdir@
+builddir=@top_builddir@

 cross_compiling=@cross_compiling@
 target=@host_alias@
 static_flag=@STATIC_FLAG@
 
 cross_compiling=@cross_compiling@
 target=@host_alias@
 static_flag=@STATIC_FLAG@
 

+# return the absolute path prepending builddir to it if needed
+makeabs()
+{
+    path=$1
+    # TODO: this only works under Unix and even there it could be
+    #       enhanced to remove ".." and "."
+    if [ `echo $path | sed 's/^\(.\).*/\1/'` != "/" ]; then
+        if [ $path = "." ]; then
+            path=$builddir
+        else
+            path="$builddir/$path"
+        fi
+    fi
+
+    echo $path
+}
+

 usage()
 {
     cat <<EOF
 usage()
 {
     cat <<EOF


@@ -88,6 +107,11 @@ while test $# -gt 0; do
   esac
 
   case $1 in
   esac
 
   case $1 in

+    --inplace)
+      prefix=`makeabs $srcdir`
+      exec_prefix=`makeabs $builddir`
+      exec_prefix_set=yes
+      ;;

     --prefix=*)
       prefix=$optarg
       if test $exec_prefix_set = no ; then
     --prefix=*)
       prefix=$optarg
       if test $exec_prefix_set = no ; then