summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWouter Bolsterlee <wbolster@svn.gnome.org>2007-07-26 13:02:14 +0000
committerWouter Bolsterlee <wbolster@src.gnome.org>2007-07-26 13:02:14 +0000
commit1ea2951f94b1eec359500e101fc710bce84885a0 (patch)
tree89fd37902ca6fdd18075e41cbd2c8a9653348734
parentc05acb7b7dd71fabadb775e3f6bb16f5eb60e3b2 (diff)
downloadlibgnomekbd-1ea2951f94b1eec359500e101fc710bce84885a0.tar.gz
Improve string escaping
2007-07-26 Wouter Bolsterlee <wbolster@svn.gnome.org> * m4/intltool.m4: Improve string escaping svn path=/trunk/; revision=134
-rw-r--r--ChangeLog4
-rw-r--r--m4/intltool.m48
2 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 588abd5..613af15 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-07-26 Wouter Bolsterlee <wbolster@svn.gnome.org>
+
+ * m4/intltool.m4: Better string escaping
+
2007-07-11 svu
* libgnomekbd/gkbd-config-registry.c: not registering the object if
diff --git a/m4/intltool.m4 b/m4/intltool.m4
index 0269f8e..50fc9e7 100644
--- a/m4/intltool.m4
+++ b/m4/intltool.m4
@@ -36,7 +36,7 @@ case "$am__api_version" in
esac
if test -n "$1"; then
- AC_MSG_CHECKING(for intltool >= $1)
+ AC_MSG_CHECKING([for intltool >= $1])
INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
INTLTOOL_APPLIED_VERSION=`awk -F\" '/\\$VERSION / { print $ 2; }' ${ac_aux_dir}/intltool-update.in`
@@ -117,8 +117,10 @@ 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],
+ AC_LINK_IFELSE(
+ [AC_LANG_PROGRAM([[]],
+ [[extern int _nl_msg_cat_cntr;
+ return _nl_msg_cat_cntr]])],
[DATADIRNAME=share],
[case $host in
*-*-solaris*)