pidgin: 4603c075: Make --disable-nls work again. Fixes #1...
rekkanoryo at pidgin.im
rekkanoryo at pidgin.im
Sat Mar 20 17:15:46 EDT 2010
-----------------------------------------------------------------
Revision: 4603c075260a4cae6f0928c8a987805f99c1b689
Ancestor: c651e3b4b90d5aa93b3e45769bab26a0d9fa9039
Author: rekkanoryo at pidgin.im
Date: 2010-03-20T21:04:17
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/4603c075260a4cae6f0928c8a987805f99c1b689
Modified files:
Makefile.am configure.ac libpurple/gconf/Makefile.am
ChangeLog:
Make --disable-nls work again. Fixes #11548.
-------------- next part --------------
============================================================
--- Makefile.am 60f105e810dddea67785d1cdf286e427771ab53a
+++ Makefile.am fd21ebbbb681186cecb92104b871eff86d2e0cbf
@@ -71,22 +71,24 @@ packages:
gpg --verify pidgin-$(PACKAGE_VERSION).tar.gz.asc pidgin-$(PACKAGE_VERSION).tar.gz
gpg --verify pidgin-$(PACKAGE_VERSION).tar.bz2.asc pidgin-$(PACKAGE_VERSION).tar.bz2
+if INSTALL_I18N
+PO_DIR=po
+DESKTOP_FILE=pidgin.desktop
+
if ENABLE_GTK
appsdir = $(datadir)/applications
apps_in_files = pidgin.desktop.in
apps_DATA = $(apps_in_files:.desktop.in=.desktop)
@INTLTOOL_DESKTOP_RULE@
GTK_DIR=pidgin
-endif
+endif #ENABLE_GTK
+endif #INSTALL_I18N
+
if ENABLE_GNT
GNT_DIR=finch
endif
-if INSTALL_I18N
-PO_DIR=po
-endif
-
# This is phony, so that we always try to rebuild it. If it succeeds
# in calculating changes, it produces its target; otherwise, its
# target does not exist.
@@ -146,5 +148,5 @@ distuninstallcheck_listfiles = \
distuninstallcheck_listfiles = \
find . -type f -print | grep -v perl | grep -v Purple.3pm
-DISTCLEANFILES= pidgin.desktop libpurple/gconf/purple.schemas intltool-extract \
+DISTCLEANFILES= $(DESKTOP_FILE) libpurple/gconf/purple.schemas intltool-extract \
intltool-merge intltool-update
============================================================
--- configure.ac 102cbbd960555ce1cdf8a78f7427c3a181f9af4d
+++ configure.ac dec6d00a132f7ca44dd4f3b19d9dd9e4bc3aa66d
@@ -112,62 +112,9 @@ AC_PROG_INSTALL
AC_PROG_LIBTOOL
LIBTOOL="$LIBTOOL --silent"
AC_PROG_INSTALL
-AC_PROG_INTLTOOL
PKG_PROG_PKG_CONFIG
AC_FUNC_ALLOCA
-GETTEXT_PACKAGE=pidgin
-AC_SUBST(GETTEXT_PACKAGE)
-
-# before gettexting, in case iconv matters
-case "$host_os" in
-darwin*)
- AC_CHECK_LIB(resolv, res_query)
-
- AC_CHECK_HEADER(CoreFoundation/CoreFoundation.h, [
- AC_CHECK_HEADER(IOKit/IOKitLib.h, [
- AC_DEFINE(HAVE_IOKIT, 1, [Define if we have IOKit])
- LIBS="$LIBS -framework IOKit -framework CoreFoundation"
- ], [])
- ], [])
-
- AC_MSG_CHECKING([for fink])
- if test -d /sw; then
- AC_MSG_RESULT([found, adding /sw to search paths])
- CPPFLAGS="$CPPFLAGS -I/sw/include"
- LDFLAGS="$LDFLAGS -L/sw/lib"
- else
- AC_MSG_RESULT([not found])
- fi
- ;;
-*)
- ;;
-esac
-
-ALL_LINGUAS="af am ar az be at latin bg bn bs ca ca at valencia cs da de dz el en_AU en_CA en_GB eo es et eu fa fi fr ga gl gu he hi hu hy id it ja ka km kn ko ku lo lt mk mn mr ms_MY my_MM nb ne nl nn oc or pa pl pt_BR pt ps ro ru si sk sl sq sr sr at latin sv sw ta te th tr uk ur vi xh zh_CN zh_HK zh_TW"
-AM_GLIB_GNU_GETTEXT
-
-dnl If we don't have msgfmt, then po/ is going to fail -- ensure that
-dnl AM_GLIB_GNU_GETTEXT found it.
-
-if test x$MSGFMT = xno -o x$MSGFMT$GMSGFMT$INTLTOOL_MSGFMT = x
-then
- AC_MSG_ERROR([
-
-The msgfmt command is required to build libpurple. If it is installed
-on your system, ensure that it is in your path. If it is not, install
-GNU gettext to continue.
-
-If you have msgfmt installed, but for some reason this error message
-is still displayed, you have encountered what appears to be a bug in
-third-party configure macros. Try setting the MSGFMT environment
-variable to the absolute path to your msgfmt binary and trying
-configure again, like this:
-
-MSGFMT=/path/to/msgfmt ./configure ...
-])
-fi
-
dnl Checks for header files.
AC_HEADER_STDC
AC_HEADER_SYS_WAIT
@@ -306,6 +253,67 @@ dnl ####################################
])
dnl #######################################################################
+dnl # Disable creation and installation of translation files
+dnl #######################################################################
+AC_ARG_ENABLE(nls, AC_HELP_STRING([--disable-nls], [disable installation of translation files]), enable_i18n="$enableval", enable_i18n=yes)
+
+if test x$enable_i18n = xyes; then
+ AC_PROG_INTLTOOL
+ GETTEXT_PACKAGE=pidgin
+ AC_SUBST(GETTEXT_PACKAGE)
+
+
+ # before gettexting, in case iconv matters
+ case "$host_os" in
+ darwin*)
+ AC_CHECK_LIB(resolv, res_query)
+
+ AC_CHECK_HEADER(CoreFoundation/CoreFoundation.h, [
+ AC_CHECK_HEADER(IOKit/IOKitLib.h, [
+ AC_DEFINE(HAVE_IOKIT, 1, [Define if we have IOKit])
+ LIBS="$LIBS -framework IOKit -framework CoreFoundation"
+ ], [])
+ ], [])
+
+ AC_MSG_CHECKING([for fink])
+ if test -d /sw; then
+ AC_MSG_RESULT([found, adding /sw to search paths])
+ CPPFLAGS="$CPPFLAGS -I/sw/include"
+ LDFLAGS="$LDFLAGS -L/sw/lib"
+ else
+ AC_MSG_RESULT([not found])
+ fi
+ ;;
+ *)
+ ;;
+ esac
+
+ ALL_LINGUAS="af am ar az be at latin bg bn bs ca ca at valencia cs da de dz el en_AU en_CA en_GB eo es et eu fa fi fr ga gl gu he hi hu hy id it ja ka km kn ko ku lo lt mk mn mr ms_MY my_MM nb ne nl nn oc or pa pl pt_BR pt ps ro ru si sk sl sq sr sr at latin sv sw ta te th tr uk ur vi xh zh_CN zh_HK zh_TW"
+ AM_GLIB_GNU_GETTEXT
+
+ dnl If we don't have msgfmt, then po/ is going to fail -- ensure that
+ dnl AM_GLIB_GNU_GETTEXT found it.
+
+ if test x$MSGFMT = xno -o x$MSGFMT$GMSGFMT$INTLTOOL_MSGFMT = x
+ then
+ AC_MSG_ERROR([
+
+The msgfmt command is required to build libpurple. If it is installed
+on your system, ensure that it is in your path. If it is not, install
+GNU gettext to continue.
+
+If you have msgfmt installed, but for some reason this error message
+is still displayed, you have encountered what appears to be a bug in
+third-party configure macros. Try setting the MSGFMT environment
+variable to the absolute path to your msgfmt binary and trying
+configure again, like this:
+
+MSGFMT=/path/to/msgfmt ./configure ...
+ ])
+ fi
+fi #enable_i18n
+
+dnl #######################################################################
dnl # Check for GLib 2.12 (required)
dnl #######################################################################
PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.12.0 gobject-2.0 gmodule-2.0 gthread-2.0], , [
@@ -2443,11 +2451,6 @@ AM_CONDITIONAL(INSTALL_PIXMAPS, test "x$
AM_CONDITIONAL(INSTALL_PIXMAPS, test "x$enable_pixmaps" = "xyes")
-dnl #######################################################################
-dnl # Disable installation of translation files
-dnl #######################################################################
-AC_ARG_ENABLE(nls, AC_HELP_STRING([--disable-nls], [disable installation of translation files]), enable_i18n="$enableval", enable_i18n=yes)
-
AM_CONDITIONAL(INSTALL_I18N, test "x$enable_i18n" = "xyes")
dnl #######################################################################
============================================================
--- libpurple/gconf/Makefile.am 0f34fba759a9364b4cb7a7a7a355119cd1af21a4
+++ libpurple/gconf/Makefile.am 24b7e421e1efedbfec9b290367e2449fc25e0a10
@@ -2,14 +2,17 @@ EXTRA_DIST = purple.schemas.in
EXTRA_DIST = purple.schemas.in
+if GCONF_SCHEMAS_INSTALL
+
+if INSTALL_I18N
schema_in_files = purple.schemas.in
schema_DATA = $(schema_in_files:.schemas.in=.schemas)
@INTLTOOL_SCHEMAS_RULE@
+endif #INSTALL_I18N
-if GCONF_SCHEMAS_INSTALL
install-data-local:
GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(schema_DATA) 2>&1 | \
grep -v "^WARNING: failed to install schema" | grep -v "^Attached schema" 1>&2
else
install-data-local:
-endif
+endif #GCONF_SCHEMAS_INSTALL
More information about the Commits
mailing list