Committing patch to solve the POTFILE.in problem (bug #610935).

5 files changed, 34 insertions, 24 deletions

diff --git a/INSTALL b/INSTALL
index 8b82ade..2550dab 100644
--- a/INSTALL
+++ b/INSTALL
@@ -2,7 +2,7 @@ Installation Instructions
 *************************
 
 Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
-2006, 2007, 2008 Free Software Foundation, Inc.
+2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 
    This file is free documentation; the Free Software Foundation gives
 unlimited permission to copy, distribute and modify it.
@@ -159,7 +159,7 @@ Particular systems
 CC is not installed, it is recommended to use the following options in
 order to use an ANSI C compiler:
 
-     ./configure CC="cc -Ae"
+     ./configure CC="cc -Ae -D_XOPEN_SOURCE=500"
 
 and if that doesn't work, install pre-built binaries of GCC for HP-UX.
 
@@ -174,6 +174,16 @@ and if that doesn't work, try
 
      ./configure CC="cc -nodtk"
 
+   On Solaris, don't put `/usr/ucb' early in your `PATH'.  This
+directory contains several dysfunctional programs; working variants of
+these programs are available in `/usr/bin'.  So, if you need `/usr/ucb'
+in your `PATH', put it _after_ `/usr/bin'.
+
+   On Haiku, software installed for all users goes in `/boot/common',
+not `/usr/local'.  It is recommended to use the following options:
+
+     ./configure --prefix=/boot/common
+
 Specifying the System Type
 ==========================
 
@@ -189,7 +199,8 @@ type, such as `sun4', or a canonical name which has the form:
 
 where SYSTEM can have one of these forms:
 
-     OS KERNEL-OS
+     OS
+     KERNEL-OS
 
    See the file `config.sub' for the possible values of each field.  If
 `config.sub' isn't included in this package, then this package doesn't
diff --git a/Makefile.am b/Makefile.am
index ea02899..1c4e5bb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,16 +10,16 @@ EXTRA_DIST=gnome-mag-1.0.pc.in \
 	intltool-merge.in \
 	intltool-update.in \
 	ChangeLog.pre-git \
-	tools \
-	po/POTFILES.in.in
+	tools
+	
+EXTRA_DIST+=$(CB_XD)
 
 doc_tarball_files = \
 	docs/reference/html
 
 DISTCLEANFILES = intltool-extract \
 	intltool-merge \
-	intltool-update \
-	po/POTFILES.in
+	intltool-update
 
 gnome-mag-1-0-docs.tar.gz:
 	tar cf - $(doc_tarball_files) | gzip -c --best >$@
diff --git a/configure.in b/configure.in
index d156dad..ead1f14 100644
--- a/configure.in
+++ b/configure.in
@@ -225,6 +225,8 @@ CB_DIR=colorblind
 AC_SUBST(CB_DIR)
 
 fi
+else
+	enable_colorblind_applet="no";
 fi
 
 dnl ***************************************************************************
@@ -299,7 +301,7 @@ if test -z "$DEFAULT_GMAG_INTROSPECTION_PATH"; then
           DEFAULT_GMAG_INTROSPECTION_PATH=gnome-mag/dbus
 fi
 
-if test "x$have_colorblind" = "xyes"; then
+if test "x$enable_colorblind_applet" = "xyes"; then
 	CB_OUT="colorblind/Makefile
 colorblind/defs.py
 colorblind/ui/Makefile
@@ -307,28 +309,17 @@ colorblind/osutils/Makefile
 colorblind/data/Makefile
 colorblind/data/art/Makefile
 colorblind/keybinder/Makefile"
-	CB_POT="colorblind/ColorblindApplet.py
-colorblind/GNOME_Magnifier_ColorblindApplet.server.in.in
-colorblind/Keybinder.py
-colorblind/data/colorblind-applet.schemas.in
-colorblind/data/Colorblind_Applet.xml
-[[type: gettext/glade]]colorblind/data/colorblind-prefs.ui
-colorblind/ui/WindowUI.py
-colorblind/ui/About.py
-colorblind/ui/ColorblindPreferencesUI.py"
 else
+	CB_XD="colorblind/ColorblindApplet.py colorblind/GNOME_Magnifier_ColorblindApplet.server.in.in colorblind/Keybinder.py colorblind/data/colorblind-applet.schemas.in colorblind/data/Colorblind_Applet.xml colorblind/data/colorblind-prefs.ui colorblind/ui/WindowUI.py colorblind/ui/About.py colorblind/ui/ColorblindPreferencesUI.py"
 	CB_OUT=""
-	CB_POT=""
 fi
 
-AC_SUBST(CB_POT)
-AM_SUBST_NOTMAKE(CB_POT)
+AC_SUBST(CB_XD)
 
 AC_OUTPUT([
 Makefile
 gnome-mag-1.0.pc
 gnome-mag-1.0-uninstalled.pc
-po/POTFILES.in
 po/Makefile.in
 idl/Makefile
 magnifier/Makefile
diff --git a/po/POTFILES.in b/po/POTFILES.in
new file mode 100644
index 0000000..f46a33a
--- /dev/null
+++ b/po/POTFILES.in
@@ -0,0 +1,11 @@
+colorblind/ColorblindApplet.py
+colorblind/GNOME_Magnifier_ColorblindApplet.server.in.in
+colorblind/Keybinder.py
+colorblind/data/colorblind-applet.schemas.in
+colorblind/data/Colorblind_Applet.xml
+[type: gettext/glade]colorblind/data/colorblind-prefs.ui
+colorblind/ui/WindowUI.py
+colorblind/ui/About.py
+colorblind/ui/ColorblindPreferencesUI.py
+magnifier/GNOME_Magnifier.server.in.in
+magnifier/magnifier-main.c
diff --git a/po/POTFILES.in.in b/po/POTFILES.in.in
deleted file mode 100644
index 29f5cc1..0000000
--- a/po/POTFILES.in.in
+++ /dev/null
@@ -1,3 +0,0 @@
-@CB_POT@
-magnifier/GNOME_Magnifier.server.in.in
-magnifier/magnifier-main.c