summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorevpobr <evpobr@gmail.com>2018-02-12 11:53:55 -0500
committerTristan Matthews <tmatth@videolan.org>2018-02-12 11:56:28 -0500
commit572618e3f50f214a875d72b631115b67450fa939 (patch)
tree8532705571d41d608118d4ac0afa0d74e242cf61
parent26213e6456f7bd3c12114911948b9140ad397419 (diff)
downloadogg-git-572618e3f50f214a875d72b631115b67450fa939.tar.gz
autotools: use LT_INIT instead of obsolete AM_PROG_LIBTOOL
Signed-off-by: Tristan Matthews <tmatth@videolan.org>
-rw-r--r--.gitignore1
-rw-r--r--Makefile.am1
-rwxr-xr-xautogen.sh1
-rw-r--r--configure.ac3
4 files changed, 5 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 255f7b0..36b1d42 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,3 +31,4 @@ src/.libs
src/.deps
src/test_*
macosx/build/
+/m4
diff --git a/Makefile.am b/Makefile.am
index 8bfe303..0736064 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,6 +3,7 @@
#AUTOMAKE_OPTIONS = foreign 1.6 dist-zip
AUTOMAKE_OPTIONS = foreign 1.11 dist-zip dist-xz
+ACLOCAL_AMFLAGS = -I m4
SUBDIRS = src include doc
diff --git a/autogen.sh b/autogen.sh
index c9782e1..f6490cc 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -9,4 +9,5 @@ test -n "$srcdir" && cd "$srcdir"
echo "Updating build configuration files for $package, please wait...."
+mkdir -p m4
autoreconf -if
diff --git a/configure.ac b/configure.ac
index 588d2f5..ee29978 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,6 +2,8 @@ dnl Process this file with autoconf to produce a configure script.
AC_INIT([libogg],[1.3.3],[ogg-dev@xiph.org])
+LT_INIT
+AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_SRCDIR(src/framing.c)
AM_INIT_AUTOMAKE
@@ -17,7 +19,6 @@ AC_SUBST(LIB_REVISION)
AC_SUBST(LIB_AGE)
AC_PROG_CC
-AM_PROG_LIBTOOL
AM_PROG_CC_C_O
dnl Set some options based on environment