Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated for bakefile 0.2.7.

Browse Source 
Copied bakefile.m4 from bakefile svn and regenerated configure using it.

This should have been done in r62308 but was forgotten. Notice that we can't
use bakefile 0.2.6 any more without reverting this change!

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62324 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-10-07 13:54:44 +00:00
parent 226ac45fc3
commit 2c459beb46
2 changed files with 23 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
build/aclocal/bakefile.m4
View File

@@ -490,7 +490,7 @@ AC_DEFUN([AC_BAKEFILE_SHARED_VERSIONS],
USE_SOVERLINUX=0
USE_SOVERSOLARIS=0
USE_SOVERCYGWIN=0
USE_SOSYMLINKS=0
USE_SOTWOSYMLINKS=0
USE_MACVERSION=0
SONAME_FLAG=
@@ -504,20 +504,19 @@ AC_DEFUN([AC_BAKEFILE_SHARED_VERSIONS],
fi
USE_SOVERSION=1
USE_SOVERLINUX=1
USE_SOSYMLINKS=1
USE_SOTWOSYMLINKS=1
;;
*-*-solaris2* )
SONAME_FLAG="-h "
USE_SOVERSION=1
USE_SOVERSOLARIS=1
USE_SOSYMLINKS=1
;;
*-*-darwin* )
USE_MACVERSION=1
USE_SOVERSION=1
USE_SOSYMLINKS=1
USE_SOTWOSYMLINKS=1
;;
*-*-cygwin* )
@@ -531,7 +530,7 @@ AC_DEFUN([AC_BAKEFILE_SHARED_VERSIONS],
AC_SUBST(USE_SOVERSOLARIS)
AC_SUBST(USE_SOVERCYGWIN)
AC_SUBST(USE_MACVERSION)
AC_SUBST(USE_SOSYMLINKS)
AC_SUBST(USE_SOTWOSYMLINKS)
AC_SUBST(SONAME_FLAG)
])

32
configure vendored
View File

@@ -801,7 +801,7 @@ USE_SOVERLINUX
USE_SOVERSOLARIS
USE_SOVERCYGWIN
USE_MACVERSION
USE_SOSYMLINKS
USE_SOTWOSYMLINKS
SONAME_FLAG
DEPS_TRACKING
BK_DEPS
@@ -975,10 +975,11 @@ COND_USE_PCH_1
COND_USE_PLUGINS_0
COND_USE_RTTI_0
COND_USE_RTTI_1
COND_USE_SOSYMLINKS_1
COND_USE_SOTWOSYMLINKS_1
COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1
COND_USE_SOVERLINUX_1
COND_USE_SOVERSION_0
COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1
COND_USE_SOVERSOLARIS_1
COND_USE_STC_1
COND_USE_THREADS_0
@@ -49272,7 +49273,7 @@ echo "$as_me: error: unknown system type $BAKEFILE_HOST." >&2;}
USE_SOVERLINUX=0
USE_SOVERSOLARIS=0
USE_SOVERCYGWIN=0
USE_SOSYMLINKS=0
USE_SOTWOSYMLINKS=0
USE_MACVERSION=0
SONAME_FLAG=
@@ -49286,20 +49287,19 @@ echo "$as_me: error: unknown system type $BAKEFILE_HOST." >&2;}
fi
USE_SOVERSION=1
USE_SOVERLINUX=1
USE_SOSYMLINKS=1
USE_SOTWOSYMLINKS=1
;;
*-*-solaris2* )
SONAME_FLAG="-h "
USE_SOVERSION=1
USE_SOVERSOLARIS=1
USE_SOSYMLINKS=1
;;
*-*-darwin* )
USE_MACVERSION=1
USE_SOVERSION=1
USE_SOSYMLINKS=1
USE_SOTWOSYMLINKS=1
;;
*-*-cygwin* )
@@ -50692,9 +50692,9 @@ EOF
COND_USE_RTTI_1=""
fi
COND_USE_SOSYMLINKS_1="#"
if test "x$USE_SOSYMLINKS" = "x1" ; then
COND_USE_SOSYMLINKS_1=""
COND_USE_SOTWOSYMLINKS_1="#"
if test "x$USE_SOTWOSYMLINKS" = "x1" ; then
COND_USE_SOTWOSYMLINKS_1=""
fi
COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1="#"
@@ -50712,6 +50712,11 @@ EOF
COND_USE_SOVERSION_0=""
fi
COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1="#"
if test "x$USE_SOVERSION" = "x1" -a "x$USE_SOVERSOLARIS" = "x1" ; then
COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1=""
fi
COND_USE_SOVERSOLARIS_1="#"
if test "x$USE_SOVERSOLARIS" = "x1" ; then
COND_USE_SOVERSOLARIS_1=""
@@ -52170,7 +52175,7 @@ USE_SOVERLINUX!$USE_SOVERLINUX$ac_delim
USE_SOVERSOLARIS!$USE_SOVERSOLARIS$ac_delim
USE_SOVERCYGWIN!$USE_SOVERCYGWIN$ac_delim
USE_MACVERSION!$USE_MACVERSION$ac_delim
USE_SOSYMLINKS!$USE_SOSYMLINKS$ac_delim
USE_SOTWOSYMLINKS!$USE_SOTWOSYMLINKS$ac_delim
SONAME_FLAG!$SONAME_FLAG$ac_delim
DEPS_TRACKING!$DEPS_TRACKING$ac_delim
BK_DEPS!$BK_DEPS$ac_delim
@@ -52426,10 +52431,11 @@ COND_USE_PCH_1!$COND_USE_PCH_1$ac_delim
COND_USE_PLUGINS_0!$COND_USE_PLUGINS_0$ac_delim
COND_USE_RTTI_0!$COND_USE_RTTI_0$ac_delim
COND_USE_RTTI_1!$COND_USE_RTTI_1$ac_delim
COND_USE_SOSYMLINKS_1!$COND_USE_SOSYMLINKS_1$ac_delim
COND_USE_SOTWOSYMLINKS_1!$COND_USE_SOTWOSYMLINKS_1$ac_delim
COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1!$COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1$ac_delim
COND_USE_SOVERLINUX_1!$COND_USE_SOVERLINUX_1$ac_delim
COND_USE_SOVERSION_0!$COND_USE_SOVERSION_0$ac_delim
COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1!$COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1$ac_delim
COND_USE_SOVERSOLARIS_1!$COND_USE_SOVERSOLARIS_1$ac_delim
COND_USE_STC_1!$COND_USE_STC_1$ac_delim
COND_USE_THREADS_0!$COND_USE_THREADS_0$ac_delim
@@ -52454,7 +52460,6 @@ COND_wxUSE_ZLIB_builtin!$COND_wxUSE_ZLIB_builtin$ac_delim
DEREZ!$DEREZ$ac_delim
SHARED!$SHARED$ac_delim
WX_LIBRARY_BASENAME_NOGUI!$WX_LIBRARY_BASENAME_NOGUI$ac_delim
WX_LIBRARY_BASENAME_GUI!$WX_LIBRARY_BASENAME_GUI$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -52496,6 +52501,7 @@ _ACEOF
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
WX_LIBRARY_BASENAME_GUI!$WX_LIBRARY_BASENAME_GUI$ac_delim
USE_GUI!$USE_GUI$ac_delim
AFMINSTALL!$AFMINSTALL$ac_delim
WIN32INSTALL!$WIN32INSTALL$ac_delim
@@ -52538,7 +52544,7 @@ LIBOBJS!$LIBOBJS$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 40; then
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 41; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5