summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Dobell <benjamin.dobell+git@glassechidna.com.au>2013-03-13 14:09:39 +0100
committerBenjamin Dobell <benjamin.dobell+git@glassechidna.com.au>2013-03-13 14:09:39 +0100
commite4011af21308a159f2e5498f48bcc293f2edde19 (patch)
treed269b737e461951c4eb58cd377ee4baa4731d964
parentUpdated Linux build files and fixed a string formatting warning in Heimdall Frontend. (diff)
downloadHeimdall-e4011af21308a159f2e5498f48bcc293f2edde19.tar
Heimdall-e4011af21308a159f2e5498f48bcc293f2edde19.tar.gz
Heimdall-e4011af21308a159f2e5498f48bcc293f2edde19.tar.bz2
Heimdall-e4011af21308a159f2e5498f48bcc293f2edde19.tar.lz
Heimdall-e4011af21308a159f2e5498f48bcc293f2edde19.tar.xz
Heimdall-e4011af21308a159f2e5498f48bcc293f2edde19.tar.zst
Heimdall-e4011af21308a159f2e5498f48bcc293f2edde19.zip
-rw-r--r--heimdall/configure.ac8
-rw-r--r--libpit/configure.ac7
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])