Modified to use the new GNOME 2.0 config stuff. Removed a dup "#include

2001-08-29  Carlos Perelló Marín <carlos@gnome-db.org>

	* autogen.sh:
	* configure.in:
	* Makefile.am: Modified to use the new GNOME 2.0 config stuff.
	* src/glade.h: Removed a dup "#include <libintl.h>"
	* src/main.c: Moved the NLS stuff to be the first at main()
	and added setlocale (LC_ALL, ""); before the bindtextdomain call
	Now the l10n works!!!! Thanks Martin for your comments ;-)
	* src/Makefile.am: popt is checked at configure.in

1 files changed, 31 insertions, 4 deletions

diff --git a/autogen.sh b/autogen.sh
index 8cda4986..b4fdbb0a 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -4,12 +4,39 @@
 srcdir=`dirname $0`
 test -z "$srcdir" && srcdir=.
 
-PKG_NAME="the package."
+PKG_NAME="glade2"
 
-(test -f $srcdir/configure.in) || {
+(test -f $srcdir/configure.in \
+  && test -f $srcdir/autogen.sh) || {
     echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
-    echo " top-level directory"
+    echo " top-level $PKG_NAME directory"
     exit 1
 }
 
-. $srcdir/macros/autogen.sh
+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"
+
+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
+fi
+
+GNOME_DATADIR="$gnome_datadir" USE_GNOME2_MACROS=1 . $gnome_autogen