mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-11-22 17:51:16 +00:00
remove support for autoconf2.13
Original commit message from CVS: remove support for autoconf2.13
This commit is contained in:
Andy Wingo
parent
a5ce472811
commit
6cf53e1a94
4 changed files with 52 additions and 138 deletions
|
|
@ -63,10 +63,3 @@ deb-maint:
|
|||
|
||||
include $(top_srcdir)/idiottest.mak
|
||||
|
||||
# Rules to generate autoconf scripts if configure.base is updated
|
||||
$(top_srcdir)/configure.in: $(top_srcdir)/configure.base
|
||||
$(top_srcdir)/makeconfigure <$(top_srcdir)/configure.base >$(top_srcdir)/configure.in configure.in
|
||||
|
||||
$(top_srcdir)/configure.ac: $(top_srcdir)/configure.base
|
||||
$(top_srcdir)/makeconfigure <$(top_srcdir)/configure.base >$(top_srcdir)/configure.ac configure.ac
|
||||
|
||||
|
|
|
|||
96
autogen.sh
96
autogen.sh
|
|
@ -20,87 +20,15 @@ srcfile=gst/gstobject.h
|
|||
echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/automake/"
|
||||
DIE=1
|
||||
}
|
||||
automakevermin=`(automake --version|head -n 1|sed 's/^.* //;s/\./ /g;';echo "1 4")|sort -n|head -n 1`
|
||||
automakevergood=`(automake --version|head -n 1|sed 's/^.* //;s/\./ /g;';echo "1 4f")|sort -n|head -n 1`
|
||||
if test "x$automakevermin" != "x1 4"; then
|
||||
# version is less than 1.4, the minimum suitable version
|
||||
automakevermin=`(automake --version|head -n 1|sed 's/^.* //;s/\./ /g;';echo "1 5")|sort -n|head -n 1`
|
||||
if test "x$automakevermin" != "x1 5"; then
|
||||
# version is less than 1.5, the minimum suitable version
|
||||
echo
|
||||
echo "You must have automake version 1.4 or greater installed."
|
||||
echo "You must have automake version 1.5 or greater installed."
|
||||
echo "Download the appropriate package for your distribution,"
|
||||
echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/automake/"
|
||||
DIE=1
|
||||
else
|
||||
if test "x$automakevergood" != "x1 4f"; then
|
||||
echo -n "Checking for patched automake..."
|
||||
# version is less than 1.4f, the version with the patch applied
|
||||
# check that patch is applied
|
||||
cat > autogen.patch.tmp <<EOF
|
||||
--- 1
|
||||
+++ 2
|
||||
@@ -2383,8 +2383,8 @@
|
||||
# to all possible directories, and use it. If DIST_SUBDIRS is
|
||||
# defined, just use it.
|
||||
local (\$dist_subdir_name);
|
||||
- if (&variable_defined ('DIST_SUBDIRS')
|
||||
- || &variable_conditions ('SUBDIRS'))
|
||||
+ if (&variable_conditions ('SUBDIRS')
|
||||
+ || &variable_defined ('DIST_SUBDIRS'))
|
||||
{
|
||||
\$dist_subdir_name = 'DIST_SUBDIRS';
|
||||
if (! &variable_defined ('DIST_SUBDIRS'))
|
||||
EOF
|
||||
if patch -s -f --dry-run `which automake` <autogen.patch.tmp >/dev/null 2>&1;
|
||||
then
|
||||
# Patch succeeded: appropriately patched.
|
||||
echo " found."
|
||||
else
|
||||
# Patch failed: either unpatched or incompatibly patched.
|
||||
if patch -R -s -f --dry-run `which automake` <autogen.patch.tmp >/dev/null 2>&1;
|
||||
then
|
||||
# Reversed patch succeeded: not patched.
|
||||
echo " not found."
|
||||
echo
|
||||
echo "Detected automake version 1.4 (or near) without patch."
|
||||
echo "Your version of automake needs a patch applied in order to operate correctly."
|
||||
echo
|
||||
patchedfile="`pwd`/automake"
|
||||
if test -e $patchedfile; then
|
||||
PATCHED=0
|
||||
else
|
||||
echo "making a patched version..."
|
||||
patch -R -s -f `which automake` <autogen.patch.tmp -o $patchedfile;
|
||||
chmod +x $patchedfile;
|
||||
PATCHED=1
|
||||
fi
|
||||
echo
|
||||
echo "***************************************************************************"
|
||||
if test -e $patchedfile; then
|
||||
if test "x$PATCHED" == "x1"; then
|
||||
echo "A patched version of automake is available at:"
|
||||
echo "$patchedfile"
|
||||
echo "You should put this in an appropriate place, or modify \$PATH, so that it is"
|
||||
echo "used in preference to this installed version of automake."
|
||||
fi
|
||||
fi
|
||||
echo "It is not safe to perform the build without a patched automake."
|
||||
echo "Read the README file for an explanation."
|
||||
echo "***************************************************************************"
|
||||
echo
|
||||
DIE=1
|
||||
else
|
||||
# Reversed patch failed: incompatibly patched.
|
||||
echo
|
||||
echo
|
||||
echo "Unable to check whether automake is appropriately patched."
|
||||
echo "Your version of automake may need to have a patch applied."
|
||||
echo "Read the README file for more explanation."
|
||||
echo
|
||||
fi
|
||||
fi
|
||||
rm autogen.patch.tmp
|
||||
fi
|
||||
fi
|
||||
|
||||
|
||||
(pkg-config --version) < /dev/null > /dev/null 2>&1 || {
|
||||
echo
|
||||
|
|
@ -129,18 +57,18 @@ fi
|
|||
if [ $libtool_major -le 1 ]; then
|
||||
if [ $libtool_major -lt 1 ]; then
|
||||
echo
|
||||
echo "You must have libtool 1.3.5 or greater to compile $package."
|
||||
echo "You must have libtool 1.4.0 or greater to compile $package."
|
||||
echo "Get the latest version from ftp://alpha.gnu.org/gnu/libtool/"
|
||||
DIE=1
|
||||
elif [ $libtool_minor -le 3 ]; then
|
||||
if [ $libtool_minor -lt 3 ]; then
|
||||
elif [ $libtool_minor -le 4 ]; then
|
||||
if [ $libtool_minor -lt 4 ]; then
|
||||
echo
|
||||
echo "You must have libtool 1.3.5 or greater to compile $package."
|
||||
echo "You must have libtool 1.4.0 or greater to compile $package."
|
||||
echo "Get the latest version from ftp://alpha.gnu.org/gnu/libtool/"
|
||||
DIE=1
|
||||
elif [ $libtool_micro -lt 5 ]; then
|
||||
elif [ $libtool_micro -lt 0 ]; then
|
||||
echo
|
||||
echo "You must have libtool 1.3.5 or greater to compile $package."
|
||||
echo "You must have libtool 1.4.0 or greater to compile $package."
|
||||
echo "Get the latest version from ftp://alpha.gnu.org/gnu/libtool/"
|
||||
DIE=1
|
||||
fi
|
||||
|
|
@ -162,10 +90,6 @@ if test -z "$*"; then
|
|||
fi
|
||||
|
||||
|
||||
# Generate configure.in and configure.ac
|
||||
./makeconfigure <configure.base > configure.in configure.in
|
||||
./makeconfigure <configure.base > configure.ac configure.ac
|
||||
|
||||
libtoolize --copy --force
|
||||
aclocal $ACLOCAL_FLAGS || {
|
||||
echo
|
||||
|
|
|
|||
|
|
@ -1,10 +1,8 @@
|
|||
dnl Note: this file is generated from configure.base by autogen.sh
|
||||
SUBSTFOR configure.ac:AC_INIT
|
||||
SUBSTFOR configure.ac:AC_CONFIG_SRCDIR([gst/gstobject.h])
|
||||
SUBSTFOR configure.in:AC_INIT(gst/gstobject.h)
|
||||
AC_INIT
|
||||
AC_CONFIG_SRCDIR([gst/gstobject.h])
|
||||
|
||||
SUBSTFOR configure.ac:AC_CANONICAL_TARGET([])
|
||||
SUBSTFOR configure.in:AC_CANONICAL_SYSTEM
|
||||
AC_CANONICAL_TARGET([])
|
||||
|
||||
AM_CONFIG_HEADER(config.h)
|
||||
|
||||
|
|
@ -44,11 +42,14 @@ AC_SUBST(GST_LIBVERSION)
|
|||
|
||||
AM_MAINTAINER_MODE
|
||||
|
||||
dnl you need automake 1.5 for AM_PROG_AS to work !
|
||||
dnl we moved AM_PROG_AS up before CC, maybe that helps the substition ?
|
||||
AM_PROG_AS
|
||||
AC_PROG_CC
|
||||
AM_PROG_CC_STDC
|
||||
dnl you need automake 1.5 for AM_PROG_AS to work !
|
||||
AM_PROG_AS
|
||||
dnl there's something wrong with AS being set to CC, so we set it explicitly
|
||||
AS=gcc
|
||||
AC_SUBST(AS)
|
||||
|
||||
AC_PROG_CXX
|
||||
AC_PROG_CXXCPP
|
||||
AC_ISC_POSIX
|
||||
|
|
@ -59,8 +60,7 @@ AM_DISABLE_STATIC
|
|||
AC_LIBTOOL_DLOPEN
|
||||
AM_PROG_LIBTOOL
|
||||
|
||||
SUBSTFOR configure.ac:AC_HEADER_STDC([])
|
||||
SUBSTFOR configure.in:AC_STDC_HEADERS
|
||||
AC_HEADER_STDC([])
|
||||
|
||||
dnl This is used for the -config script...
|
||||
builddir=`pwd`
|
||||
|
|
@ -207,6 +207,7 @@ dnl Check for essential libraries first:
|
|||
dnl ====================================
|
||||
|
||||
dnl Check for glib2
|
||||
translit(dnm, m, l) AM_CONDITIONAL(USE_GLIB2, true)
|
||||
GST_CHECK_FEATURE(GLIB2, [use of glib-2.0 and GObject], , [
|
||||
PKG_CHECK_MODULES(GLIB2, glib-2.0 gobject-2.0 gthread-2.0 gmodule-2.0,
|
||||
HAVE_GLIB2=yes,HAVE_GLIB2=no)
|
||||
|
|
@ -301,9 +302,7 @@ AC_SUBST(ARTS_CFLAGS)
|
|||
AC_SUBST(ARTS_MCOPFLAGS)
|
||||
|
||||
dnl Now check if it exists
|
||||
SUBSTFOR configure.ac:AC_LANG_PUSH(C++)
|
||||
SUBSTFOR configure.in:AC_LANG_SAVE
|
||||
SUBSTFOR configure.in:AC_LANG_CPLUSPLUS
|
||||
AC_LANG_PUSH(C++)
|
||||
HAVE_ARTS=yes
|
||||
dnl FIXME: Can't get this test to pass, so commented it out. Rely on header check.
|
||||
dnl AC_CHECK_LIB(artsflow, convert_stereo_2float_i16le, :, HAVE_ARTS=no, $LIBS)
|
||||
|
|
@ -312,8 +311,7 @@ dnl AC_CHECK_HEADER uses CPPFLAGS, but not CFLAGS.
|
|||
dnl FIXME: ensure only suitable flags result from artsc-config --cflags
|
||||
AC_CHECK_HEADER(artsflow.h, :, HAVE_ARTS=no)
|
||||
|
||||
SUBSTFOR configure.ac:AC_LANG_POP(C++)
|
||||
SUBSTFOR configure.in:AC_LANG_RESTORE
|
||||
AC_LANG_POP(C++)
|
||||
dnl Check for the idl generator
|
||||
AC_CHECK_PROG(HAVE_MCOPIDL, mcopidl, yes, no)
|
||||
if test x$HAVE_MCOPIDL = xno; then
|
||||
|
|
@ -331,22 +329,27 @@ dnl =======================================
|
|||
|
||||
|
||||
dnl ***** ESound *****
|
||||
translit(dnm, m, l) AM_CONDITIONAL(USE_LIBESD, true)
|
||||
GST_CHECK_FEATURE(LIBESD, [esound plugins], esdsrc esdsink, [
|
||||
AM_PATH_ESD(0.2.12, HAVE_LIBESD=yes, HAVE_LIBESD=no)
|
||||
])
|
||||
|
||||
dnl Check for artsc
|
||||
translit(dnm, m, l) AM_CONDITIONAL(USE_ARTSC, true)
|
||||
GST_CHECK_FEATURE(ARTSC, [artsd plugins], artsdsink, [GST_CHECK_ARTSC()])
|
||||
|
||||
dnl Check for artsc
|
||||
translit(dnm, m, l) AM_CONDITIONAL(USE_ARTS, true)
|
||||
GST_CHECK_FEATURE(ARTS, [arts plugins], arts, [GST_CHECK_ARTS()])
|
||||
|
||||
dnl Check for xmms
|
||||
translit(dnm, m, l) AM_CONDITIONAL(USE_LIBXMMS, true)
|
||||
GST_CHECK_FEATURE(LIBXMMS, [xmms plugin], xmms, [
|
||||
AM_PATH_XMMS(0.1.0, HAVE_LIBXMMS=yes, HAVE_LIBXMMS=no)
|
||||
], disabled)
|
||||
|
||||
dnl Check for alsa
|
||||
translit(dnm, m, l) AM_CONDITIONAL(USE_ALSA, true)
|
||||
GST_CHECK_FEATURE(ALSA, [alsa plugins], gstalsa, [
|
||||
AM_PATH_ALSA(0.9.0, HAVE_ALSA=yes, HAVE_ALSA=no)
|
||||
])
|
||||
|
|
@ -357,14 +360,20 @@ if test x$HAVE_ALSA = xno; then
|
|||
fi
|
||||
|
||||
dnl Check for libaudiofile
|
||||
translit(dnm, m, l) AM_CONDITIONAL(USE_LIBAUDIOFILE, true)
|
||||
GST_CHECK_FEATURE(LIBAUDIOFILE, [use gdk pixbuf], afsink afsrc, [
|
||||
GST_CHECK_CONFIGPROG(LIBAUDIOFILE, audiofile-config)
|
||||
translit(dnm, m, l) AC_SUBST(LIBAUDIOFILE_LIBS)
|
||||
translit(dnm, m, l) AC_SUBST(LIBAUDIOFILE_CFLAGS)
|
||||
GST_CHECK_CONFIGPROG(LIBAUDIOFILE, audiofile-config)
|
||||
])
|
||||
|
||||
dnl Check for libgdk-pixbuf
|
||||
dnl FIXME: not sure that this is still used anywhere.
|
||||
translit(dnm, m, l) AM_CONDITIONAL(USE_GDK_PIXBUF, true)
|
||||
GST_CHECK_FEATURE(GDK_PIXBUF, [use gdk pixbuf], , [
|
||||
GST_CHECK_CONFIGPROG(GDK_PIXBUF, gdk-pixbuf-config)
|
||||
translit(dnm, m, l) AC_SUBST(GDK_PIXBUF_LIBS)
|
||||
translit(dnm, m, l) AC_SUBST(GDK_PIXBUF_CFLAGS)
|
||||
GST_CHECK_CONFIGPROG(GDK_PIXBUF, gdk-pixbuf-config)
|
||||
])
|
||||
|
||||
if test x$USE_GLIB2 = xyes; then
|
||||
|
|
@ -375,10 +384,13 @@ if test x$USE_GLIB2 = xyes; then
|
|||
AC_MSG_WARN(gnome disabled for glib2.0)
|
||||
else
|
||||
dnl Check for libgnome
|
||||
GST_CHECK_CONFIGPROG(GNOME, gnome-config, gnome gnomeui)
|
||||
translit(dnm, m, l) AC_SUBST(GNOME_LIBS)
|
||||
translit(dnm, m, l) AC_SUBST(GNOME_CFLAGS)
|
||||
GST_CHECK_CONFIGPROG(GNOME, gnome-config, gnome gnomeui)
|
||||
fi
|
||||
|
||||
dnl Check for libghttp
|
||||
translit(dnm, m, l) AM_CONDITIONAL(USE_LIBGHTTP, true)
|
||||
GST_CHECK_FEATURE(LIBGHTTP, [libghttp plugins], gsthttpsrc, [
|
||||
dnl FIXME: need to check for header
|
||||
GHTTP_LIBS=
|
||||
|
|
@ -863,11 +875,17 @@ AC_SUBST(GST_DISABLE_[$1]_DEFINE)
|
|||
GST_SUBSYSTEM_DISABLE_DEFINES="$GST_SUBSYTEM_DISABLE_DEFINES $GST_DISABLE_[$1]_DEFINE"
|
||||
])
|
||||
|
||||
translit(dnm, m, l) AM_CONDITIONAL(GST_DISABLE_LOADSAVE, true)
|
||||
GST_SUBSYSTEM_DISABLE(LOADSAVE,[pipeline XML load/save])
|
||||
translit(dnm, m, l) AM_CONDITIONAL(GST_DISABLE_TYPEFIND, true)
|
||||
GST_SUBSYSTEM_DISABLE(TYPEFIND,[typefind plugin],)
|
||||
translit(dnm, m, l) AM_CONDITIONAL(GST_DISABLE_AUTOPLUG, true)
|
||||
GST_SUBSYSTEM_DISABLE(AUTOPLUG,[autoplugger subsystem])
|
||||
translit(dnm, m, l) AM_CONDITIONAL(GST_DISABLE_PARSE, true)
|
||||
GST_SUBSYSTEM_DISABLE(PARSE,[command-line parser])
|
||||
translit(dnm, m, l) AM_CONDITIONAL(GST_DISABLE_TRACE, true)
|
||||
GST_SUBSYSTEM_DISABLE(TRACE,[tracing subsystem])
|
||||
translit(dnm, m, l) AM_CONDITIONAL(GST_DISABLE_REGISTRY, true)
|
||||
GST_SUBSYSTEM_DISABLE(REGISTRY,[plugin registry])
|
||||
|
||||
GST_CFLAGS="$GST_CFLAGS $GST_SUBSYSTEM_DISABLE_DEFINES"
|
||||
|
|
@ -1114,9 +1132,8 @@ dnl #########################
|
|||
dnl until ffmpeg is handled by configure plugins/ffmpeg/Makefile
|
||||
dnl components/bonobo-gstmediaplay/Makefile
|
||||
dnl someone should fix this test/misc/Makefile
|
||||
SUBSTFOR configure.ac:AC_OUTPUT(
|
||||
SUBSTFOR configure.ac:Makefile
|
||||
SUBSTFOR configure.in:AC_OUTPUT([Makefile
|
||||
AC_OUTPUT(
|
||||
Makefile
|
||||
include/Makefile
|
||||
gst/Makefile
|
||||
gst/gstversion.h
|
||||
|
|
@ -1285,10 +1302,7 @@ stamp.h
|
|||
gstreamer-config
|
||||
gstreamer.pc
|
||||
gstreamer-uninstalled.pc
|
||||
SUBSTFOR configure.in:gstreamer.spec])
|
||||
SUBSTFOR configure.in:AC_OUTPUT_COMMANDS([chmod +x gstreamer-config;
|
||||
SUBSTFOR configure.in:echo "$infomessages"], infomessages="$infomessages")
|
||||
SUBSTFOR configure.ac:gstreamer.spec,
|
||||
SUBSTFOR configure.ac:chmod +x gstreamer-config
|
||||
SUBSTFOR configure.ac:echo "$infomessages", infomessages="$infomessages"
|
||||
SUBSTFOR configure.ac:)
|
||||
gstreamer.spec,
|
||||
chmod +x gstreamer-config
|
||||
echo "$infomessages", infomessages="$infomessages"
|
||||
)
|
||||
|
|
@ -1,17 +0,0 @@
|
|||
#!/bin/sh
|
||||
# Run this to generate configure.in and configure.ac from configure.base
|
||||
|
||||
# args: $1 - configure file to create
|
||||
|
||||
sed "
|
||||
s/^SUBSTFOR $1://g;
|
||||
/^SUBSTFOR .*:.*/d;
|
||||
s/^ *GST_CHECK_FEATURE *(\\([A-Za-z0-9_]*\\) *,/translit(dnm, m, l) AM_CONDITIONAL(USE_\\1, true)\\
|
||||
GST_CHECK_FEATURE(\\1,/
|
||||
s/^ *GST_SUBSYSTEM_DISABLE *(\\([A-Za-z0-9_]*\\) *,/translit(dnm, m, l) AM_CONDITIONAL(GST_DISABLE_\\1, true)\\
|
||||
GST_SUBSYSTEM_DISABLE(\\1,/
|
||||
s/^ *GST_CHECK_CONFIGPROG *(\\([A-Za-z0-9_]*\\) *,/translit(dnm, m, l) AC_SUBST(\\1_LIBS)\\
|
||||
GST_CHECK_CONFIGPROG(\\1,/" |
|
||||
sed "
|
||||
s/^ *GST_CHECK_CONFIGPROG *(\\([A-Za-z0-9_]*\\) *,/translit(dnm, m, l) AC_SUBST(\\1_CFLAGS)\\
|
||||
GST_CHECK_CONFIGPROG(\\1,/"
|
||||
Loading…
Reference in a new issue