Okay to commit? PATCH -- libcapplet (updates per Porting Guide and autoconf docs)

[Miles Lane <miles megapathdsl net>]

--- ChangeLog	Sun Dec 16 00:11:48 2001
+++ ../modified-files/libcapplet-ChangeLog	Sun Dec 16 00:14:38 2001
@@ -1,3 +1,11 @@
+2001-14-27  Miles Lane <miles megapathdsl net>
+
+	* acconfig.h:  Added "#undef HAVE_GETTEXT" entry.
+	* configure.in:  added glib-gettextize support and
+	  removed intl directory references.  Also, removed
+	  GNOME_COMMON_INIT macro, per the Porting Guide.
+	* Makefile.am: Removed intl from SUBDIRS.
+
 2001-12-01  Richard Hestilow  <hestilow ximian com>
 
 	* libcapplet/capplet-widget.c:


--- configure.in	Sun Dec 16 00:11:48 2001
+++ ../modified-files/libcapplet-configure.in	Sun Dec 16 00:08:09 2001
@@ -11,7 +11,6 @@
 gnome_cv_use_gnome=yes
 
 
-GNOME_COMMON_INIT
 GNOME_PLATFORM_GNOME_2(yes, force)
 GNOME_COMPILE_WARNINGS(maximum)
 
@@ -27,7 +26,12 @@
 AM_CONDITIONAL(FALSE, test "x" = "y")
 
 ALL_LINGUAS="az ca cs da de el en_GB es et fi fr ga gl hr hu it ja ko
lt nl nn no pl pt pt_BR ro ru sk sl sv ta tr uk zh_CN.GB2312 zh_TW"
-AM_GNOME2_GETTEXT
+
+GETTEXT_PACKAGE=libcapplet
+AC_SUBST(GETTEXT_PACKAGE)
+AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE")
+
+AM_GLIB_GNU_GETTEXT
 
 AC_CHECK_HEADERS(dlfcn.h dl.h)
 AC_CHECK_LIB(dl, dlopen, DL_LIB="-ldl",[
@@ -76,6 +80,5 @@
 libcapplet-2.0.pc
 Makefile
 po/Makefile.in
-libcapplet/Makefile
-intl/Makefile])
+libcapplet/Makefile])
 
--- Makefile.am	Sun Dec 16 00:11:48 2001
+++ ../modified-files/libcapplet-Makefile.am	Sun Dec 16 00:08:26 2001
@@ -1,4 +1,4 @@
-SUBDIRS = intl libcapplet po
+SUBDIRS = libcapplet po
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA=libcapplet-2.0.pc

--- acconfig.h	Sun Dec 16 00:11:48 2001
+++ ../modified-files/libcapplet-acconfig.h	Sun Dec 16 00:07:55 2001
@@ -2,6 +2,7 @@
 #undef HAVE_CATGETS
 #undef HAVE_DEVGTK
 #undef HAVE_GETTEXT
+#undef GETTEXT_PACKAGE
 #undef HAVE_LC_MESSAGES
 #undef HAVE_STPCPY
 #undef HAVE_LIBSM