From 3afca7521f85ccfab21d9751b0037310cfa82b9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Fri, 13 Apr 2012 13:59:17 +0200 Subject: [PATCH] configure: Modernize autotools setup a bit Also we now only create tar.bz2 and tar.xz tarballs. --- autogen.sh | 11 +++++------ configure.ac | 24 ++++++++++++------------ ges/Makefile.am | 2 +- 3 files changed, 18 insertions(+), 19 deletions(-) diff --git a/autogen.sh b/autogen.sh index 63f6165b2c..5763949bc3 100755 --- a/autogen.sh +++ b/autogen.sh @@ -35,20 +35,19 @@ autogen_options $@ printf "+ check for build tools" if test ! -z "$NOCHECK"; then echo " skipped"; else echo; fi -version_check "autoconf" "$AUTOCONF autoconf autoconf-2.54 autoconf-2.53 autoconf-2.52" \ - "ftp://ftp.gnu.org/pub/gnu/autoconf/" 2 52 || DIE=1 -version_check "automake" "$AUTOMAKE automake automake-1.11 automake-1.10 automake-1.9 automake-1.7 automake-1.6 automake-1.5" \ - "ftp://ftp.gnu.org/pub/gnu/automake/" 1 7 || DIE=1 +version_check "autoconf" "$AUTOCONF autoconf" \ + "ftp://ftp.gnu.org/pub/gnu/autoconf/" 2 62 || DIE=1 +version_check "automake" "$AUTOMAKE automake automake-1.11" \ + "ftp://ftp.gnu.org/pub/gnu/automake/" 1 11 || DIE=1 #version_check "autopoint" "autopoint" \ # "ftp://ftp.gnu.org/pub/gnu/gettext/" 0 17 || DIE=1 version_check "libtoolize" "$LIBTOOLIZE libtoolize glibtoolize" \ - "ftp://ftp.gnu.org/pub/gnu/libtool/" 1 5 0 || DIE=1 + "ftp://ftp.gnu.org/pub/gnu/libtool/" 2 2 6 || DIE=1 version_check "pkg-config" "" \ "http://www.freedesktop.org/software/pkgconfig" 0 8 0 || DIE=1 die_check $DIE -autoconf_2_52d_check || DIE=1 aclocal_check || DIE=1 autoheader_check || DIE=1 diff --git a/configure.ac b/configure.ac index c9ab41bf04..34bc836ede 100644 --- a/configure.ac +++ b/configure.ac @@ -1,16 +1,16 @@ -AC_PREREQ(2.52) +AC_PREREQ(2.62) dnl initialize autoconf dnl when going to/from release please set the nano (fourth number) right ! dnl releases only do Wall, cvs and prerelease does Werror too -AC_INIT(GStreamer Editing Services, 0.11.0.1, +AC_INIT(GStreamer Editing Services, 0.11.89.1, http://bugzilla.gnome.org/enter_bug.cgi?product=GStreamer, gstreamer-editing-services) AG_GST_INIT dnl initialize automake -AM_INIT_AUTOMAKE([-Wno-portability]) +AM_INIT_AUTOMAKE([-Wno-portability 1.11 no-dist-gzip dist-xz tar-ustar]) dnl define PACKAGE_VERSION_* variables AS_VERSION @@ -25,7 +25,7 @@ dnl define the output header for config AM_CONFIG_HEADER([config.h]) dnl AM_MAINTAINER_MODE only provides the option to configure to enable it -AM_MAINTAINER_MODE +AM_MAINTAINER_MODE([enable]) dnl sets host_* variables AC_CANONICAL_HOST @@ -41,13 +41,7 @@ dnl we override it here if we need to for the release candidate of new series GST_API_VERSION=1.0 AC_SUBST(GST_API_VERSION) -dnl FIXME: this macro doesn't actually work; -dnl the generated libtool script has no support for the listed tags. -dnl So this needs to be fixed first if we want to use this -dnl AS_LIBTOOL_TAGS([CXX]) - -AC_LIBTOOL_WIN32_DLL -AM_PROG_LIBTOOL +AS_LIBTOOL(GST, 0, 0, 0) dnl *** required versions of GStreamer stuff *** GST_REQ=0.11.0 @@ -120,7 +114,7 @@ AG_GST_PLUGIN_DOCS([1.3],[2.1]) dnl *** checks for libraries *** dnl check for libm, for sin() etc. -# AC_CHECK_LIBM +# LT_LIB_M # AC_SUBST(LIBM) dnl *** checks for header files *** @@ -302,6 +296,12 @@ dnl whatevertarget_LIBS and -L flags here affect the rest of the linking GST_ALL_LDFLAGS="-no-undefined" AC_SUBST(GST_ALL_LDFLAGS) +dnl GST_LIB_LDFLAGS +dnl linker flags shared by all libraries +dnl LDFLAGS modifier defining exported symbols from built libraries +GST_LIB_LDFLAGS=" -export-symbols-regex \^_*\(ges_\|GES_\).*" +AC_SUBST(GST_LIB_LDFLAGS) + dnl *** output files *** dnl po/Makefile.in diff --git a/ges/Makefile.am b/ges/Makefile.am index c4e1ee6035..5fed21c205 100644 --- a/ges/Makefile.am +++ b/ges/Makefile.am @@ -103,7 +103,7 @@ libges_@GST_API_VERSION@_la_LIBADD = $(GST_PBUTILS_LIBS) \ $(GST_VIDEO_LIBS) $(GST_CONTROLLER_LIBS) $(GST_PLUGINS_BASE_LIBS) \ $(GST_BASE_LIBS) $(GST_LIBS) $(XML_LIBS) $(GIO_LIBS) libges_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) \ - $(GST_LT_LDFLAGS) $(GIO_CFLAGS) -export-symbols-regex \^_*\(ges_\|GES_\).* + $(GST_LT_LDFLAGS) $(GIO_CFLAGS) DISTCLEANFILE = $(CLEANFILES)