X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=macros2%2Fgnome-autogen.sh;h=f57a876e6db63684fbbc1568b6224c8adc29f1e9;hb=d6e1e2887f608774ad7e4149bd1d64dde30c3241;hp=1ddfdb14e87940337c03d468d4711576a7dbfda7;hpb=4f90035334b19b2b6e0fb6ebb7a34a961ca11ca1;p=platform%2Fupstream%2Fgnome-common.git diff --git a/macros2/gnome-autogen.sh b/macros2/gnome-autogen.sh index 1ddfdb1..f57a876 100644 --- a/macros2/gnome-autogen.sh +++ b/macros2/gnome-autogen.sh @@ -7,7 +7,7 @@ srcdir=${srcdir:-.} # default version requirements ... REQUIRED_AUTOCONF_VERSION=${REQUIRED_AUTOCONF_VERSION:-2.53} -REQUIRED_AUTOMAKE_VERSION=${REQUIRED_AUTOMAKE_VERSION:-1.4} +REQUIRED_AUTOMAKE_VERSION=${REQUIRED_AUTOMAKE_VERSION:-1.9} REQUIRED_LIBTOOL_VERSION=${REQUIRED_LIBTOOL_VERSION:-1.4.3} REQUIRED_GETTEXT_VERSION=${REQUIRED_GETTEXT_VERSION:-0.10.40} REQUIRED_GLIB_GETTEXT_VERSION=${REQUIRED_GLIB_GETTEXT_VERSION:-2.2.0} @@ -15,7 +15,7 @@ REQUIRED_INTLTOOL_VERSION=${REQUIRED_INTLTOOL_VERSION:-0.25} REQUIRED_PKG_CONFIG_VERSION=${REQUIRED_PKG_CONFIG_VERSION:-0.14.0} REQUIRED_GTK_DOC_VERSION=${REQUIRED_GTK_DOC_VERSION:-1.0} REQUIRED_DOC_COMMON_VERSION=${REQUIRED_DOC_COMMON_VERSION:-2.3.0} -REQUIRED_GNOME_DOC_UTILS_VERSION=${REQUIRED_GNOME_DOC_UTILS_VERSION:-0.3.2} +REQUIRED_GNOME_DOC_UTILS_VERSION=${REQUIRED_GNOME_DOC_UTILS_VERSION:-0.4.2} # a list of required m4 macros. Package can set an initial value REQUIRED_M4MACROS=${REQUIRED_M4MACROS:-} @@ -141,6 +141,17 @@ add_to_cm_macrodirs() { } # Usage: +# print_m4macros_error +# Prints an error message saying that autoconf macros were misused +print_m4macros_error() { + printerr "***Error***: some autoconf macros required to build $PKG_NAME" + printerr " were not found in your aclocal path, or some forbidden" + printerr " macros were found. Perhaps you need to adjust your" + printerr " ACLOCAL_FLAGS?" + printerr +} + +# Usage: # check_m4macros # Checks that all the requested macro files are in the aclocal macro path # Uses REQUIRED_M4MACROS and ACLOCAL variables. @@ -202,6 +213,10 @@ check_m4macros() { fi done fi + if [ "$cm_status" != 0 ]; then + print_m4macros_error + return $cm_status + fi if [ -n "$FORBIDDEN_M4MACROS" ]; then printbold "Checking for forbidden M4 macros..." # check that each macro file is in one of the macro dirs @@ -220,11 +235,7 @@ check_m4macros() { done fi if [ "$cm_status" != 0 ]; then - printerr "***Error***: some autoconf macros required to build $PKG_NAME" - printerr " were not found in your aclocal path, or some forbidden" - printerr " macros were found. Perhaps you need to adjust your" - printerr " ACLOCAL_FLAGS?" - printerr + print_m4macros_error fi return $cm_status } @@ -240,8 +251,13 @@ want_pkg_config=false want_gtk_doc=false want_gnome_doc_utils=false -configure_files="`find $srcdir -name '{arch}' -prune -o -name '.?*' -prune -o -name configure.ac -print -o -name configure.in -print`" +configure_files="`find $srcdir -name '{arch}' -prune -o -name '_darcs' -prune -o -name '.??*' -prune -o -name configure.ac -print -o -name configure.in -print`" for configure_ac in $configure_files; do + dirname=`dirname $configure_ac` + if [ -f $dirname/NO-AUTO-GEN ]; then + echo skipping $dirname -- flagged as no auto-gen + continue + fi if grep "^A[CM]_PROG_LIBTOOL" $configure_ac >/dev/null || grep "^LT_INIT" $configure_ac >/dev/null; then want_libtool=true @@ -289,11 +305,12 @@ AUTOHEADER=`echo $AUTOCONF | sed s/autoconf/autoheader/` case $REQUIRED_AUTOMAKE_VERSION in 1.4*) automake_progs="automake-1.4" ;; - 1.5*) automake_progs="automake-1.5 automake-1.6 automake-1.7 automake-1.8 automake-1.9" ;; - 1.6*) automake_progs="automake-1.6 automake-1.7 automake-1.8 automake-1.9" ;; - 1.7*) automake_progs="automake-1.7 automake-1.8 automake-1.9" ;; - 1.8*) automake_progs="automake-1.8 automake-1.9" ;; - 1.9*) automake_progs="automake-1.9" ;; + 1.5*) automake_progs="automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6 automake-1.5" ;; + 1.6*) automake_progs="automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6" ;; + 1.7*) automake_progs="automake-1.10 automake-1.9 automake-1.8 automake-1.7" ;; + 1.8*) automake_progs="automake-1.10 automake-1.9 automake-1.8" ;; + 1.9*) automake_progs="automake-1.10 automake-1.9" ;; + 1.10*) automake_progs="automake-1.10" ;; esac version_check automake AUTOMAKE "$automake_progs" $REQUIRED_AUTOMAKE_VERSION \ "http://ftp.gnu.org/pub/gnu/automake/automake-$REQUIRED_AUTOMAKE_VERSION.tar.gz" || DIE=1 @@ -351,7 +368,7 @@ if [ "$DIE" -eq 1 ]; then exit 1 fi -if [ "$#" = 0 ]; then +if [ "$#" = 0 -a "x$NOCONFIGURE" = "x" ]; then printerr "**Warning**: I am going to run \`configure' with no arguments." printerr "If you wish to pass any to it, please specify them on the" printerr \`$0\'" command line." @@ -442,16 +459,25 @@ for configure_ac in $configure_files; do # Finally, run automake to create the makefiles ... printbold "Running $AUTOMAKE..." - cp -pf COPYING COPYING.autogen_bak - cp -pf INSTALL INSTALL.autogen_bak + if [ -f COPYING ]; then + cp -pf COPYING COPYING.autogen_bak + fi + if [ -f INSTALL ]; then + cp -pf INSTALL INSTALL.autogen_bak + fi if [ $REQUIRED_AUTOMAKE_VERSION != 1.4 ]; then $AUTOMAKE --gnu --add-missing --force --copy || exit 1 else $AUTOMAKE --gnu --add-missing --copy || exit 1 fi - cmp COPYING COPYING.autogen_bak || cp -pf COPYING.autogen_bak COPYING - cmp INSTALL INSTALL.autogen_bak || cp -pf INSTALL.autogen_bak INSTALL - rm -f COPYING.autogen_bak INSTALL.autogen_bak + if [ -f COPYING.autogen_bak ]; then + cmp COPYING COPYING.autogen_bak > /dev/null || cp -pf COPYING.autogen_bak COPYING + rm -f COPYING.autogen_bak + fi + if [ -f INSTALL.autogen_bak ]; then + cmp INSTALL INSTALL.autogen_bak > /dev/null || cp -pf INSTALL.autogen_bak INSTALL + rm -f INSTALL.autogen_bak + fi cd "$topdir" fi