gst-glib.m4: check for glib-mkenums and glib-genmarshal and allow them to be overridden

[platform/upstream/gst-common.git] / gst-autogen.sh

diff --git a/gst-autogen.sh b/gst-autogen.sh
index 3222d65..e54dbcf 100644 (file)
--- a/gst-autogen.sh
+++ b/gst-autogen.sh
@@ -28,7 +28,7 @@ version_get ()
 # arg 2: (uppercased) variable name prefix
 {
   COMMAND=$1
-  VARPREFIX=$2
+  VARPREFIX=`echo $2 | tr .,- _`
 
   # strip everything that's not a digit, then use cut to get the first field
   pkg_version=`$COMMAND --version|head -n 1|sed 's/^.*)[^0-9]*//'|cut -d' ' -f1`
@@ -42,10 +42,10 @@ version_get ()
   test -z "$pkg_minor" && pkg_minor=0
   test -z "$pkg_micro" && pkg_micro=0
   debug "found major $pkg_major minor $pkg_minor micro $pkg_micro"
-  eval `echo ${VARPREFIX}`_MAJOR=$pkg_major
-  eval `echo ${VARPREFIX}`_MINOR=$pkg_minor
-  eval `echo ${VARPREFIX}`_MICRO=$pkg_micro
-  eval `echo ${VARPREFIX}`_VERSION=$pkg_version
+  eval ${VARPREFIX}_MAJOR=$pkg_major
+  eval ${VARPREFIX}_MINOR=$pkg_minor
+  eval ${VARPREFIX}_MICRO=$pkg_micro
+  eval ${VARPREFIX}_VERSION=$pkg_version
 }
 
 version_compare ()
@@ -56,14 +56,14 @@ version_compare ()
 # arg3: MINOR
 # arg4: MICRO
 {
-  VARPREFIX=$1
+  VARPREFIX=`echo $1 | tr .,- _`
   MAJOR=$2
   MINOR=$3
   MICRO=$4
 
-  pkg_major=$(eval echo $`echo ${VARPREFIX}`_MAJOR);
-  pkg_minor=$(eval echo $`echo ${VARPREFIX}`_MINOR);
-  pkg_micro=$(eval echo $`echo ${VARPREFIX}`_MICRO);
+  eval pkg_major=\$${VARPREFIX}_MAJOR;
+  eval pkg_minor=\$${VARPREFIX}_MINOR;
+  eval pkg_micro=\$${VARPREFIX}_MICRO;
 
   #start checking the version
   debug "version_compare: $VARPREFIX against $MAJOR.$MINOR.$MICRO"
@@ -126,7 +126,7 @@ version_check ()
 
     # don't check if asked not to
     test -z "$NOCHECK" && {
-      echo -n "  checking for $COMMAND >= $VERSION ... "
+      printf "  checking for $COMMAND >= $VERSION ... "
     } || {
       # we set a var with the same name as the package, but stripped of
       # unwanted chars
@@ -216,38 +216,6 @@ autoheader_check ()
 
 }
 
-autoconf_2_52d_check ()
-{
-  # autoconf 2.52d has a weird issue involving a yes:no error
-  # so don't allow it's use
-  test -z "$NOCHECK" && {
-    ac_version=`$autoconf --version|head -n 1|sed 's/^[a-zA-Z\.\ ()]*//;s/ .*$//'`
-    if test "$ac_version" = "2.52d"; then
-      echo "autoconf 2.52d has an issue with our current build."
-      echo "We don't know who's to blame however.  So until we do, get a"
-      echo "regular version.  RPM's of a working version are on the gstreamer site."
-      exit 1
-    fi
-  }
-  return 0
-}
-libtool_2_2_gettext_check ()
-{
-  # libtool 2.2 needs autopoint 0.17 or higher
-  version_compare LIBTOOLIZE 2 2 0
-  if test $? -eq 0
-  then
-    version_compare AUTOPOINT 0 17 0
-    if test $? -ne 0
-    then
-      echo "libtool 2.2 requires autopoint 0.17 or higher"
-      return 1
-    fi
-  fi
-  return 0
-}
-
-
 die_check ()
 {
   # call with $DIE