diff options
| author | Barry Naujok <bnaujok@sgi.com> | 2009-03-16 07:48:48 +0100 |
|---|---|---|
| committer | Christoph Hellwig <hch@brick.lst.de> | 2009-03-16 07:48:48 +0100 |
| commit | 4ade67a2dbbf7af75e2189876966f33b91c1aa71 (patch) | |
| tree | 0553f5c47468d640144258b5cf44876ccbdf832c | |
| parent | 2d5ab40cdce3dcec327fb53ba7484de420f86da5 (diff) | |
| download | xfsdump-dev-4ade67a2dbbf7af75e2189876966f33b91c1aa71.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/
Signed-off-by: Andreas Gruenbacher <agruen@suse.de>
Signed-off-by: Christoph Hellwig <hch@lst.de>
| -rw-r--r-- | include/builddefs.in | 1 | ||||
| -rw-r--r-- | m4/package_globals.m4 | 2 | ||||
| -rw-r--r-- | m4/package_utilies.m4 | 10 |
3 files changed, 4 insertions, 9 deletions
diff --git a/include/builddefs.in b/include/builddefs.in index 795125c7..e29b2710 100644 --- a/include/builddefs.in +++ b/include/builddefs.in @@ -21,6 +21,7 @@ LIBHANDLE = @libhdl@ prefix = @prefix@ exec_prefix = @exec_prefix@ +top_builddir = @top_builddir@ datarootdir = @datarootdir@ PKG_NAME = @pkg_name@ diff --git a/m4/package_globals.m4 b/m4/package_globals.m4 index 72fbbb78..415564b9 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 fa66f951..6569e3b6 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) |