From fcc9ca7f72b92d6b0a4eabe72f205d54480df72e Mon Sep 17 00:00:00 2001 From: Kevin Ollivier Date: Sat, 31 Oct 2009 20:52:55 +0000 Subject: [PATCH] Update to Bakefile 0.2.8. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62521 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- build/aclocal/bakefile.m4 | 7 +++---- configure | 13 ++++++++----- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/build/aclocal/bakefile.m4 b/build/aclocal/bakefile.m4 index a9b644ac4a..88478ca0ae 100644 --- a/build/aclocal/bakefile.m4 +++ b/build/aclocal/bakefile.m4 @@ -21,7 +21,7 @@ dnl LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING dnl FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER dnl DEALINGS IN THE SOFTWARE. dnl -dnl $Id: bakefile.m4 1322 2009-10-21 07:37:18Z vaclavslavik $ +dnl $Id$ dnl dnl Support macros for makefiles generated by BAKEFILE. dnl @@ -126,8 +126,7 @@ AC_DEFUN([AC_BAKEFILE_PLATFORM], PLATFORM_BEOS=1 ;; * ) - dnl wxWidgets-specific: allow unknown Unix systems - dnl AC_MSG_ERROR([Unknown platform: $BAKEFILE_FORCE_PLATFORM]) + AC_MSG_ERROR([Unknown platform: $BAKEFILE_FORCE_PLATFORM]) ;; esac fi @@ -838,7 +837,7 @@ AC_DEFUN([AC_BAKEFILE], AC_SUBST(OBJCXXFLAGS) - BAKEFILE_BAKEFILE_M4_VERSION="0.2.7" + BAKEFILE_BAKEFILE_M4_VERSION="0.2.8" dnl includes autoconf_inc.m4: $1 diff --git a/configure b/configure index c9eb559146..736ba9a2a0 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Id: configure.in 62474 2009-10-22 11:35:43Z VZ . +# From configure.in Id: configure.in 62501 2009-10-25 17:48:32Z PC . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.61 for wxWidgets 2.9.1. # @@ -24160,7 +24160,7 @@ cat >>confdefs.h <<_ACEOF _ACEOF ;; esac -rm -f conftest* +rm -f -r conftest* # We used to try defining _XOPEN_SOURCE=500 too, to work around a bug # in glibc 2.1.3, but that breaks too many other things. @@ -48597,7 +48597,10 @@ echo "${ECHO_T}$bakefile_cv_prog_makeisgnu" >&6; } PLATFORM_BEOS=1 ;; * ) - ;; + { { echo "$as_me:$LINENO: error: Unknown platform: $BAKEFILE_FORCE_PLATFORM" >&5 +echo "$as_me: error: Unknown platform: $BAKEFILE_FORCE_PLATFORM" >&2;} + { (exit 1); exit 1; }; } + ;; esac fi @@ -49975,10 +49978,10 @@ fi - BAKEFILE_BAKEFILE_M4_VERSION="0.2.7" + BAKEFILE_BAKEFILE_M4_VERSION="0.2.8" -BAKEFILE_AUTOCONF_INC_M4_VERSION="0.2.7" +BAKEFILE_AUTOCONF_INC_M4_VERSION="0.2.8" -- 2.45.2