Remove build time requirement for gnome-common and gnome python bindings.

svn: r10795

INSTALL

@@ -14,12 +14,12 @@ running ./autogen.sh and then "make" and, finally, "make install".
 
 Running ./autogen.sh on this branch of gramps requires the following
 packages to be installed:
-   * automake-1.9
+   * autoconf >=2.53
-   * gnome-common
+   * automake >=1.9
-   * intltool
+   * intltool >=0.25
-   * libglib2.0-dev (may be called differently on other distros) and
+   * glib-gettext >=2.2.0, included in libglib2.0-dev (may be called
-maybe something else. If autogen.sh fails, it should inform you what's
+differently on other distros) and maybe something else. If autogen.sh
-missing.
+fails, it should inform you what's missing.
 
 
 Regular vs local installation

autogen.sh

@@ -1,21 +1,102 @@
 #!/bin/sh
 # Run this to generate all the initial makefiles, etc.
-# shamelessly borrowed from the Galeon source distribution
+# $Id$
-
-srcdir=`dirname $0`
-test -z "$srcdir" && srcdir=.
 
 PKG_NAME="gramps"
+srcdir=`dirname $0`
+test -z "$srcdir" && srcdir=.
+srcfile=$srcdir/src/gramps_main.py
 
-(test -f $srcdir/configure.in \
+REQUIRED_AUTOMAKE_VERSION=1.9
-  && test -f $srcdir/src/gramps_main.py) || {
+DIE=0
-    echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
+
-    echo " top-level $PKG_NAME directory"
+# source helper functions
-    exit 1
+if test ! -f gramps-autogen.sh;
-}
+then
+  echo There is something wrong with your source tree.
+  echo You are missing gramps-autogen.sh
+  exit 1
+fi
+. gramps-autogen.sh
+
+CONFIGURE_DEF_OPT='--enable-maintainer-mode'
+
+autogen_options $@
+
+#echo -n "+ check for build tools"
+#if test ! -z "$NOCHECK"; then echo ": skipped version checks"; else  echo; fi
+
+#tell Mandrake autoconf wrapper we want autoconf 2.5x, not 2.13
+WANT_AUTOCONF_2_5=1
+export WANT_AUTOCONF_2_5
+version_check autoconf AUTOCONF 'autoconf2.50 autoconf autoconf-2.53' $REQUIRED_AUTOCONF_VERSION \
+    "http://ftp.gnu.org/pub/gnu/autoconf/autoconf-$REQUIRED_AUTOCONF_VERSION.tar.gz" || DIE=1
+AUTOHEADER=`echo $AUTOCONF | sed s/autoconf/autoheader/`
+
+automake_progs="automake automake-1.10 automake-1.9"
+version_check automake AUTOMAKE "$automake_progs" $REQUIRED_AUTOMAKE_VERSION \
+    "http://ftp.gnu.org/pub/gnu/automake/automake-$REQUIRED_AUTOMAKE_VERSION.tar.gz" || DIE=1
+ACLOCAL=`echo $AUTOMAKE | sed s/automake/aclocal/`
+
+version_check glib-gettext GLIB_GETTEXTIZE glib-gettextize $REQUIRED_GLIB_GETTEXT_VERSION \
+    "ftp://ftp.gtk.org/pub/gtk/v2.2/glib-$REQUIRED_GLIB_GETTEXT_VERSION.tar.gz" || DIE=1
+require_m4macro glib-gettext.m4
+
+version_check intltool INTLTOOLIZE intltoolize $REQUIRED_INTLTOOL_VERSION \
+    "http://ftp.gnome.org/pub/GNOME/sources/intltool/" || DIE=1
+require_m4macro intltool.m4
+
+
+check_m4macros || DIE=1
+
+if [ "$DIE" -eq 1 ]; then
+  exit 1
+fi
+
+if [ "$#" = 0 ]; 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."
+  printerr
+fi
+
+toplevel_check $srcfile
+
+# Note that the order these tools are called should match what
+# autoconf's "autoupdate" package does.  See bug 138584 for
+# details.
+
+# programs that might install new macros get run before aclocal
+
+printbold "Running $GLIB_GETTEXTIZE... Ignore non-fatal messages."
+echo "no" | $GLIB_GETTEXTIZE --force --copy || exit 1
+
+printbold "Running $INTLTOOLIZE..."
+$INTLTOOLIZE --force --copy --automake || exit 1
+
+# Now run aclocal to pull in any additional macros needed
+printbold "Running $ACLOCAL..."
+$ACLOCAL -I m4 $ACLOCAL_FLAGS || exit 1
+
+# Now that all the macros are sorted, run autoconf and autoheader ...
+printbold "Running $AUTOCONF..."
+$AUTOCONF || exit 1
+
+# Finally, run automake to create the makefiles ...
+printbold "Running $AUTOMAKE..."
+cp -pf COPYING COPYING.autogen_bak
+cp -pf INSTALL INSTALL.autogen_bak
+$AUTOMAKE --gnu --add-missing --force --copy || exit 1
+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 test x$NOCONFIGURE = x; then
+    printbold Running ./configure $CONFIGURE_DEF_OPT $CONFIGURE_EXT_OPT ...
+    ./configure $CONFIGURE_DEF_OPT $CONFIGURE_EXT_OPT \
+        && echo Now type \`make\' to compile $PKG_NAME || exit 1
+else
+    echo Skipping configure process.
+fi
 
-which gnome-autogen.sh || {
-    echo "You need to install gnome-common package."
-    exit 1
-}
-REQUIRED_AUTOMAKE_VERSION=1.9 USE_GNOME2_MACROS=1 . gnome-autogen.sh

configure.in

@@ -85,29 +85,6 @@ then
 fi
 AC_MSG_RESULT($has_pygtk)
 
-AC_MSG_CHECKING(Python bindings for gnome)
-cat > conftest.py <<EOF
-$pygtk_require
-try:
-    import gnome
-    # Do not import gnome.ui, this can kill python if the
-    # display cannot be opened.  Just search it.
-    import imp
-    imp.find_module('gnome/ui')
-    out("gnome.ui")
-except ImportError:
-    out("NO")
-EOF
-$PYTHON conftest.py
-has_pygnome=`cat conftest.out`
-rm -f conftest.out conftest.py
-if test NO = "$has_pygnome"
-then
-   AC_MSG_ERROR([
-**** The python bindings for gnome2 (gnome2-python) could not be found.])
-fi
-AC_MSG_RESULT($has_pygnome)
-
 AC_MSG_CHECKING(Python bindings for glade)
 cat > conftest.py <<EOF
 $pygtk_require

gramps-autogen.sh

@@ -0,0 +1,316 @@
+#!/bin/sh
+# Run this to generate all the initial makefiles, etc.
+# $Id$
+
+#name of package
+PKG_NAME=${PKG_NAME:-Package}
+srcdir=${srcdir:-.}
+
+# default version requirements ...
+REQUIRED_AUTOCONF_VERSION=${REQUIRED_AUTOCONF_VERSION:-2.53}
+REQUIRED_AUTOMAKE_VERSION=${REQUIRED_AUTOMAKE_VERSION:-1.4}
+REQUIRED_GLIB_GETTEXT_VERSION=${REQUIRED_GLIB_GETTEXT_VERSION:-2.2.0}
+REQUIRED_INTLTOOL_VERSION=${REQUIRED_INTLTOOL_VERSION:-0.25}
+
+# a list of required m4 macros.  Package can set an initial value
+REQUIRED_M4MACROS=${REQUIRED_M4MACROS:-}
+FORBIDDEN_M4MACROS=${FORBIDDEN_M4MACROS:-}
+
+# Not all echo versions allow -n, so we check what is possible. This test is
+# based on the one in autoconf.
+case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
+  *c*,-n*) ECHO_N= ;;
+  *c*,*  ) ECHO_N=-n ;;
+  *)       ECHO_N= ;;
+esac
+
+# some terminal codes ...
+boldface="`tput bold 2>/dev/null`"
+normal="`tput sgr0 2>/dev/null`"
+printbold() {
+    echo $ECHO_N "$boldface"
+    echo "$@"
+    echo $ECHO_N "$normal"
+}    
+
+printerr() {
+    echo "$@" >&2
+}
+
+autogen_options ()
+{
+  if test "x$1" = "x"; then
+    return 0
+  fi
+
+  printbold "Checking command line options..."
+  while test "x$1" != "x" ; do
+    optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
+    case "$1" in
+      --noconfigure)
+          NOCONFIGURE=defined
+          AUTOGEN_EXT_OPT="$AUTOGEN_EXT_OPT --noconfigure"
+          echo "  configure run disabled"
+          shift
+          ;;
+      --nocheck)
+          AUTOGEN_EXT_OPT="$AUTOGEN_EXT_OPT --nocheck"
+          NOCHECK=defined
+          echo "  autotools version check disabled"
+          shift
+          ;;
+      --debug)
+          DEBUG=defined
+          AUTOGEN_EXT_OPT="$AUTOGEN_EXT_OPT --debug"
+          echo "  debug output enabled"
+          shift
+          ;;
+      -h|--help)
+          echo "autogen.sh (autogen options) -- (configure options)"
+          echo "autogen.sh help options: "
+          echo " --noconfigure            don't run the configure script"
+#          echo " --nocheck                don't do version checks"
+          echo " --debug                  debug the autogen process"
+          echo
+          echo " --with-autoconf PATH     use autoconf in PATH"
+          echo " --with-automake PATH     use automake in PATH"
+          echo
+          echo "Any argument either not in the above list or after a '--' will be "
+          echo "passed to ./configure."
+          exit 1
+          ;;
+      --with-automake=*)
+          AUTOMAKE=$optarg
+          echo "  using alternate automake in $optarg"
+          CONFIGURE_DEF_OPT="$CONFIGURE_DEF_OPT --with-automake=$AUTOMAKE"
+          shift
+          ;;
+      --with-autoconf=*)
+          AUTOCONF=$optarg
+          echo "  using alternate autoconf in $optarg"
+          CONFIGURE_DEF_OPT="$CONFIGURE_DEF_OPT --with-autoconf=$AUTOCONF"
+          shift
+          ;;
+      --) shift ; break ;;
+      *)
+          echo "  passing argument $1 to configure"
+          CONFIGURE_EXT_OPT="$CONFIGURE_EXT_OPT $1"
+          shift
+          ;;
+    esac
+  done
+
+  for arg do CONFIGURE_EXT_OPT="$CONFIGURE_EXT_OPT $arg"; done
+  if test ! -z "$CONFIGURE_EXT_OPT"
+  then
+    echo "  options passed to configure: $CONFIGURE_EXT_OPT"
+  fi
+}
+
+# Usage:
+#     compare_versions MIN_VERSION ACTUAL_VERSION
+# returns true if ACTUAL_VERSION >= MIN_VERSION
+compare_versions() {
+    ch_min_version=$1
+    ch_actual_version=$2
+    ch_status=0
+    IFS="${IFS=         }"; ch_save_IFS="$IFS"; IFS="."
+    set $ch_actual_version
+    for ch_min in $ch_min_version; do
+        ch_cur=`echo $1 | sed 's/[^0-9].*$//'`; shift # remove letter suffixes
+        if [ -z "$ch_min" ]; then break; fi
+        if [ -z "$ch_cur" ]; then ch_status=1; break; fi
+        if [ $ch_cur -gt $ch_min ]; then break; fi
+        if [ $ch_cur -lt $ch_min ]; then ch_status=1; break; fi
+    done
+    IFS="$ch_save_IFS"
+    return $ch_status
+}
+
+# Usage:
+#     version_check PACKAGE VARIABLE CHECKPROGS MIN_VERSION SOURCE
+# checks to see if the package is available
+version_check() {
+    vc_package=$1
+    vc_variable=$2
+    vc_checkprogs=$3
+    vc_min_version=$4
+    vc_source=$5
+    vc_status=1
+
+    vc_checkprog=`eval echo "\\$$vc_variable"`
+    if [ -n "$vc_checkprog" ]; then
+	printbold "using $vc_checkprog for $vc_package"
+	return 0
+    fi
+
+    if test "x$vc_package" = "xautomake" -a "x$vc_min_version" = "x1.4"; then
+	vc_comparator="="
+    else
+	vc_comparator=">="
+    fi
+    printbold "Checking for $vc_package $vc_comparator $vc_min_version..."
+    for vc_checkprog in $vc_checkprogs; do
+	echo $ECHO_N "  testing $vc_checkprog... "
+	if $vc_checkprog --version < /dev/null > /dev/null 2>&1; then
+	    vc_actual_version=`$vc_checkprog --version | head -n 1 | \
+                               sed 's/^.*[ 	]\([0-9.]*[a-z]*\).*$/\1/'`
+	    if compare_versions $vc_min_version $vc_actual_version; then
+		echo "found $vc_actual_version"
+		# set variables
+		eval "$vc_variable=$vc_checkprog; \
+			${vc_variable}_VERSION=$vc_actual_version"
+		vc_status=0
+		break
+	    else
+		echo "too old (found version $vc_actual_version)"
+	    fi
+	else
+	    echo "not found."
+	fi
+    done
+    if [ "$vc_status" != 0 ]; then
+	printerr "***Error***: You must have $vc_package $vc_comparator $vc_min_version installed"
+	printerr "  to build $PKG_NAME.  Download the appropriate package for"
+	printerr "  from your distribution or get the source tarball at"
+        printerr "    $vc_source"
+	printerr
+    fi
+    return $vc_status
+}
+
+debug ()
+# print out a debug message if DEBUG is a defined variable
+{
+  if test ! -z "$DEBUG"
+  then
+    echo "DEBUG: $1"
+  fi
+}
+
+# Usage:
+#     require_m4macro filename.m4
+# adds filename.m4 to the list of required macros
+require_m4macro() {
+    case "$REQUIRED_M4MACROS" in
+	$1\ * | *\ $1\ * | *\ $1) ;;
+	*) REQUIRED_M4MACROS="$REQUIRED_M4MACROS $1" ;;
+    esac
+}
+
+forbid_m4macro() {
+    case "$FORBIDDEN_M4MACROS" in
+	$1\ * | *\ $1\ * | *\ $1) ;;
+	*) FORBIDDEN_M4MACROS="$FORBIDDEN_M4MACROS $1" ;;
+    esac
+}
+
+# Usage:
+#     add_to_cm_macrodirs dirname
+# Adds the dir to $cm_macrodirs, if it's not there yet.
+add_to_cm_macrodirs() {
+    case $cm_macrodirs in
+    "$1 "* | *" $1 "* | *" $1") ;;
+    *) cm_macrodirs="$cm_macrodirs $1";;
+    esac
+}
+
+# Usage:
+#     check_m4macros
+# Checks that all the requested macro files are in the aclocal macro path
+# Uses REQUIRED_M4MACROS and ACLOCAL variables.
+check_m4macros() {
+    # construct list of macro directories
+    cm_macrodirs=`$ACLOCAL --print-ac-dir`
+    # aclocal also searches a version specific dir, eg. /usr/share/aclocal-1.9
+    # but it contains only Automake's own macros, so we can ignore it.
+
+    # Read the dirlist file, supported by Automake >= 1.7.
+    if compare_versions 1.7 $AUTOMAKE_VERSION && [ -s $cm_macrodirs/dirlist ]; then
+	cm_dirlist=`sed 's/[ 	]*#.*//;/^$/d' $cm_macrodirs/dirlist`
+	if [ -n "$cm_dirlist" ] ; then
+	    for cm_dir in $cm_dirlist; do
+		if [ -d $cm_dir ]; then
+		    add_to_cm_macrodirs $cm_dir
+		fi
+	    done
+	fi
+    fi
+
+    # Parse $ACLOCAL_FLAGS
+    set - $ACLOCAL_FLAGS
+    while [ $# -gt 0 ]; do
+	if [ "$1" = "-I" ]; then
+	    add_to_cm_macrodirs "$2"
+	    shift
+	fi
+	shift
+    done
+
+    cm_status=0
+    if [ -n "$REQUIRED_M4MACROS" ]; then
+	printbold "Checking for required M4 macros..."
+	# check that each macro file is in one of the macro dirs
+	for cm_macro in $REQUIRED_M4MACROS; do
+	    cm_macrofound=false
+	    for cm_dir in $cm_macrodirs; do
+		if [ -f "$cm_dir/$cm_macro" ]; then
+		    cm_macrofound=true
+		    break
+		fi
+		# The macro dir in Cygwin environments may contain a file
+		# called dirlist containing other directories to look in.
+		if [ -f "$cm_dir/dirlist" ]; then
+		    for cm_otherdir in `cat $cm_dir/dirlist`; do
+			if [ -f "$cm_otherdir/$cm_macro" ]; then
+			    cm_macrofound=true
+		            break
+			fi
+		    done
+		fi
+	    done
+	    if $cm_macrofound; then
+		:
+	    else
+		printerr "  $cm_macro not found"
+		cm_status=1
+	    fi
+	done
+    fi
+    if [ -n "$FORBIDDEN_M4MACROS" ]; then
+	printbold "Checking for forbidden M4 macros..."
+	# check that each macro file is in one of the macro dirs
+	for cm_macro in $FORBIDDEN_M4MACROS; do
+	    cm_macrofound=false
+	    for cm_dir in $cm_macrodirs; do
+		if [ -f "$cm_dir/$cm_macro" ]; then
+		    cm_macrofound=true
+		    break
+		fi
+	    done
+	    if $cm_macrofound; then
+		printerr "  $cm_macro found (should be cleared from macros dir)"
+		cm_status=1
+	    fi
+	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
+    fi
+    return $cm_status
+}
+
+toplevel_check()
+{
+  srcfile=$1
+  test -f $srcfile || {
+        echo "You must run this script in the top-level $PKG_NAME directory"
+        exit 1
+  }
+}
+
+