From: Javier Jardón Date: Sun, 19 Jun 2011 21:16:12 +0000 (+0100) Subject: autogen.sh: Use autoreconf instead custom script X-Git-Tag: GOBJECT_INTROSPECTION_1_29_17~16 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=882aeed875e1eb90af261265e0036466c3eac455;p=platform%2Fupstream%2Fgobject-introspection.git autogen.sh: Use autoreconf instead custom script --- diff --git a/autogen.sh b/autogen.sh index 1e8abe3..0eac5f5 100755 --- a/autogen.sh +++ b/autogen.sh @@ -1,45 +1,26 @@ #!/bin/sh # Run this to generate all the initial makefiles, etc. -srcdir=`dirname $0` -test -z "$srcdir" && srcdir=. +test -n "$srcdir" || srcdir=`dirname "$0"` +test -n "$srcdir" || srcdir=. -PKG_NAME="gobject-introspection" -REQUIRED_AUTOCONF_VERSION=2.53 -REQUIRED_AUTOMAKE_VERSION=1.9 -REQUIRED_GTK_DOC_VERSION=1.10 +olddir=`pwd` +cd "$srcdir" -(test -f $srcdir/configure.ac \ - && test -f $srcdir/autogen.sh) || { - echo -n "**Error**: Directory "\`$srcdir\'" does not look like the" - echo " top-level $PKG_NAME directory" - exit 1 -} - -DIE=0 - -# This is a bit complicated here since we can't use gnome-config yet. -# It'll be easier after switching to pkg-config since we can then -# use pkg-config to find the gnome-autogen.sh script. - -gnome_autogen= -gnome_datadir= - -ifs_save="$IFS"; IFS=":" -for dir in $PATH ; do - test -z "$dir" && dir=. - if test -f $dir/gnome-autogen.sh ; then - gnome_autogen="$dir/gnome-autogen.sh" - gnome_datadir=`echo $dir | sed -e 's,/bin$,/share,'` - break - fi -done -IFS="$ifs_save" +GTKDOCIZE=`which gtkdocize` +if test -z $GTKDOCIZE; then + echo "*** No GTK-Doc found, please install it ***" + exit 1 +fi -if test -z "$gnome_autogen" ; then - echo "You need to install the gnome-common module and make" - echo "sure the gnome-autogen.sh script is in your \$PATH." - exit 1 +AUTORECONF=`which autoreconf` +if test -z $AUTORECONF; then + echo "*** No autoreconf found, please install it ***" + exit 1 fi -GNOME_DATADIR="$gnome_datadir" USE_GNOME2_MACROS=1 USE_COMMON_DOC_BUILD=yes . $gnome_autogen +gtkdocize || exit $? +autoreconf --force --install --verbose || exit $? + +cd "$olddir" +test -n "$NOCONFIGURE" || "$srcdir/configure" "$@"