[jhbuild/jjardon/autotools: 2/3] Use autoreconf instead custom script

[Javier Jardón <jjardon src gnome org>]

commit 5690e2dfda0f240abdb1392511ad50dcf9b46357
Author: Javier Jardón <jjardon gnome org>
Date:   Wed Oct 16 16:36:46 2013 +0100

    Use autoreconf instead custom script
    
    This means that autotools are required now. Not a big deal taking in
    acount jhbuild is a build tool

 .gitignore        |    1 -
 Makefile.plain    |   52 -----------
 Makefile.windows  |   40 --------
 autogen.sh        |  257 ++++++-----------------------------------------------
 po/Makefile.plain |   10 --
 5 files changed, 29 insertions(+), 331 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7fde771..f53615f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,7 +29,6 @@ mo/
 /jhbuild.desktop
 /jhbuild.desktop.in
 /ltmain.sh
-/Makefile.inc
 /m4/
 /missing
 /mkinstalldirs
diff --git a/autogen.sh b/autogen.sh
index ed22427..19a68c5 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,240 +1,41 @@
-#! /bin/bash
-#
-# JHBuild configuration script.
-#
-# For installation instructions please refer to the JHBuild manual:
-#   yelp /jhbuild-source-dir/doc/C/index.docbook
-#
-# Or refer to the on-line JHBuild manual at:
-#
-#  http://library.gnome.org/devel/jhbuild/stable/getting-started.html.en
-#
-# Usage:
-# ./autogen.sh [OPTION]
-#    Available OPTION are:
-#      --simple-install   Configure without using autotools. This setting is
-#                         set automatically if gnome-common and yelp-tools
-#                         are not installed.
-#      --prefix=PREFIX    Install JHBuild to PREFIX. Defaults to ~/.local
-#
-# If gnome-common and yelp-tools are available, this configuration script
-# will configure JHBuild to install via autotools.
-#
-# If gnome-common and yelp-tools are not available, this configuration
-# script will configure JHBuild to install via a plain Makefile.
-#
-# autogen.sh is used to configure JHBuild because the most common way to obtain
-# JHBuild is via git and a 'configure' should not be checked into git.
-#
-# autogen.sh supports i18n using the package gettext. If gettext is not
-# available english is used. To enable i18n autogen.sh builds mo files from po
-# files using po/Makefile.plain. The mo files are in $srcdir/mo.
+#!/bin/sh
+# Run this to generate all the initial makefiles, etc.
 
-PKG_NAME=jhbuild
+test -n "$srcdir" || srcdir=`dirname "$0"`
+test -n "$srcdir" || srcdir=.
 
-FALSE=1
-TRUE=0
+olddir=`pwd`
+cd $srcdir
 
-srcdir=`dirname $0`
-test -z "$srcdir" && srcdir=.
-test -z "$MAKE" && MAKE=make
-
-setup_i18n()
-{
-  # Check msgfmt (from gettext) is installed to provide i18n for this script
-  hash msgfmt 2>&-
-  msgfmtl_available=$?
-
-  # Build mo from po files so i18n works for this script. mo files can't be
-  # checked in to git so they must be built here.
-  if [ $msgfmtl_available -eq 0 ]; then
-    # -s is for silent
-    # -C is for change directory
-    make -s -C $srcdir/po -f Makefile.plain
-  fi
-
-  # Check gettext.sh is installed to provide i18n for this script
-  hash gettext.sh 2>&-
-  gettext_sh_available=$?
-
-  if [ $gettext_sh_available -eq 0 ]; then
-    export TEXTDOMAINDIR=$srcdir/mo
-    export TEXTDOMAIN=jhbuild
-
-    . gettext.sh
-  fi
-
-  # Check gettext is installed to provide i18n for this script
-  hash gettext 2>&-
-  gettext_available=$?
-}
-
-# parse_commandline parses the commandline and sets shell variables accordingly.
-# - sets $enable_autotools if --simple-install specified.
-# - sets shell variables from long form options. e.g if commandline contains
-#   '--prefix=/opt' then shell variable prefix is set to '/opt'. Shell variable
-#   names must start with a letter or underscore and not contain special
-#   characters. Invalid variable names are ignored.
-# parse_commandline is not using getopt as getopt doesn't support the long form
-# on Solaris, BSD and MacOS.
-parse_commandline()
-{
-  enable_autotools=$TRUE
-
-  while [ -n "$1" ]; do
-    # substring operations available in all sh?
-    if [ ${1:0:2} = "--" ]; then
-      keyvalue=${1:2}
-      key=${keyvalue%%=*}
-      value=${keyvalue##*=}
-      if [ "$key" = "simple-install" ]; then
-        enable_autotools=$FALSE
-      fi
-      echo $key | grep -E '^[A-Za-z_][A-Za-z_0-9]*$' > /dev/null 2>&1
-      if [ $? -eq 0 ]; then
-        eval $key=$value
-      fi
-    fi
-    shift
-  done
-}
-
-# configure JHBuild to build and install without autotools via a plain
-# Makefile. Sets up a Makefile.inc and copies Makefile.plain or
-# Makefile.windows to Makefile
-configure_without_autotools()
-{
-  eval_gettext "Configuring \$PKG_NAME without autotools"; echo
-
-  makefile="$srcdir/Makefile.plain"
-  if [ "x$MSYSTEM" != "x" ]; then
-    makefile="$srcdir/Makefile.windows"
-  fi
-
-  # setup the defaults. The following can changed from the commandline.
-  # e.g. ./autogen.sh --prefix=${HOME}/jhbuildhome
-  [ -z $prefix ] && prefix=${HOME}/.local
-  [ -z $bindir ] && bindir=${prefix}/bin
-  [ -z $datarootdir ] && datarootdir=${prefix}/share
-  [ -z $desktopdir ] && desktopdir=${datarootdir}/applications
-
-  # Check to see if $srcdir/Makefile.inc is writable
-  if [ -f $srcdir/Makefile.inc ]; then
-    if [ ! -w $srcdir/Makefile.inc ]; then
-      eval_gettext  "Unable to create file \$srcdir/Makefile.inc"; echo
-      exit 1
-    fi
-  else
-    if [ ! -w $srcdir ]; then
-      eval_gettext  "Unable to create file \$srcdir/Makefile.inc"; echo
-      exit 1
-    fi
-  fi
-
-  echo "# This file is automatically generated by JHBuild's autogen.sh" \
-    > $srcdir/Makefile.inc
-  echo "# Do NOT edit. This file will be overwritten when autogen.sh is next" \
-       "run." >> $srcdir/Makefile.inc
-  echo "prefix=$prefix" >> $srcdir/Makefile.inc
-  echo "bindir=$bindir" >> $srcdir/Makefile.inc
-  echo "datarootdir=$datarootdir" >> $srcdir/Makefile.inc
-  echo "desktopdir=$desktopdir" >> $srcdir/Makefile.inc
-
-  if [ ! -f $makefile ]; then
-    eval_gettext "Unable to read file \$makefile"; echo
-    exit 1
-  fi
-
-  cp $makefile $srcdir/Makefile || {
-    eval_gettext "Unable to copy \$makefile to \$srcdir/Makefile"
-    echo
-    exit 1
-  }
-
-  eval_gettext "Now type \`make' to compile \$PKG_NAME"; echo
-}
-
-# configure JHBuild to build and install via autotools.
-configure_with_autotools()
-{
-  test -d m4 || mkdir m4
-  test -d build-aux || mkdir build-aux
-  export PKG_NAME
-  REQUIRED_AUTOCONF_VERSION=2.57 \
-  REQUIRED_AUTOMAKE_VERSION=1.8 \
-  REQUIRED_INTLTOOL_VERSION=0.35.0 \
-  REQUIRED_PKG_CONFIG_VERSION=0.16.0 \
-  gnome-autogen.sh $@
-}
-
-# Check for make. make is required to provide i18n for this script and to
-# build and install JHBuild
-make_from_environment=`echo $MAKE | cut -d' ' -f1`
-hash $make_from_environment 2>&-
-if [ $? -ne 0 ]; then
-  echo "\`$make_from_environment' is required to configure & build $PKG_NAME"
-  exit 1
+AUTORECONF=`which autoreconf`
+if test -z $AUTORECONF; then
+        echo "*** No autoreconf found, please intall it ***"
+        exit 1
 fi
 
-setup_i18n
-if [ $gettext_available -ne 0 ]; then
-  # If gettext is not installed fallback to echo in english
-  gettext() { echo -n $1; }
-  # eval_gettext substitutes variables of the form: \$var
-  eval_gettext()
-  {
-    escaped_string=${1/\'/\\\'}
-    eval echo -n ${escaped_string/\`/\\\`}
-  }
+GNOMEDOC=`which yelp-build`
+if test -z $GNOMEDOC; then
+        echo "*** The tools to build the documentation are not found,"
+        echo "    documentation will not be buildded ***"
+        exit 1
 fi
 
-if [ ! -f $srcdir/jhbuild/main.py ]; then
-  eval_gettext "**Error**: Directory \`\$srcdir' does not look like the top-level \$PKG_NAME directory"
-  echo
-  exit 1
+INTLTOOLIZE=`which intltoolize`
+if test -z $INTLTOOLIZE; then
+        echo "*** No intltoolize found, please install the intltool package ***"
+        exit 1
 fi
 
-# Check gnome-common package is installed. gnome-common depends on autoconf,
-# automake and pkgconfig so no need to check them explicitly.
-hash gnome-autogen.sh 2>&-
-gnome_autogen_available=$?
-
-# Check yelp-tools is installed.
-hash yelp-build 2>&-
-yelp_tools_available=$?
-
-parse_commandline $*
-
-autotools_dependencies_met=$FALSE
-if [ $gnome_autogen_available -eq $TRUE -a \
-     $yelp_tools_available -eq $TRUE ]; then
-    autotools_dependencies_met=$TRUE
-fi
-
-# As a hack, force use of autotools if NOCONFIGURE is specified; this
-# allows the gnome-ostree build system to work which doesn't have
-# yelp, but also can't pass options to autogen.sh
-force_autotools=$FALSE
-if test -n "$NOCONFIGURE"; then
-  force_autotools=$TRUE
+# if the AC_CONFIG_MACRO_DIR() macro is used, create that directory
+# This is a automake bug fixed in automake 1.13.2
+# See http://debbugs.gnu.org/cgi/bugreport.cgi?bug=13514
+m4dir=`autoconf --trace 'AC_CONFIG_MACRO_DIR:$1'`
+if [ -n "$m4dir" ]; then
+  mkdir -p $m4dir
 fi
 
-use_autotools=$FALSE
-if [ $enable_autotools -eq $TRUE -a $autotools_dependencies_met -eq $TRUE ]; then
-  use_autotools=$TRUE
-fi
-if [ $force_autotools -eq $TRUE ]; then
-  use_autotools=$TRUE
-fi
+autoreconf --force --install --verbose || exit $?
+intltoolize --automake --copy || exit $?
 
-if [ $use_autotools -eq $TRUE ]; then
-  configure_with_autotools $*
-else
-  if [ $gnome_autogen_available -ne $TRUE ]; then
-    gettext "WARNING: gnome-autogen.sh not available (usually part of package 'gnome-common')"; echo
-  fi
-  if [ $yelp_tools_available -ne $TRUE ]; then
-    gettext "WARNING: yelp-tools not available (usually part of package 'yelp-tools')"; echo
-  fi
-  configure_without_autotools
-fi
+cd $olddir
+test -n "$NOCONFIGURE" || "$srcdir/configure" "$@"