diff options
| author | Daniel Caujolle-Bert <f1rmb@users.sourceforge.net> | 2002-09-05 12:27:49 +0000 |
|---|---|---|
| committer | Daniel Caujolle-Bert <f1rmb@users.sourceforge.net> | 2002-09-05 12:27:49 +0000 |
| commit | 42badb53325cd0c48abf08cdb397aff52010ab0a (patch) | |
| tree | 3c2ef75a63df074f92434122d5d5fdae5bfb67c5 | |
| parent | 09fe49b1961b79c2dfe43ef87d1946d46a2555fe (diff) | |
| download | xine-lib-42badb53325cd0c48abf08cdb397aff52010ab0a.tar.gz xine-lib-42badb53325cd0c48abf08cdb397aff52010ab0a.tar.bz2 | |
Force xine.m4 installation location by using ACLOCAL_DIR envvar.
CVS patchset: 2609
CVS date: 2002/09/05 12:27:49
| -rw-r--r-- | configure.in | 32 |
1 files changed, 17 insertions, 15 deletions
diff --git a/configure.in b/configure.in index 0ddddc94b..9f52b1121 100644 --- a/configure.in +++ b/configure.in @@ -1002,21 +1002,23 @@ AC_SUBST(INCLUDES) dnl dnl Get where .m4 should be installed. dnl -case "`id`" in - uid=0\(* ) - AC_MSG_CHECKING(for aclocal directory) - if (aclocal --version) < /dev/null > /dev/null 2>&1; then - ACLOCAL_DIR="`eval $ACLOCAL --print-ac-dir`" - AC_MSG_RESULT($ACLOCAL_DIR) - else - ACLOCAL_DIR="${prefix}/share/aclocal" - AC_MSG_RESULT(none - will be installed in $ACLOCAL_DIR) - fi - escapedprefix="`echo $prefix | sed -e 's/\\//\\\\\//g'`" - ACLOCAL_DIR="`echo $ACLOCAL_DIR|sed -e 's/^'$escapedprefix/'\${prefix}'/`" - AC_SUBST(ACLOCAL_DIR) - ;; -esac +if test x"${ACLOCAL_DIR+set}" != xset; then + case "`id`" in + uid=0\(* ) + AC_MSG_CHECKING(for aclocal directory) + if (aclocal --version) < /dev/null > /dev/null 2>&1; then + ACLOCAL_DIR="`eval $ACLOCAL --print-ac-dir`" + AC_MSG_RESULT($ACLOCAL_DIR) + else + ACLOCAL_DIR="${prefix}/share/aclocal" + AC_MSG_RESULT(none - will be installed in $ACLOCAL_DIR) + fi + escapedprefix="`echo $prefix | sed -e 's/\\//\\\\\//g'`" + ACLOCAL_DIR="`echo $ACLOCAL_DIR|sed -e 's/^'$escapedprefix/'\${prefix}'/`" + ;; + esac +fi +AC_SUBST(ACLOCAL_DIR) AM_CONDITIONAL(INSTALL_M4, test x"$ACLOCAL_DIR" != "x") |