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 /heimdall/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 'heimdall/configure.ac')
| -rw-r--r-- | heimdall/configure.ac | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/heimdall/configure.ac b/heimdall/configure.ac index 601c550..4654730 100644 --- a/heimdall/configure.ac +++ b/heimdall/configure.ac @@ -1,15 +1,14 @@ -AC_INIT([Heimdall], [1.3], [bug-report@glassechidna.com.au], [heimdall], [http://www.glassechidna.com.au/])
+AC_INIT([Heimdall], [1.4.0], [bug-report@glassechidna.com.au], [heimdall], [http://www.glassechidna.com.au/])
AC_PREREQ([2.59])
PKG_CHECK_MODULES([DEPS], [libusb-1.0 >= 1.0.8])
-AC_PROGRAM_CHECK(udevadminstalled, udevadm)
+AC_CHECK_PROG(udevadminstalled, udevadm, "yes")
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
-AC_PROG_LIBTOOL
+AM_PROG_AR
+m4_pattern_allow([AM_PROG_PR], [AM_PROG_AR])
AC_CONFIG_FILES([Makefile])
-
AM_MAINTAINER_MODE
AC_MSG_CHECKING([operating system])
@@ -17,29 +16,35 @@ 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
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
;;
*)
AC_MSG_ERROR([unsupported operating system])
esac
+AC_PROG_LIBTOOL
+
AM_CONDITIONAL([LINUXTARGET], [test x$linuxtarget = xtrue])
-AM_CONDITIONAL([UDEVADM], [test x$udevadmninstalled = xtrue])
+AM_CONDITIONAL([UDEVADM], [test x$udevadminstalled = x"yes"])
AC_C_BIGENDIAN
|