diff options
author | Koushik Dutta <koushd@gmail.com> | 2013-08-14 10:01:22 -0700 |
---|---|---|
committer | Koushik Dutta <koushd@gmail.com> | 2013-08-14 10:01:22 -0700 |
commit | 49a02b8c916e8ef011d9f56901d208eca626b85b (patch) | |
tree | 1148a42ede0e6661854b8f92d4bbe52a4290d02b /libpit/configure.ac | |
parent | c82df274ecea32cd6528f070a21528bf80a2f466 (diff) | |
parent | f95619028fa5c80284e6ade2ced7772e41040424 (diff) | |
download | external_heimdall-49a02b8c916e8ef011d9f56901d208eca626b85b.zip external_heimdall-49a02b8c916e8ef011d9f56901d208eca626b85b.tar.gz external_heimdall-49a02b8c916e8ef011d9f56901d208eca626b85b.tar.bz2 |
Merge remote-tracking branch 'bd/master' into cm-10.2
Conflicts:
Linux/README
OSX/README.txt
heimdall-frontend/doc-pak/README
heimdall/doc-pak/README
Change-Id: Ib5867d7a2be030290a3896ab82fe48a7f0a97e63
Diffstat (limited to 'libpit/configure.ac')
-rw-r--r-- | libpit/configure.ac | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/libpit/configure.ac b/libpit/configure.ac index 30fd136..a86ad28 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 ;; *-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]) |