From f7f29172cb11fabf1d017ecdadaf32ea37eca4df Mon Sep 17 00:00:00 2001 From: Benjamin Dobell Date: Sun, 10 Mar 2013 02:32:16 +1100 Subject: Updated Linux build files and fixed a string formatting warning in Heimdall Frontend. --- heimdall/configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'heimdall/configure.ac') diff --git a/heimdall/configure.ac b/heimdall/configure.ac index 601c550..02ad4af 100644 --- a/heimdall/configure.ac +++ b/heimdall/configure.ac @@ -1,7 +1,7 @@ AC_INIT([Heimdall], [1.3], [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]) @@ -39,7 +39,7 @@ case $target in esac 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 -- cgit v1.1 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 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'heimdall/configure.ac') 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 ;; *) -- cgit v1.1 From 9fa0a13022fb9e81890423ba28610e18f4c54840 Mon Sep 17 00:00:00 2001 From: Benjamin Dobell Date: Mon, 13 May 2013 23:38:33 +1000 Subject: Minor build file clean-up for linux and regenerated autotools output for 1.4.0 release. --- heimdall/configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'heimdall/configure.ac') diff --git a/heimdall/configure.ac b/heimdall/configure.ac index 0ec2292..3aeab28 100644 --- a/heimdall/configure.ac +++ b/heimdall/configure.ac @@ -1,4 +1,4 @@ -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_CHECK_PROG(udevadminstalled, udevadm, "yes") -- cgit v1.1 From b8a92f1c71fa93b48fbd5c9595c088af87c7d7d8 Mon Sep 17 00:00:00 2001 From: Benjamin Dobell Date: Thu, 6 Jun 2013 22:06:53 +1000 Subject: Fixed configure/libtool issue on OS X by placing AC_PROG_LIBTOOL after AC_PROG_CXX. --- heimdall/configure.ac | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'heimdall/configure.ac') diff --git a/heimdall/configure.ac b/heimdall/configure.ac index 3aeab28..e900770 100644 --- a/heimdall/configure.ac +++ b/heimdall/configure.ac @@ -8,7 +8,6 @@ AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_HEADERS([config.h]) AM_PROG_AR m4_pattern_allow([AM_PROG_PR], [AM_PROG_AR]) -AC_PROG_LIBTOOL AC_CONFIG_FILES([Makefile]) AM_MAINTAINER_MODE @@ -42,6 +41,8 @@ case $target in AC_MSG_ERROR([unsupported operating system]) esac +AC_PROG_LIBTOOL + AM_CONDITIONAL([LINUXTARGET], [test x$linuxtarget = xtrue]) AM_CONDITIONAL([UDEVADM], [test x$udevadminstalled = x"yes"]) -- cgit v1.1 From f47b69d037b74cf0916bbab248abcafe8a1f01a3 Mon Sep 17 00:00:00 2001 From: Benjamin Dobell Date: Sat, 8 Jun 2013 14:58:37 +1000 Subject: Modified Heimdall Frontend so it can find Heimdall CLI in /usr/local/bin on OS X. Also updated the OS X build files, as well as READMEs for all platforms. --- heimdall/configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'heimdall/configure.ac') diff --git a/heimdall/configure.ac b/heimdall/configure.ac index e900770..4654730 100644 --- a/heimdall/configure.ac +++ b/heimdall/configure.ac @@ -22,7 +22,7 @@ case $target in *-darwin*) AC_DEFINE(OS_DARWIN, [], [Darwin backend]) AC_MSG_RESULT([Darwin/MacOS X]) - AC_PROG_CXX([clang++]) + AC_PROG_CXX linuxtarget=false ;; *-mingw*) -- cgit v1.1