diff options
| author | Stephen Torri <storri@users.sourceforge.net> | 2003-01-22 01:35:04 +0000 |
|---|---|---|
| committer | Stephen Torri <storri@users.sourceforge.net> | 2003-01-22 01:35:04 +0000 |
| commit | 504bc0f339c9329229db9d02220e412d774ecf50 (patch) | |
| tree | 407f5aa0af1b1c377b5a443f11a42dec3063b668 | |
| parent | 15a1582141379f347ca63f7a3dd05567194e55a5 (diff) | |
| download | xine-lib-504bc0f339c9329229db9d02220e412d774ecf50.tar.gz xine-lib-504bc0f339c9329229db9d02220e412d774ecf50.tar.bz2 | |
I have commented out the 'root' section of the configure.ac. This part was
looking for the directory of where to install the xine m4 script. Checking
the gnu.org web page and mailing list I found out that we are already doing
what we need without do anything special like determining if root is
running the configure script. If someone does not define ACLOCAL_DIR we use the
$(datadir)/aclocal directory. Since this is a comestic change and affects
the general quality of our builds I have only commented it out without
removing it.
Affects: Users configurating xine-lib as 'root' using one version of automake
and autoconf on one machine and building on another with different versions
of automake and autoconf. For example, ran autogen.sh --noconfig on system
with automake 1.7.2 and autoconf 2.57 while build system had automake 1.6.3
and autoconf 2.53.
Thanks to Chris Purnell <cjp@lost.org.uk> for helping me understand the
nature of the problem.
CVS patchset: 3987
CVS date: 2003/01/22 01:35:04
| -rw-r--r-- | configure.ac | 34 | ||||
| -rw-r--r-- | m4/Makefile.am | 1 |
2 files changed, 18 insertions, 17 deletions
diff --git a/configure.ac b/configure.ac index dcb195f18..f04c740ee 100644 --- a/configure.ac +++ b/configure.ac @@ -1174,24 +1174,24 @@ AC_SUBST(INCLUDES) dnl --------------------------------------------- dnl Get where .m4 should be installed. dnl --------------------------------------------- -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 +dnl if test x"${ACLOCAL_DIR+set}" != xset; then +dnl case "`id`" in +dnl uid=0\(* ) +dnl AC_MSG_CHECKING(for aclocal directory) +dnl if (aclocal --version) < /dev/null > /dev/null 2>&1; then +dnl ACLOCAL_DIR="`eval $ACLOCAL --print-ac-dir`" +dnl AC_MSG_RESULT($ACLOCAL_DIR) +dnl else +dnl ACLOCAL_DIR="${prefix}/share/aclocal" +dnl AC_MSG_RESULT(none - will be installed in $ACLOCAL_DIR) +dnl fi +dnl escapedprefix="`echo $prefix | sed -e 's/\\//\\\\\//g'`" +dnl ACLOCAL_DIR="`echo $ACLOCAL_DIR|sed -e 's/^'$escapedprefix/'\${prefix}'/`" +dnl ;; +dnl esac +dnl fi AC_SUBST(ACLOCAL_DIR) -AM_CONDITIONAL(INSTALL_M4, test x"$ACLOCAL_DIR" != "x") +AM_CONDITIONAL([INSTALL_M4],[test x"$ACLOCAL_DIR" != "x"]) dnl --------------------------------------------- diff --git a/m4/Makefile.am b/m4/Makefile.am index 1dea8f721..435152e61 100644 --- a/m4/Makefile.am +++ b/m4/Makefile.am @@ -1,6 +1,7 @@ ## ## Process this file with automake to produce Makefile.in ## + if INSTALL_M4 m4datadir = @ACLOCAL_DIR@ else |