From 42badb53325cd0c48abf08cdb397aff52010ab0a Mon Sep 17 00:00:00 2001
From: Daniel Caujolle-Bert <f1rmb@users.sourceforge.net>
Date: Thu, 5 Sep 2002 12:27:49 +0000
Subject: Force xine.m4 installation location by using ACLOCAL_DIR envvar.

CVS patchset: 2609
CVS date: 2002/09/05 12:27:49
---
 configure.in | 32 +++++++++++++++++---------------
 1 file 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")
 
 
-- 
cgit v1.2.3