From e4011af21308a159f2e5498f48bcc293f2edde19 Mon Sep 17 00:00:00 2001 From: Benjamin Dobell Date: Thu, 14 Mar 2013 00:09:39 +1100 Subject: Ancient Mac GCC does not support C++11/C++0x. Swapped to using clang on OS X. --- heimdall/configure.ac | 8 ++++++-- libpit/configure.ac | 7 ++++++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/heimdall/configure.ac b/heimdall/configure.ac index 02ad4af..0ec2292 100644 --- a/heimdall/configure.ac +++ b/heimdall/configure.ac @@ -6,10 +6,10 @@ AC_CANONICAL_TARGET AM_INIT_AUTOMAKE([1.10 -Wall no-define foreign]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_HEADERS([config.h]) -AC_PROG_CXX +AM_PROG_AR +m4_pattern_allow([AM_PROG_PR], [AM_PROG_AR]) AC_PROG_LIBTOOL AC_CONFIG_FILES([Makefile]) - AM_MAINTAINER_MODE AC_MSG_CHECKING([operating system]) @@ -17,21 +17,25 @@ case $target in *-linux*) AC_DEFINE(OS_LINUX, [], [Linux backend]) AC_MSG_RESULT([Linux]) + AC_PROG_CXX linuxtarget=true ;; *-darwin*) AC_DEFINE(OS_DARWIN, [], [Darwin backend]) AC_MSG_RESULT([Darwin/MacOS X]) + AC_PROG_CXX([clang++]) linuxtarget=false ;; *-mingw*) AC_DEFINE(OS_WINDOWS, [], [Windows backend]) AC_MSG_RESULT([Windows]) + AC_PROG_CXX linuxtarget=false ;; *-cygwin*) AC_DEFINE(OS_WINDOWS, [], [Windows backend]) AC_MSG_RESULT([Windows]) + AC_PROG_CXX linuxtarget=false ;; *) diff --git a/libpit/configure.ac b/libpit/configure.ac index 30fd136..4847828 100644 --- a/libpit/configure.ac +++ b/libpit/configure.ac @@ -4,7 +4,8 @@ AC_CANONICAL_TARGET AC_CONFIG_MACRO_DIR([m4]) AM_INIT_AUTOMAKE([1.10 -Wall no-define foreign]) AC_CONFIG_HEADERS([config.h]) -AC_PROG_CXX +AM_PROG_AR +m4_pattern_allow([AM_PROG_PR], [AM_PROG_AR]) LT_INIT() @@ -18,18 +19,22 @@ case $target in *-linux*) AC_DEFINE(OS_LINUX, [], [Linux backend]) AC_MSG_RESULT([Linux]) + AC_PROG_CXX ;; *-darwin*) AC_DEFINE(OS_DARWIN, [], [Darwin backend]) AC_MSG_RESULT([Darwin/MacOS X]) + AC_PROG_CXX([clang++]) ;; *-mingw*) AC_DEFINE(OS_WINDOWS, [], [Windows backend]) AC_MSG_RESULT([Windows]) + AC_PROG_CXX ;; *-cygwin*) AC_DEFINE(OS_WINDOWS, [], [Windows backend]) AC_MSG_RESULT([Windows]) + AC_PROG_CXX ;; *) AC_MSG_ERROR([unsupported operating system]) -- cgit v1.2.3