[glom] Do not check for or link to libgettextpo on Maemo

[David King <davidk src gnome org>]

commit c7167ace0de2cf873835047f1ea4ace56ee8e7f9
Author: David King <davidk openismus com>
Date:   Fri Nov 6 14:06:21 2009 +0100

    Do not check for or link to libgettextpo on Maemo
    
    * configure.ac:
    * Makefile_glom.am: Do not link to libgettextpo on Maemo, and
    additionally do not check for it either.

 ChangeLog        |    6 ++++++
 Makefile_glom.am |    4 +---
 configure.ac     |   16 ++++++++++------
 3 files changed, 17 insertions(+), 9 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 67abe6f..8a3caca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-11-06  David King  <davidk openismus com>
+
+	* configure.ac:
+	* Makefile_glom.am: Do not link to libgettextpo on Maemo, and
+	additionally do not check for it either.
+
 2009-11-04  David King  <davidk openismus com>
 
 	* glom.xml: Add Maemo-specific category for classification of .glom
diff --git a/Makefile_glom.am b/Makefile_glom.am
index 4eefaa0..2ca7136 100644
--- a/Makefile_glom.am
+++ b/Makefile_glom.am
@@ -352,9 +352,7 @@ glom_glom_LDADD = $(win_resfile) \
 	glom/utility_widgets/egg/util/libeggutil.a \
 	glom/libglom/libglom-$(GLOM_ABI_VERSION).la \
 	$(GLOM_LIBS) $(PYTHON_LIBS) $(INTLLIBS)
-if GLOM_ENABLE_MAEMO
-glom_glom_LDADD += /usr/lib/libgettextpo.a
-else
+if !GLOM_ENABLE_MAEMO
 glom_glom_LDADD += -lgettextpo
 endif
 
diff --git a/configure.ac b/configure.ac
index 029a761..fb6bb2e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -47,17 +47,21 @@ AC_DEFINE_UNQUOTED([GLOM_ABI_VERSION], ["$GLOM_ABI_VERSION"],
 AC_DEFINE_UNQUOTED([GLOM_ABI_VERSION_UNDERLINED], ["AS_TR_SH([$GLOM_ABI_VERSION])"],
                    [Define to the Glom ABI version with '.' replaced by '_'.])
 
-# libgettext-po changed its API, changing the error handler struct
-# from po_error_handler to po_xerror_handler:
-AC_CACHE_CHECK([for po_xerror_handler], [glom_cv_has_po_xerror_handler],
+# Only check for libgettextpo on non-Maemo platforms.
+AS_IF([test "x$glom_enable_maemo" = xyes],
+      [
+        # libgettext-po changed its API, changing the error handler struct
+        # from po_error_handler to po_xerror_handler:
+        AC_CACHE_CHECK([for po_xerror_handler], [glom_cv_has_po_xerror_handler],
                [AC_CHECK_MEMBER([struct po_xerror_handler.xerror],
                                 [glom_cv_has_po_xerror_handler=yes],
                                 [glom_cv_has_po_xerror_handler=no],
                                 [#include <gettext-po.h>])])
 
-AS_IF([test "x$glom_cv_has_po_xerror_handler" = xyes],
-      [AC_DEFINE([HAVE_GETTEXTPO_XERROR], [1],
-                 [Define if libgettextpo provides the new po_xerror_handler struct.])])
+        AS_IF([test "x$glom_cv_has_po_xerror_handler" = xyes],
+          [AC_DEFINE([HAVE_GETTEXTPO_XERROR], [1],
+          [Define if libgettextpo provides the new po_xerror_handler struct.])])
+])
 
 IT_PROG_INTLTOOL([0.35])
 AC_SUBST([GETTEXT_PACKAGE], [glom])