ref: 65e94b3fc670ad9336788d9b264ef4bc1ebf7098
parent: 526cc26f2a9149d186be8ec6cb614bae81ee87ea
author: Sam Hocevar <[email protected]>
date: Tue Jun 10 18:50:31 EDT 2003
* ./configure.ac: make use of the autotools/ directory.
* ./bootstrap: libfool is a tool. Worked around its blatant ignorance of
the AC_CONFIG_AUX_DIR directive.
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = src test
+SUBDIRS = src test autotools
DIST_SUBDIRS = $(SUBDIRS) debian doc
EXTRA_DIST = libdvdcss.spec bootstrap
--- /dev/null
+++ b/autotools/.cvsignore
@@ -1,0 +1,11 @@
+.dirstamp
+Makefile
+Makefile.in
+compile
+config.guess
+config.sub
+depcomp
+install-sh
+ltmain.sh
+missing
+mkinstalldirs
--- /dev/null
+++ b/autotools/Makefile.am
@@ -1,0 +1,1 @@
+
--- a/bootstrap
+++ b/bootstrap
@@ -1,7 +1,8 @@
#! /bin/sh
set -x
-rm -f aclocal.m4 configure config.guess config.log config.sub ltmain.sh libtool ltconfig missing mkinstalldirs depcomp install-sh
+rm -f aclocal.m4 configure config.guess config.log config.sub compile ltmain.sh libtool ltconfig missing mkinstalldirs depcomp install-sh
+(cd autotools && rm -f config.guess config.sub missing mkinstalldirs compile ltmain.sh depcomp install-sh)
# Check for automake
amvers="none"
@@ -33,7 +34,7 @@
if test x$amvers = xnone
then
set +x
- echo "you need automake version 1.5 or later"
+ echo "bootstrap: you need automake version 1.5 or later"
exit 1
fi
@@ -44,6 +45,13 @@
else
glibtoolize --force --copy || exit 1
fi
+
+if test -f ltmain.sh
+then
+ echo "bootstrap: working around a minor libtool issue"
+ mv ltmain.sh autotools/
+fi
+
autoheader || exit 1
#add --include-deps if you want to bootstrap with any other compiler than gcc
#automake${amvers} --add-missing --copy --include-deps || exit 1--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,8 @@
AC_INIT(src/libdvdcss.c)
+AC_PREREQ(2.50)
+AC_CONFIG_AUX_DIR(autotools)
AC_CANONICAL_SYSTEM
-AC_CONFIG_AUX_DIR(.)
AM_INIT_AUTOMAKE(libdvdcss, 1.2.6)
AM_CONFIG_HEADER(config.h)