move to automake 1.9 and several cleanups (Fixes bug #341056). Patch from

2006-05-10  Lucas Rocha  <lucasr@gnome.org>

	* .cvsignore, Makefile.am, autogen.sh, configure.in,
	data/Makefile.am, po/.cvsignore, src/Makefile.am: move to
	automake 1.9 and several cleanups (Fixes bug #341056).
	Patch from Christian Persch <chpe@gnome.org>.

1 files changed, 47 insertions, 44 deletions

diff --git a/configure.in b/configure.in
index 31bef9e..cbde9fb 100644
--- a/configure.in
+++ b/configure.in
@@ -1,8 +1,13 @@
-AC_PREREQ(2.53)
-AC_INIT(src)
-AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(zenity, 2.15.2)
+AC_INIT([Zenity],[2.15.2],[http://bugzilla.gnome.org/enter_bug.cgi?product=zenity],[zenity])
 
+AC_PREREQ([2.59])
+
+AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_SRCDIR([src])
+
+AM_INIT_AUTOMAKE([1.9 foreign dist-bzip2 no-dist-gzip])
+
+GNOME_COMMON_INIT
 GNOME_DOC_INIT
 
 AM_MAINTAINER_MODE
@@ -11,62 +16,58 @@ IT_PROG_INTLTOOL([0.34.90])
 
 AC_PROG_CC
 
-GTK_REQUIRED=2.6.0
+GTK_REQUIRED=2.9.0
 
-PKG_CHECK_MODULES(ZENITY, gtk+-2.0 >= $GTK_REQUIRED libglade-2.0 libgnomecanvas-2.0 glib-2.0 >= 2.7.3)
-AC_SUBST(ZENITY_CFLAGS)
-AC_SUBST(ZENITY_LIBS)
+PKG_CHECK_MODULES([ZENITY],[gtk+-2.0 >= $GTK_REQUIRED libglade-2.0 libgnomecanvas-2.0 glib-2.0])
+AC_SUBST([ZENITY_CFLAGS])
+AC_SUBST([ZENITY_LIBS])
 
-dnl ***********************************************
-dnl scrollkeeper checks
-dnl ***********************************************
+# *******************************
+# perl check
+# *******************************
 
-AC_PATH_PROG(SCROLLKEEPER_CONFIG, scrollkeeper-config,no)
-if test x$SCROLLKEEPER_CONFIG = xno; then
-	AC_MSG_ERROR(Couldn't find scrollkeeper-config. Please install the scrollkeeper package)
-fi
+AC_PATH_PROG([PERL],[perl],)
 
-dnl *******************************
-dnl perl check
-dnl *******************************
+# *******************************
+# libnotify check
+# *******************************
 
-AC_PATH_PROG(PERL,perl,)
+LIBNOTIFY_REQUIRED=0.3.2
+PKG_CHECK_MODULES([LIBNOTIFY],[libnotify >= $LIBNOTIFY_REQUIRED],
+                  [HAVE_LIBNOTIFY="yes"],[HAVE_LIBNOTIFY="no"])
+AC_SUBST([LIBNOTIFY_CFLAGS])
+AC_SUBST([LIBNOTIFY_LIBS])
 
-dnl *******************************
-dnl libnotify check
-dnl *******************************
-PKG_CHECK_MODULES(LIBNOTIFY, libnotify >= 0.3.2,
-                  HAVE_LIBNOTIFY="yes", HAVE_LIBNOTIFY="no")
 if test "x$HAVE_LIBNOTIFY" = "xyes"; then
-	ZENITY_CFLAGS="$ZENITY_CFLAGS $LIBNOTIFY_CFLAGS"
-	ZENITY_LIBS="$ZENITY_LIBS $LIBNOTIFY_LIBS"
-
-	AC_SUBST(ZENITY_CFLAGS)
-	AC_SUBST(ZENITY_LIBS)
-	AC_DEFINE(HAVE_LIBNOTIFY, 1, [libnotify is available on this machine])
+	AC_DEFINE([HAVE_LIBNOTIFY],[1],[libnotify is available on this machine])
 fi
 
-dnl *******************************
-dnl Internationalization
-dnl ******************************* 
+# *******************************
+# Debug
+# ******************************* 
+
+GNOME_DEBUG_CHECK
+GNOME_COMPILE_WARNINGS([maximum])
+
+# *******************************
+# Internationalization
+# ******************************* 
 
 GETTEXT_PACKAGE=zenity
-AC_SUBST(GETTEXT_PACKAGE)
-AM_GLIB_GNU_GETTEXT
+AC_SUBST([GETTEXT_PACKAGE])
+AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[Gettext domain])
 
-dnl **************************************************************
-dnl AM_GLIB_GNU_GETTEXT above substs $DATADIRNAME
-dnl this is the directory where the *.{mo,gmo} files are installed
-dnl **************************************************************
+AM_GLIB_GNU_GETTEXT
 
-zenitylocaledir='${prefix}/${DATADIRNAME}/locale'
-AC_SUBST(zenitylocaledir)
+# *******************************
 
-AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Finding gettext package])
+AC_SUBST([AM_CPPFLAGS])
+AC_SUBST([AM_CFLAGS])
+AC_SUBST([AM_LDFLAGS])
 
-AC_DEFINE_UNQUOTED(GNOME_ICONDIR, "${prefix}/share/pixmaps", [Determining icon location])
+# *******************************
 
-AC_OUTPUT([
+AC_CONFIG_FILES([
 Makefile 
 zenity.spec
 po/Makefile.in
@@ -75,3 +76,5 @@ src/gdialog
 data/Makefile
 help/Makefile
 ])
+
+AC_OUTPUT