gst-rtsp-server: configure: Modernize autotools setup a bit

Sebastian Dröge slomo at kemper.freedesktop.org
Fri Apr 13 05:02:22 PDT 2012


Module: gst-rtsp-server
Branch: master
Commit: 7df1696713b45897cdefab412de4ce696d3c548a
URL:    http://cgit.freedesktop.org/gstreamer/gst-rtsp-server/commit/?id=7df1696713b45897cdefab412de4ce696d3c548a

Author: Sebastian Dröge <sebastian.droege at collabora.co.uk>
Date:   Fri Apr 13 13:49:08 2012 +0200

configure: Modernize autotools setup a bit

Also we now only create tar.bz2 and tar.xz tarballs.

---

 autogen.sh                  |   13 ++++++-------
 configure.ac                |   16 +++++++++++-----
 gst/rtsp-server/Makefile.am |    2 +-
 3 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/autogen.sh b/autogen.sh
index 5f19714..376fc9d 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 version checks"; else  echo; fi
-version_check "autoconf" "$AUTOCONF autoconf autoconf270 autoconf269 autoconf268 autoconf267 autoconf266 autoconf265 autoconf264 autoconf263 autoconf262 autoconf261 autoconf260" \
-              "ftp://ftp.gnu.org/pub/gnu/autoconf/" 2 60 || DIE=1
-version_check "automake" "$AUTOMAKE automake automake-1.11 automake-1.10" \
-              "ftp://ftp.gnu.org/pub/gnu/automake/" 1 10 || DIE=1
+version_check "autoconf" "$AUTOCONF autoconf autoconf270 autoconf269 autoconf268 autoconf267 autoconf266 autoconf265 autoconf264 autoconf263 autoconf262" \
+              "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 libtoolize15 glibtoolize" \
-              "ftp://ftp.gnu.org/pub/gnu/libtool/" 1 5 0 || DIE=1
+version_check "libtoolize" "libtoolize glibtoolize" \
+              "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 f7be88f..c742de0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,14 +1,14 @@
-AC_PREREQ(2.60)
+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(Gst-RTSP, 0.11.0.1,
+AC_INIT(Gst-RTSP, 0.11.89.1,
     http://bugzilla.gnome.org/enter_bug.cgi?product=GStreamer,
     gst-rtsp)
 AG_GST_INIT
 
 dnl initialize automake
-AM_INIT_AUTOMAKE([-Wno-portability 1.10])
+AM_INIT_AUTOMAKE([-Wno-portability 1.11 no-dist-gzip dist-xz tar-ustar])
 
 dnl define PACKAGE_VERSION_* variables
 AS_VERSION
@@ -23,7 +23,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
@@ -39,7 +39,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)
 
-AM_PROG_LIBTOOL
+AS_LIBTOOL(GST, 0, 0, 0)
 
 dnl *** required versions of GStreamer stuff ***
 GST_REQ=0.11.0
@@ -216,6 +216,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 \^[_]?\(gst_\|Gst\|GST_\).*"
+AC_SUBST(GST_LIB_LDFLAGS)
+
 dnl GST_OBJ_*
 dnl default vars for all internal objects built on libgstrtspserver
 dnl includes GST_ALL_*
diff --git a/gst/rtsp-server/Makefile.am b/gst/rtsp-server/Makefile.am
index 991165d..43b54c4 100644
--- a/gst/rtsp-server/Makefile.am
+++ b/gst/rtsp-server/Makefile.am
@@ -33,7 +33,7 @@ libgstrtspserver_ at GST_API_VERSION@_la_SOURCES = \
     $(c_sources)
 
 libgstrtspserver_ at GST_API_VERSION@_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
-libgstrtspserver_ at GST_API_VERSION@_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
+libgstrtspserver_ at GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS)
 libgstrtspserver_ at GST_API_VERSION@_la_LIBADD = \
 	$(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) \
     -lgstrtp- at GST_API_VERSION@ -lgstrtsp- at GST_API_VERSION@ \



More information about the gstreamer-commits mailing list