diff options
| author | Barry Naujok <bnaujok@sgi.com> | 2009-03-16 07:49:51 +0100 |
|---|---|---|
| committer | Christoph Hellwig <hch@brick.lst.de> | 2009-03-16 07:49:51 +0100 |
| commit | f892e35c60a67e80719e1f385c50ac1cbe4b38bf (patch) | |
| tree | 2cef80906245ebb250222ae6c30efbfafa838c68 | |
| parent | 16ed6d8a4a11a327b38f153624cd8dfe652aee06 (diff) | |
| download | dmapi-dev-f892e35c60a67e80719e1f385c50ac1cbe4b38bf.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 363a282..96fed5a 100644 --- a/include/builddefs.in +++ b/include/builddefs.in @@ -14,6 +14,7 @@ LOADERFLAGS = @LDFLAGS@ 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 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 c034a7c..302326d 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) |