Okay to commit? PATCH -- libgnomeprintui (another glib-gettize patch)



I will justify the portions of the configure.in patch here:

1.  Changed the source file reference to a file in a subdirectory
because it seemed to me to be more likely to show up a bogus source
tree.  This change is optional, of course.

2.  Removed GNOME_COMMON_* and AM_GNOME*_GETTEXT to comply with
instructions in the Gnome 2.0 Porting Guide.

3.  The chunk here is pretty much straight out of the Porting
Guide.  If this is a problem, please decide to fix the Porting 
Guide, too.

4.  Removed references to the intl subdirectory for obvious reasons.

5.  Added GETTEXT_PACKAGE to acconfig.h as is required to avoid
and error.

	Miles

--- ChangeLog	Sat Dec 15 18:43:50 2001
+++ ../modified-files/libgnomeprintui-ChangeLog	Sat Dec 15 09:16:19 2001
@@ -1,3 +1,9 @@
+2001-12-15  Miles Lane <miles megapathdsl net>
+
+	* configure.in: Added glib-gettextize support
+	* acconfig.h: Added "#undef GETTEXT_PACKAGE
+	* Makefile.am: Removed intl from SUBDIRS
+
 2001-12-12  Lauris Kaplinski  <lauris ximian com>
 
 	* configure.in: Version 1.108, require the same libgnomeprint

--- configure.in	Sat Dec 15 18:43:50 2001
+++ ../modified-files/libgnomeprintui-configure.in	Fri Dec 14 22:03:32
2001
@@ -1,11 +1,10 @@
-AC_INIT(libgnomeprintui)
+AC_INIT(libgnomeprintui/gnome-font-dialog.c)
 
 AM_CONFIG_HEADER(config.h)
 AM_INIT_AUTOMAKE(libgnomeprintui,1.108.0)
 
 AM_MAINTAINER_MODE
 
-GNOME_COMMON_INIT
 GNOME_PLATFORM_GNOME_2(yes,force)
 
 AC_ISC_POSIX
@@ -18,7 +17,12 @@
 GNOME_COMPILE_WARNINGS(maximum)
 
 ALL_LINGUAS="az ca sv ta wa zh_CN zh_TW"
-AM_GNOME2_GETTEXT
+
+GETTEXT_PACKAGE=libgnomeprintui
+AC_SUBST(GETTEXT_PACKAGE)
+AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE")
+
+AM_GLIB_GNU_GETTEXT
 
 AC_SUBST(CFLAGS)
 AC_SUBST(CPPFLAGS)
@@ -34,7 +38,6 @@
 AC_OUTPUT([
 Makefile
 po/Makefile.in
-intl/Makefile
 libgnomeprintui/Makefile
 libgnomeprintui/gpaui/Makefile
 libgnomeprintui/libgnomeprintui-2.0.pc

--- acconfig.h	Sat Dec 15 18:43:50 2001
+++ ../modified-files/libgnomeprintui-acconfig.in	Fri Dec 14 22:03:52
2001
@@ -1,5 +1,6 @@
 #undef ENABLE_NLS
 #undef HAVE_CATGETS
+#undef GETTEXT_PACKAGE
 #undef HAVE_GETTEXT
 #undef HAVE_LC_MESSAGES
 #undef HAVE_STPCPY

+++ ../modified-files/libgnomeprintui-Makefile.am	Sat Dec 15 09:15:22
2001
@@ -1,3 +1,3 @@
-SUBDIRS = libgnomeprintui tests po intl
+SUBDIRS = libgnomeprintui tests po
 
 EXTRA_DIST = message-of-doom




[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]