Author: benny
Date: 2007-01-15 17:47:49 +0000 (Mon, 15 Jan 2007)
New Revision: 24486
Modified:
xfce4-dev-tools/trunk/ChangeLog
xfce4-dev-tools/trunk/m4macros/xdt-i18n.m4
xfce4-dev-tools/trunk/scripts/xdt-autogen.in
Log:
2007-01-15 Benedikt Meurer <[EMAIL PROTECTED]>
* scripts/xdt-autogen.in: Apply patch from Olivier Fourdan
<[EMAIL PROTECTED]> to update xdt-autogen to use the latest
GNU autotools if available. Bug #2755.
* m4macros/xdt-i18n.m4(XDT_I18N): Make sure xgettext treats
source code as UTF-8.
Modified: xfce4-dev-tools/trunk/ChangeLog
===================================================================
--- xfce4-dev-tools/trunk/ChangeLog 2007-01-15 17:31:25 UTC (rev 24485)
+++ xfce4-dev-tools/trunk/ChangeLog 2007-01-15 17:47:49 UTC (rev 24486)
@@ -1,3 +1,11 @@
+2007-01-15 Benedikt Meurer <[EMAIL PROTECTED]>
+
+ * scripts/xdt-autogen.in: Apply patch from Olivier Fourdan
+ <[EMAIL PROTECTED]> to update xdt-autogen to use the latest
+ GNU autotools if available. Bug #2755.
+ * m4macros/xdt-i18n.m4(XDT_I18N): Make sure xgettext treats
+ source code as UTF-8.
+
2006-11-04 Benedikt Meurer <[EMAIL PROTECTED]>
* configure.in.in: Post-release version bump.
Modified: xfce4-dev-tools/trunk/m4macros/xdt-i18n.m4
===================================================================
--- xfce4-dev-tools/trunk/m4macros/xdt-i18n.m4 2007-01-15 17:31:25 UTC (rev
24485)
+++ xfce4-dev-tools/trunk/m4macros/xdt-i18n.m4 2007-01-15 17:47:49 UTC (rev
24486)
@@ -67,9 +67,9 @@
dnl Determine additional xgettext flags
AC_MSG_CHECKING([for additional xgettext flags])
if test x"$XGETTEXT_ARGS" = x""; then
- XGETTEXT_ARGS="--keyword=Q_";
+ XGETTEXT_ARGS="--keyword=Q_ --from-code=UTF-8";
else
- XGETTEXT_ARGS="$XGETTEXT_ARGS --keyword=Q_";
+ XGETTEXT_ARGS="$XGETTEXT_ARGS --keyword=Q_ --from-code=UTF-8";
fi
AC_SUBST([XGETTEXT_ARGS])
AC_MSG_RESULT([$XGETTEXT_ARGS])
Modified: xfce4-dev-tools/trunk/scripts/xdt-autogen.in
===================================================================
--- xfce4-dev-tools/trunk/scripts/xdt-autogen.in 2007-01-15 17:31:25 UTC
(rev 24485)
+++ xfce4-dev-tools/trunk/scripts/xdt-autogen.in 2007-01-15 17:47:49 UTC
(rev 24486)
@@ -141,7 +141,7 @@
## autoconf-2.57, then autoconf-2.53, and finally simply autoconf.
##
test -z "${XDT_PROG_AUTOCONF}" &&
-for i in autoconf-2.59 autoconf-2.58 autoconf-2.57 autoconf-2.53 autoconf; do
+for i in autoconf-2.61 autoconf-2.60 autoconf-2.59 autoconf-2.58 autoconf-2.57
autoconf-2.53 autoconf; do
(${i} --version) </dev/null >/dev/null 2>&1 &&
XDT_PROG_AUTOCONF=${i} && break
done
@@ -236,7 +236,7 @@
## simply aclocal.
##
test -z "${XDT_PROG_ACLOCAL}" &&
-for i in aclocal-1.9 aclocal-1.8 aclocal; do
+for i in aclocal-1.10 aclocal-1.9 aclocal-1.8 aclocal; do
(${i} --version) </dev/null >/dev/null 2>&1 &&
XDT_PROG_ACLOCAL=${i} && break
done
@@ -258,7 +258,7 @@
test -z "${XDT_PROG_AUTOHEADER}" &&
for configure_file in $CONFIGURE_FILES; do
if grep "^AM_CONFIG_HEADER" "${configure_file}" >/dev/null 2>&1; then
- for i in autoheader-2.59 autoheader-2.58 autoheader-2.57 autoheader-2.53
autoheader; do
+ for i in autoheader-2.61 autoheader-2.60 autoheader-2.59 autoheader-2.58
autoheader-2.57 autoheader-2.53 autoheader; do
(${i} --version) </dev/null >/dev/null 2>&1 &&
XDT_PROG_AUTOHEADER=${i} && break
done
@@ -280,7 +280,7 @@
## simply automake.
##
test -z "${XDT_PROG_AUTOMAKE}" &&
-for i in automake-1.9 automake-1.8 automake; do
+for i in automake-1.10 automake-1.9 automake-1.8 automake; do
(${i} --version) </dev/null >/dev/null 2>&1 &&
XDT_PROG_AUTOMAKE=${i} && break
done
@@ -395,9 +395,9 @@
${XDT_PROG_AUTOHEADER}) || exit 1
fi
- (echo "Running ${XDT_PROG_AUTOMAKE} --add-missing --copy --gnu..." &&
+ (echo "Running ${XDT_PROG_AUTOMAKE} --force-missing --add-missing --copy
--gnu..." &&
cd ${source_dir} &&
- ${XDT_PROG_AUTOMAKE} --add-missing --copy --gnu) || exit 1
+ ${XDT_PROG_AUTOMAKE} --force-missing --add-missing --copy --gnu) || exit 1
(echo "Running ${XDT_PROG_AUTOCONF}..." &&
cd ${source_dir} &&
_______________________________________________
Xfce4-commits mailing list
[email protected]
http://foo-projects.org/mailman/listinfo/xfce4-commits
