kov changed libgksu/trunk/aclocal.m4
Gustavo Noronha
kov at alioth.debian.org
Sun Feb 4 17:11:14 CET 2007
Mensagem de log:
update the build system
-----
Modified: libgksu/trunk/aclocal.m4
===================================================================
--- libgksu/trunk/aclocal.m4 2007-02-04 16:02:23 UTC (rev 775)
+++ libgksu/trunk/aclocal.m4 2007-02-04 16:11:14 UTC (rev 776)
@@ -154,7 +154,8 @@
#-----------------
glib_DEFUN([GLIB_WITH_NLS],
dnl NLS is obligatory
- [USE_NLS=yes
+ [AC_REQUIRE([AC_CANONICAL_HOST])dnl
+ USE_NLS=yes
AC_SUBST(USE_NLS)
gt_cv_have_gettext=no
@@ -429,8 +430,10 @@
[glib_REQUIRE([GLIB_GNU_GETTEXT])dnl
glib_save_prefix="$prefix"
glib_save_exec_prefix="$exec_prefix"
+glib_save_datarootdir="$datarootdir"
test "x$prefix" = xNONE && prefix=$ac_default_prefix
test "x$exec_prefix" = xNONE && exec_prefix=$prefix
+datarootdir=`eval echo "${datarootdir}"`
if test "x$CATOBJEXT" = "x.mo" ; then
localedir=`eval echo "${libdir}/locale"`
else
@@ -438,6 +441,7 @@
fi
prefix="$glib_save_prefix"
exec_prefix="$glib_save_exec_prefix"
+datarootdir="$glib_save_datarootdir"
AC_DEFINE_UNQUOTED($1, "$localedir",
[Define the location where the catalogs will be installed])
])
@@ -542,7 +546,30 @@
# Substitute ALL_LINGUAS so we can use it in po/Makefile
AC_SUBST(ALL_LINGUAS)
-
+
+# Set DATADIRNAME correctly if it is not set yet
+# (copied from glib-gettext.m4)
+if test -z "$DATADIRNAME"; then
+ AC_TRY_LINK(, [extern int _nl_msg_cat_cntr;
+ return _nl_msg_cat_cntr],
+ [DATADIRNAME=share],
+ [case $host in
+ *-*-solaris*)
+ dnl On Solaris, if bind_textdomain_codeset is in libc,
+ dnl GNU format message catalog is always supported,
+ dnl since both are added to the libc all together.
+ dnl Hence, we'd like to go with DATADIRNAME=share
+ dnl in this case.
+ AC_CHECK_FUNC(bind_textdomain_codeset,
+ [DATADIRNAME=share], [DATADIRNAME=lib])
+ ;;
+ *)
+ [DATADIRNAME=lib]
+ ;;
+ esac])
+fi
+AC_SUBST(DATADIRNAME)
+
IT_PO_SUBDIR([po])
dnl The following is very similar to
More information about the gksu-commits
mailing list