removed m4/ added intl/ use a gnome2 one updated to gnome2

2002-10-28  Bastien Nocera  <hadess@hadess.net>

        * Makefile.am: removed m4/ added intl/
	* autogen.sh: use a gnome2 one
	* configure.in: updated to gnome2

diff --git a/ChangeLog b/ChangeLog
index 508d7029b3ff1835f9f142bd038b0cb10d664f03..f8b5da487ffdf9d3d225f89bb2f3193743a3cfc9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-10-28  Bastien Nocera  <hadess@hadess.net>
+
+       * Makefile.am: removed m4/ added intl/
+       * autogen.sh: use a gnome2 one
+       * configure.in: updated to gnome2
+
 2002-10-28  Jordi Mallach  <jordi@sindominio.net>
 
        * AUTHORS: added a random list of people who should be creditted.

diff --git a/Makefile.am b/Makefile.am
index 19431895892889d99e379ffc0675282da663bf0e..f7a733542c7db636f5545cf61000e801dc6609b9 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS= doc m4 po src themes
+SUBDIRS= intl doc po src themes
 
 icon_DATA = gtetrinet.png
 icondir = $(datadir)/pixmaps

diff --git a/autogen.sh b/autogen.sh
index abb2566d14d3982fcd499e5c2fe581178b4428d9..25a2ad7c1bd7203ee9a3f8061186bbd5c9d09759 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,6 +1,20 @@
 #!/bin/sh
+# Run this to generate all the initial makefiles, etc.
 
-aclocal -I m4
-autoheader
-automake --add-missing
-autoconf
+srcdir=`dirname $0`
+test -z "$srcdir" && srcdir=.
+
+PKG_NAME="gtetrinet"
+
+(test -f $srcdir/configure.in) || {
+    echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
+    echo " top-level $PKG_NAME directory"
+    exit 1
+}
+
+which gnome-autogen.sh || {
+       echo "You need to install gnome-common from the GNOME CVS"
+       exit 1
+}
+
+USE_GNOME2_MACROS=1 . gnome-autogen.sh

diff --git a/configure.in b/configure.in
index 4ff0d249afb9ca7ec1cb24a92a0252316a8d14a0..12ed8a699f181e3e03bf04ab1e5636f263214552 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -7,10 +7,8 @@ AM_INIT_AUTOMAKE(gtetrinet, 0.5.0pre1)
 
 AC_PROG_CC
 
-AM_PATH_GTK_2_0(2.0.0,,exit 1)
-
-AM_GNU_GETTEXT_VERSION(0.11.5)
 ALL_LINGUAS="ca"
+AM_GLIB_GNU_GETTEXT
 
 dnl *****************************************
 dnl pkg-config check time
@@ -64,7 +62,6 @@ AM_GNU_GETTEXT([external])
 AC_OUTPUT([
 Makefile
 doc/Makefile
-m4/Makefile 
 po/Makefile.in
 src/Makefile
 src/images/Makefile