[gtkmm] Don't use obsolete macros.

[Krzesimir Nowak <krnowak src gnome org>]

commit 54d68a54237c2475d8275f9f291fccc8da0eda33
Author: Krzesimir Nowak <qdlacz gmail com>
Date:   Thu Sep 22 11:06:47 2011 +0200

    Don't use obsolete macros.
    
    * autogen.sh: Warn about everything during autoreconf.
    * configure.ac: Replaced obsolete macros with their modern counterparts.
    * build/reduced.am: Modernized a bit.
    * gtk/src/filelist.am: Fixed some trailing whitespace after backslashes.
    Automake was issuing warnings because of them.

 autogen.sh           |    2 +-
 build/reduced.m4     |   24 +++++++++---------------
 configure.ac         |    3 +--
 gtk/gtkmmconfig.h.in |    8 ++++----
 gtk/src/filelist.am  |   42 +++++++++++++++++++++---------------------
 5 files changed, 36 insertions(+), 43 deletions(-)
---
diff --git a/autogen.sh b/autogen.sh
index 6686611..fadccc7 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -3,5 +3,5 @@ test -n "$srcdir" || srcdir=`dirname "$0"`
 test -n "$srcdir" || srcdir=.
 
 mm-common-prepare --copy --force "$srcdir"
-autoreconf --force --install --verbose "$srcdir"
+autoreconf --force --install --verbose --warnings=all "$srcdir"
 test -n "$NOCONFIGURE" || "$srcdir/configure" --enable-maintainer-mode "$@"
diff --git a/build/reduced.m4 b/build/reduced.m4
index c5505c1..6b29d0d 100644
--- a/build/reduced.m4
+++ b/build/reduced.m4
@@ -6,20 +6,17 @@
 AC_DEFUN([GTKMM_ARG_ENABLE_API_ATKMM],
 [
   AC_ARG_ENABLE([api-atkmm],
-      [  --enable-api-atkmm  Build atkmm API.
-                              [[default=yes]]],
+      [AS_HELP_STRING([--enable-api-atkmm], [Build atkmm API. @<:@default=yes@:>@])],
       [gtkmm_enable_api_atkmm="$enableval"],
       [gtkmm_enable_api_atkmm='yes'])
 
-  if test "x$gtkmm_enable_api_atkmm" = "xyes"; then
-  {
-    AC_DEFINE([GTKMM_ATKMM_ENABLED],[1], [Defined when the --enable-api-atkmm configure argument was given])
-  }
-  fi
+  AS_VAR_IF([gtkmm_enable_api_atkmm], ['yes'],
+            [AC_DEFINE([GTKMM_ATKMM_ENABLED], [1],
+                       [Define if atkmm API should be built.])])
 ])
 
 
-## GLIBMM_ARG_ENABLE_API_MAEMO_EXTENSIONS()
+## GLIBMM_ARG_ENABLE_API_MAEMO_EXTENSIONS
 ##
 ## Provide the --enable-api-maemo-extensions configure argument, disabled
 ## by default. This provides gtkmm API for the additional GTK+ methods in
@@ -28,15 +25,12 @@ AC_DEFUN([GTKMM_ARG_ENABLE_API_ATKMM],
 AC_DEFUN([GTKMM_ARG_ENABLE_API_MAEMO_EXTENSIONS],
 [
   AC_ARG_ENABLE([api-maemo-extensions],
-      [  --enable-api-maemo-extensions  Build Maemo Extensions API.
-                              [[default=no]]],
+      [AS_HELP_STRING([--enable-api-maemo-extensions], [Build Maemo Extensions API. @<:@default=no@:>@])],
       [gtkmm_enable_api_maemo_extensions="$enableval"],
       [gtkmm_enable_api_maemo_extensions='no'])
 
-  if test "x$gtkmm_enable_api_maemo_extensions" = "xyes"; then
-  {
-    AC_DEFINE([GTKMM_MAEMO_EXTENSIONS_ENABLED],[1], [Defined when the --enable-maemo-extensions configure argument was given])
-  }
-  fi
+  AS_VAR_IF([gtkmm_enable_api_maemo_extensions], ['yes'],
+            [AC_DEFINE([GTKMM_MAEMO_EXTENSIONS_ENABLED], [1],
+                       [Define if maemo extensions should be built.])])
 ])
 
diff --git a/configure.ac b/configure.ac
index 6a03ea0..7f2ecb5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -44,8 +44,7 @@ AC_SUBST([LIBGTKMM_SO_VERSION], [2:0:1])
 
 AC_PROG_CXX
 AC_DISABLE_STATIC
-AC_LIBTOOL_WIN32_DLL
-AC_PROG_LIBTOOL
+LT_INIT([win32-dll])
 
 AC_MSG_CHECKING([for native Windows host])
 AS_CASE([$host_os], [mingw*], [gtkmm_host_windows=yes], [gtkmm_host_windows=no])
diff --git a/gtk/gtkmmconfig.h.in b/gtk/gtkmmconfig.h.in
index 2b11283..2476f54 100644
--- a/gtk/gtkmmconfig.h.in
+++ b/gtk/gtkmmconfig.h.in
@@ -21,22 +21,22 @@
 /* Minor version number of gtkmm. */
 #undef GTKMM_MINOR_VERSION
 
-/* Define when building gtkmm as a static library */
+/* Define when building gtkmm as a static library. */
 #undef GTKMM_STATIC_LIB
 
-/* Enable DLL-specific stuff only when not building a static library */
+/* Enable DLL-specific stuff only when not building a static library. */
 #if (!defined(GTKMM_STATIC_LIB) && !defined(__CYGWIN__) && defined(_WIN32))
 # define GTKMM_DLL 1
 #endif
 
 #ifdef GTKMM_DLL
 # if defined(GTKMM_BUILD) && defined(_WINDLL)
-   /* Do not dllexport as it is handled by gendef on MSVC */
+   /* Do not dllexport as it is handled by gendef on MSVC. */
 #  define GTKMM_API
 # elif !defined(GTKMM_BUILD)
 #  define GTKMM_API __declspec(dllimport)
 # else
-   /* Build a static library */
+   /* Build a static library. */
 #  define GTKMM_API
 # endif /* GTKMM_BUILD - _WINDLL */
 #else
diff --git a/gtk/src/filelist.am b/gtk/src/filelist.am
index 52c4c8e..7270678 100644
--- a/gtk/src/filelist.am
+++ b/gtk/src/filelist.am
@@ -22,11 +22,11 @@ gtkmm_files_any_hg =		\
 	activatable.hg		\
 	adjustment.hg		\
 	alignment.hg		\
-	appchooser.hg \
-	appchooserbutton.hg \
-	appchooserdialog.hg \
-	appchooserwidget.hg \
-	application.hg \
+	appchooser.hg		\
+	appchooserbutton.hg	\
+	appchooserdialog.hg	\
+	appchooserwidget.hg	\
+	application.hg		\
 	arrow.hg		\
 	aspectframe.hg		\
 	assistant.hg		\
@@ -40,7 +40,7 @@ gtkmm_files_any_hg =		\
 	calendar.hg		\
 	cellarea.hg		\
 	cellareabox.hg		\
-	cellareacontext.hg		\
+	cellareacontext.hg	\
 	celleditable.hg		\
 	celllayout.hg		\
 	cellrenderer.hg		\
@@ -58,10 +58,10 @@ gtkmm_files_any_hg =		\
 	clipboard.hg		\
 	colorbutton.hg		\
 	colorselection.hg	\
-	combobox.hg	\
-	comboboxtext.hg	\
+	combobox.hg		\
+	comboboxtext.hg		\
 	container.hg		\
-	cssprovider.hg	\
+	cssprovider.hg		\
 	dialog.hg		\
 	drawingarea.hg		\
 	editable.hg		\
@@ -78,11 +78,11 @@ gtkmm_files_any_hg =		\
 	filefilter.hg		\
 	fixed.hg		\
 	fontbutton.hg		\
-	fontchooser.hg	\
+	fontchooser.hg		\
 	fontchooserdialog.hg	\
 	fontchooserwidget.hg	\
 	frame.hg		\
-	grid.hg \
+	grid.hg			\
 	handlebox.hg		\
 	iconfactory.hg		\
 	iconinfo.hg		\
@@ -107,7 +107,7 @@ gtkmm_files_any_hg =		\
 	messagedialog.hg	\
 	misc.hg			\
 	notebook.hg		\
-	numerableicon.hg \
+	numerableicon.hg	\
 	offscreenwindow.hg	\
 	orientable.hg		\
 	pagesetup.hg		\
@@ -131,7 +131,7 @@ gtkmm_files_any_hg =		\
 	recentfilter.hg		\
 	recentinfo.hg		\
 	recentmanager.hg	\
-  requisition.hg \
+	requisition.hg		\
 	scale.hg		\
 	scalebutton.hg		\
 	scrollable.hg		\
@@ -149,8 +149,8 @@ gtkmm_files_any_hg =		\
 	statusicon.hg		\
 	stockitem.hg		\
 	stylecontext.hg		\
-	styleprovider.hg		\
-	switch.hg \
+	styleprovider.hg	\
+	switch.hg		\
 	table.hg		\
 	targetlist.hg		\
 	tearoffmenuitem.hg	\
@@ -200,13 +200,13 @@ gtkmm_files_posix_hg =		\
 	printunixdialog.hg	\
 	socket.hg
 
-gtkmm_files_deprecated_hg = \
+gtkmm_files_deprecated_hg =	\
 	fontselection.hg	\
-  hvbox.hg \
-	hvbuttonbox.hg \
-	hvpaned.hg \
-	hvscale.hg \
-	hvscrollbar.hg \
+	hvbox.hg		\
+	hvbuttonbox.hg		\
+	hvpaned.hg		\
+	hvscale.hg		\
+	hvscrollbar.hg		\
 	hvseparator.hg
 
 if HOST_WINDOWS_NATIVE