Commit a9457969 authored by John Stebbins's avatar John Stebbins

Remove the special case test for uid=0

Some package tools run configure as fakeroot.  This triggers code in
configure.ac that detects uid 0 to hardcode the installation path of the
m4 macros to the system aclocal macro dir.  This ignores any DESTDIR the
packaging tools may have set and installation fails since it attempts to
write to a system dir without proper permissions.
parent 7506b3b5
......@@ -167,26 +167,6 @@ DEBUG_CFLAGS="-g -DDEBUG $CFLAGS"
AC_SUBST(DEBUG_CFLAGS)
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="/usr/local/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
AM_CONDITIONAL(INSTALL_M4, test x"$ACLOCAL_DIR" != "x")
dnl ---------------------------------------------
dnl Check for doxygen (dynamic documentation generator)
dnl ---------------------------------------------
......
......@@ -2,10 +2,6 @@ include $(top_srcdir)/misc/Makefile.common
EXTRA_DIST = dvdread.m4
if INSTALL_M4
m4datadir = @ACLOCAL_DIR@
else
m4datadir = $(datadir)/aclocal
endif
m4data_DATA = dvdread.m4
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment