diff options
| author | Nathan Scott <nathans@sgi.com> | 2003-05-14 06:56:59 +0000 |
|---|---|---|
| committer | Nathan Scott <nathans@sgi.com> | 2003-05-14 06:56:59 +0000 |
| commit | 48328a4ff8386527aa9c3703f2711fdaceeab7eb (patch) | |
| tree | f1110615a6d2eecb83427c947b6c8ed042fb24e9 /aclocal.m4 | |
| parent | 2dabb3ec665cc7170f0cced1a6380d19865738da (diff) | |
| download | attr-48328a4ff8386527aa9c3703f2711fdaceeab7eb.tar.gz | |
Sync up minor differences between configure scripts (uuid, libtool checks), add in configurable package version number suffixes.
Diffstat (limited to 'aclocal.m4')
| -rw-r--r-- | aclocal.m4 | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -15,6 +15,7 @@ # Generic macro, sets up all of the global packaging variables. # The following environment variables may be set to override defaults: # DEBUG OPTIMIZER MALLOCLIB PLATFORM DISTRIBUTION INSTALL_USER INSTALL_GROUP +# BUILD_VERSION # AC_DEFUN([AC_PACKAGE_GLOBALS], [ pkg_name="$1" @@ -24,6 +25,7 @@ AC_DEFUN([AC_PACKAGE_GLOBALS], pkg_version=${PKG_MAJOR}.${PKG_MINOR}.${PKG_REVISION} AC_SUBST(pkg_version) pkg_release=$PKG_BUILD + test -z "$BUILD_VERSION" || pkg_release="$BUILD_VERSION" AC_SUBST(pkg_release) DEBUG=${DEBUG:-'-DDEBUG'} dnl -DNDEBUG @@ -89,7 +91,7 @@ AC_DEFUN([AC_PACKAGE_UTILITIES], AC_PACKAGE_NEED_UTILITY($1, "$make", make, [GNU make]) if test -z "$LIBTOOL"; then - AC_PATH_PROG(LIBTOOL, libtool,,/usr/bin) + AC_PATH_PROG(LIBTOOL, libtool,,/usr/bin:/usr/local/bin) fi libtool=$LIBTOOL AC_SUBST(libtool) |