diff options
| author | Daniel Caujolle-Bert <f1rmb@users.sourceforge.net> | 2001-05-28 22:25:50 +0000 |
|---|---|---|
| committer | Daniel Caujolle-Bert <f1rmb@users.sourceforge.net> | 2001-05-28 22:25:50 +0000 |
| commit | 4e985efcc5f1e0e62d97c6159f99d4daa7015cf7 (patch) | |
| tree | ff6598bb1b333b2220ad17700cabc7fb88dd6565 | |
| parent | 6b17de6f59326442ae6fae80c949d7adc538e095 (diff) | |
| download | xine-lib-4e985efcc5f1e0e62d97c6159f99d4daa7015cf7.tar.gz xine-lib-4e985efcc5f1e0e62d97c6159f99d4daa7015cf7.tar.bz2 | |
Fixed xine.m4 installation.
CVS patchset: 100
CVS date: 2001/05/28 22:25:50
| -rw-r--r-- | configure.in | 19 | ||||
| -rw-r--r-- | m4/Makefile.am | 4 |
2 files changed, 14 insertions, 9 deletions
diff --git a/configure.in b/configure.in index ab902d2e9..ce2eb966c 100644 --- a/configure.in +++ b/configure.in @@ -396,15 +396,18 @@ AC_SUBST(INCLUDES) dnl dnl Get where .m4 should be installed. dnl -AC_MSG_CHECKING(for aclocal directory) -if(aclocal --version) < /dev/null > /dev/null 2>&1; then - ACLOCAL_DIR=`$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) +if test "`id -u`" = "0"; then + AC_MSG_CHECKING(for aclocal directory) + if(aclocal --version) < /dev/null > /dev/null 2>&1; then + ACLOCAL_DIR=`$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 + AC_SUBST(ACLOCAL_DIR) fi -AC_SUBST(ACLOCAL_DIR) +AM_CONDITIONAL(INSTALL_M4, test x"$ACLOCAL_DIR" != "x") AC_CHECK_PROG(DOXYGEN, doxygen, doxygen, no) diff --git a/m4/Makefile.am b/m4/Makefile.am index a29da33ae..feb4e645d 100644 --- a/m4/Makefile.am +++ b/m4/Makefile.am @@ -1,10 +1,12 @@ ## ## Process this file with automake to produce Makefile.in ## +if INSTALL_M4 m4datadir = @ACLOCAL_DIR@ m4data_DATA = xine.m4 +endif -EXTRA_DIST = _xine.m4 alsa.m4 esd.m4 $(m4data_DATA) +EXTRA_DIST = _xine.m4 alsa.m4 esd.m4 xine.m4 debug: |