Update bakefile.m4 to bakefile 0.2.8 which was used for makefiles.

When a new bakefile version is used, build/aclocal/bakefile.m4 must be updated
and configure must be regenerated to take into account the changes in
autoconf_inc.m4, otherwise incorrect makefiles will be produced (for example,
symbolic links for shared libraries were not created in Unix build this time).


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@63338 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2010-01-31 18:31:21 +00:00
parent da71899374
commit 89d0b1ab06
2 changed files with 30 additions and 24 deletions

View File

@@ -126,8 +126,7 @@ AC_DEFUN([AC_BAKEFILE_PLATFORM],
PLATFORM_BEOS=1 PLATFORM_BEOS=1
;; ;;
* ) * )
dnl wxWidgets-specific: allow unknown Unix systems AC_MSG_ERROR([Unknown platform: $BAKEFILE_FORCE_PLATFORM])
dnl AC_MSG_ERROR([Unknown platform: $BAKEFILE_FORCE_PLATFORM])
;; ;;
esac esac
fi fi
@@ -337,7 +336,7 @@ AC_DEFUN([AC_BAKEFILE_SHARED_LD],
chmod +x shared-ld-sh chmod +x shared-ld-sh
SHARED_LD_MODULE_CC="`pwd`/shared-ld-sh -bundle -headerpad_max_install_names -o" SHARED_LD_MODULE_CC="`pwd`/shared-ld-sh -bundle -headerpad_max_install_names -o"
SHARED_LD_MODULE_CXX="CXX=\$(CXX) $SHARED_LD_MODULE_CC" SHARED_LD_MODULE_CXX="CXX=\"\$(CXX)\" $SHARED_LD_MODULE_CC"
dnl Most apps benefit from being fully binded (its faster and static dnl Most apps benefit from being fully binded (its faster and static
dnl variables initialized at startup work). dnl variables initialized at startup work).
@@ -490,7 +489,7 @@ AC_DEFUN([AC_BAKEFILE_SHARED_VERSIONS],
USE_SOVERLINUX=0 USE_SOVERLINUX=0
USE_SOVERSOLARIS=0 USE_SOVERSOLARIS=0
USE_SOVERCYGWIN=0 USE_SOVERCYGWIN=0
USE_SOSYMLINKS=0 USE_SOTWOSYMLINKS=0
USE_MACVERSION=0 USE_MACVERSION=0
SONAME_FLAG= SONAME_FLAG=
@@ -504,20 +503,19 @@ AC_DEFUN([AC_BAKEFILE_SHARED_VERSIONS],
fi fi
USE_SOVERSION=1 USE_SOVERSION=1
USE_SOVERLINUX=1 USE_SOVERLINUX=1
USE_SOSYMLINKS=1 USE_SOTWOSYMLINKS=1
;; ;;
*-*-solaris2* ) *-*-solaris2* )
SONAME_FLAG="-h " SONAME_FLAG="-h "
USE_SOVERSION=1 USE_SOVERSION=1
USE_SOVERSOLARIS=1 USE_SOVERSOLARIS=1
USE_SOSYMLINKS=1
;; ;;
*-*-darwin* ) *-*-darwin* )
USE_MACVERSION=1 USE_MACVERSION=1
USE_SOVERSION=1 USE_SOVERSION=1
USE_SOSYMLINKS=1 USE_SOTWOSYMLINKS=1
;; ;;
*-*-cygwin* ) *-*-cygwin* )
@@ -531,7 +529,7 @@ AC_DEFUN([AC_BAKEFILE_SHARED_VERSIONS],
AC_SUBST(USE_SOVERSOLARIS) AC_SUBST(USE_SOVERSOLARIS)
AC_SUBST(USE_SOVERCYGWIN) AC_SUBST(USE_SOVERCYGWIN)
AC_SUBST(USE_MACVERSION) AC_SUBST(USE_MACVERSION)
AC_SUBST(USE_SOSYMLINKS) AC_SUBST(USE_SOTWOSYMLINKS)
AC_SUBST(SONAME_FLAG) AC_SUBST(SONAME_FLAG)
]) ])
@@ -839,7 +837,7 @@ AC_DEFUN([AC_BAKEFILE],
AC_SUBST(OBJCXXFLAGS) AC_SUBST(OBJCXXFLAGS)
BAKEFILE_BAKEFILE_M4_VERSION="0.2.5" BAKEFILE_BAKEFILE_M4_VERSION="0.2.8"
dnl includes autoconf_inc.m4: dnl includes autoconf_inc.m4:
$1 $1

38
configure vendored

File diff suppressed because one or more lines are too long