summaryrefslogtreecommitdiff
path: root/m4
diff options
context:
space:
mode:
authorBarry Naujok <bnaujok@sgi.com>2007-01-23 14:51:14 +0000
committerAndreas Gruenbacher <agruen@suse.de>2009-02-26 00:58:00 +0100
commit8de7788c29d2656f8d52d98327a80e4dfd1e3898 (patch)
tree2f60c8327cd2c4dce67aa8420de4094994af7e33 /m4
parent2cd726a35ce0e6568d74654236a08add21c60a59 (diff)
downloadacl-8de7788c29d2656f8d52d98327a80e4dfd1e3898.tar.gz
Fix cross-compile issues with libtool and compiler.
This is equivalent to commit de7b3f6 from Barry Naujok <bnaujok@sgi.com> in the acl package, and part of the Gentoo package, as pointed out by Mike Frysinger <vapier@gentoo.org>. Signed-off-by: Andreas Gruenbacher <agruen@suse.de>
Diffstat (limited to 'm4')
-rw-r--r--m4/package_globals.m42
-rw-r--r--m4/package_utilies.m410
2 files changed, 3 insertions, 9 deletions
diff --git a/m4/package_globals.m4 b/m4/package_globals.m4
index 72fbbb7..415564b 100644
--- a/m4/package_globals.m4
+++ b/m4/package_globals.m4
@@ -8,6 +8,8 @@ AC_DEFUN([AC_PACKAGE_GLOBALS],
[ pkg_name="$1"
AC_SUBST(pkg_name)
+ AC_PROG_CC
+
. ./VERSION
pkg_version=${PKG_MAJOR}.${PKG_MINOR}.${PKG_REVISION}
AC_SUBST(pkg_version)
diff --git a/m4/package_utilies.m4 b/m4/package_utilies.m4
index fa66f95..6569e3b 100644
--- a/m4/package_utilies.m4
+++ b/m4/package_utilies.m4
@@ -32,15 +32,7 @@ AC_DEFUN([AC_PACKAGE_UTILITIES],
AC_SUBST(make)
AC_PACKAGE_NEED_UTILITY($1, "$make", make, [GNU make])
- if test -z "$LIBTOOL"; then
- AC_PATH_PROG(LIBTOOL, glibtool,, /usr/bin)
- fi
- if test -z "$LIBTOOL"; then
- AC_PATH_PROG(LIBTOOL, libtool,, /usr/bin:/usr/local/bin:/usr/freeware/bin)
- fi
- libtool=$LIBTOOL
- AC_SUBST(libtool)
- AC_PACKAGE_NEED_UTILITY($1, "$libtool", libtool, [GNU libtool])
+ AC_PROG_LIBTOOL
if test -z "$TAR"; then
AC_PATH_PROG(TAR, tar,, /usr/freeware/bin:/bin:/usr/local/bin:/usr/bin)