Corrections on 5746c3291ba9b570de99e206401bfa38371ef01f.
authorErik Slagter <erik@openpli.org>
Wed, 11 Feb 2015 15:04:13 +0000 (16:04 +0100)
committerErik Slagter <erik@openpli.org>
Wed, 11 Feb 2015 15:04:13 +0000 (16:04 +0100)
configure.ac

index 53624cf..f2a4770 100644 (file)
@@ -2,11 +2,6 @@ AC_INIT([enigma2],[4],[forum@openpli.org])
 AM_INIT_AUTOMAKE([dist-bzip2 no-define tar-pax -Wno-portability])
 AC_CONFIG_HEADERS([enigma2_config.h])
 
-#dnl versions of gstreamer and plugins-base
-AC_ARG_WITH(gstversion,
-       AS_HELP_STRING([--with-gstversion],[use gstreamer version (major.minor)]),
-       [GST_MAJORMINOR=$withval],[GST_MAJORMINOR=0.10])
-
 # Silent rules are available since 1.11, but older versions
 # are still in use. So don't use them unconditionally.
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
@@ -31,8 +26,6 @@ AX_PTHREAD
 
 TUXBOX_APPS_DVB
 
-PKG_CHECK_MODULES(GSTREAMER, gstreamer-$GST_MAJORMINOR gstreamer-pbutils-$GST_MAJORMINOR)
-
 AM_CONDITIONAL(HAVE_GIT_DIR, test -d "$srcdir/.git")
 AM_CONDITIONAL(HAVE_FAKE_GIT_DIR, test -f "$srcdir/.git/last_commit_info")
 
@@ -41,6 +34,7 @@ AC_ARG_WITH(gstversion,
        AS_HELP_STRING([--with-gstversion],[use gstreamer version (major.minor)]),
        [GST_MAJORMINOR=$withval],[GST_MAJORMINOR=0.10])
 
+PKG_CHECK_MODULES(GSTREAMER, gstreamer-$GST_MAJORMINOR gstreamer-pbutils-$GST_MAJORMINOR)
 PKG_CHECK_MODULES(BASE, [freetype2 fribidi gstreamer-$GST_MAJORMINOR gstreamer-pbutils-$GST_MAJORMINOR libdvbsi++ libpng libxml-2.0 sigc++-1.2 libssl libcrypto])
 PKG_CHECK_MODULES(LIBDDVD, libdreamdvd, HAVE_LIBDDVD="yes", HAVE_LIBDDVD="no")
 AM_CONDITIONAL(HAVE_LIBDDVD, test "$HAVE_LIBDDVD" = "yes")