| 2007-08-23 19:03:56 |
Adilson Oliveira |
description |
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
affects ubuntu/tasks
subscribe ubuntu-universe-sponsors
diff -Nru /tmp/h5jzVb9LbI/tasks-0.11/aclocal.m4 /tmp/fbjxcJaeaG/tasks-0.11/aclocal.m4
- --- /tmp/h5jzVb9LbI/tasks-0.11/aclocal.m4 2007-08-13 17:20:17.000000000 -0300
+++ /tmp/fbjxcJaeaG/tasks-0.11/aclocal.m4 2007-08-21 10:37:12.000000000 -0300
@@ -226,7 +226,7 @@
AC_CHECK_FUNCS(dcgettext)
MSGFMT_OPTS=
AC_MSG_CHECKING([if msgfmt accepts -c])
- - GLIB_RUN_PROG([msgfmt -c -o /dev/null],[
+ GLIB_RUN_PROG([$MSGFMT -c -o /dev/null],[
msgid ""
msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
@@ -450,151 +450,9 @@
fi])
- -dnl GNOME_COMPILE_WARNINGS
- -dnl Turn on many useful compiler warnings
- -dnl For now, only works on GCC
- -AC_DEFUN([GNOME_COMPILE_WARNINGS],[
- - dnl ******************************
- - dnl More compiler warnings
- - dnl ******************************
- -
- - AC_ARG_ENABLE(compile-warnings,
- - AC_HELP_STRING([--enable-compile-warnings=@<:@no/minimum/yes/maximum/error@:>@],
- - [Turn on compiler warnings]),,
- - [enable_compile_warnings="m4_default([$1],[yes])"])
- -
- - warnCFLAGS=
- - if test "x$GCC" != xyes; then
- - enable_compile_warnings=no
- - fi
- -
- - warning_flags=
- - realsave_CFLAGS="$CFLAGS"
- -
- - case "$enable_compile_warnings" in
- - no)
- - warning_flags=
- - ;;
- - minimum)
- - warning_flags="-Wall"
- - ;;
- - yes)
- - warning_flags="-Wall -Wmissing-prototypes"
- - ;;
- - maximum|error)
- - warning_flags="-Wall -Wmissing-prototypes -Wnested-externs -Wpointer-arith"
- - CFLAGS="$warning_flags $CFLAGS"
- - for option in -Wno-sign-compare; do
- - SAVE_CFLAGS="$CFLAGS"
- - CFLAGS="$CFLAGS $option"
- - AC_MSG_CHECKING([whether gcc understands $option])
- - AC_TRY_COMPILE([], [],
- - has_option=yes,
- - has_option=no,)
- - CFLAGS="$SAVE_CFLAGS"
- - AC_MSG_RESULT($has_option)
- - if test $has_option = yes; then
- - warning_flags="$warning_flags $option"
- - fi
- - unset has_option
- - unset SAVE_CFLAGS
- - done
- - unset option
- - if test "$enable_compile_warnings" = "error" ; then
- - warning_flags="$warning_flags -Werror"
- - fi
- - ;;
- - *)
- - AC_MSG_ERROR(Unknown argument '$enable_compile_warnings' to --enable-compile-warnings)
- - ;;
- - esac
- - CFLAGS="$realsave_CFLAGS"
- - AC_MSG_CHECKING(what warning flags to pass to the C compiler)
- - AC_MSG_RESULT($warning_flags)
- -
- - AC_ARG_ENABLE(iso-c,
- - AC_HELP_STRING([--enable-iso-c],
- - [Try to warn if code is not ISO C ]),,
- - [enable_iso_c=no])
- -
- - AC_MSG_CHECKING(what language compliance flags to pass to the C compiler)
- - complCFLAGS=
- - if test "x$enable_iso_c" != "xno"; then
- - if test "x$GCC" = "xyes"; then
- - case " $CFLAGS " in
- - *[\ \ ]-ansi[\ \ ]*) ;;
- - *) complCFLAGS="$complCFLAGS -ansi" ;;
- - esac
- - case " $CFLAGS " in
- - *[\ \ ]-pedantic[\ \ ]*) ;;
- - *) complCFLAGS="$complCFLAGS -pedantic" ;;
- - esac
- - fi
- - fi
- - AC_MSG_RESULT($complCFLAGS)
- -
- - WARN_CFLAGS="$warning_flags $complCFLAGS"
- - AC_SUBST(WARN_CFLAGS)
- -])
- -
- -dnl For C++, do basically the same thing.
- -
- -AC_DEFUN([GNOME_CXX_WARNINGS],[
- - AC_ARG_ENABLE(cxx-warnings,
- - AC_HELP_STRING([--enable-cxx-warnings=@<:@no/minimum/yes@:>@]
- - [Turn on compiler warnings.]),,
- - [enable_cxx_warnings="m4_default([$1],[minimum])"])
- -
- - AC_MSG_CHECKING(what warning flags to pass to the C++ compiler)
- - warnCXXFLAGS=
- - if test "x$GXX" != xyes; then
- - enable_cxx_warnings=no
- - fi
- - if test "x$enable_cxx_warnings" != "xno"; then
- - if test "x$GXX" = "xyes"; then
- - case " $CXXFLAGS " in
- - *[\ \ ]-Wall[\ \ ]*) ;;
- - *) warnCXXFLAGS="-Wall -Wno-unused" ;;
- - esac
- -
- - ## -W is not all that useful. And it cannot be controlled
- - ## with individual -Wno-xxx flags, unlike -Wall
- - if test "x$enable_cxx_warnings" = "xyes"; then
- - warnCXXFLAGS="$warnCXXFLAGS -Wshadow -Woverloaded-virtual"
- - fi
- - fi
- - fi
- - AC_MSG_RESULT($warnCXXFLAGS)
- -
- - AC_ARG_ENABLE(iso-cxx,
- - AC_HELP_STRING([--enable-iso-cxx],
- - [Try to warn if code is not ISO C++ ]),,
- - [enable_iso_cxx=no])
- -
- - AC_MSG_CHECKING(what language compliance flags to pass to the C++ compiler)
- - complCXXFLAGS=
- - if test "x$enable_iso_cxx" != "xno"; then
- - if test "x$GXX" = "xyes"; then
- - case " $CXXFLAGS " in
- - *[\ \ ]-ansi[\ \ ]*) ;;
- - *) complCXXFLAGS="$complCXXFLAGS -ansi" ;;
- - esac
- -
- - case " $CXXFLAGS " in
- - *[\ \ ]-pedantic[\ \ ]*) ;;
- - *) complCXXFLAGS="$complCXXFLAGS -pedantic" ;;
- - esac
- - fi
- - fi
- - AC_MSG_RESULT($complCXXFLAGS)
- -
- - WARN_CXXFLAGS="$CXXFLAGS $warnCXXFLAGS $complCXXFLAGS"
- - AC_SUBST(WARN_CXXFLAGS)
- -])
- -
dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml])
- -# serial 35 IT_PROG_INTLTOOL
+# serial 36 IT_PROG_INTLTOOL
AC_DEFUN([IT_PROG_INTLTOOL],
[AC_PREREQ([2.50])dnl
@@ -607,7 +465,7 @@
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`
@@ -636,6 +494,7 @@
INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+ INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
AC_SUBST(INTLTOOL_DESKTOP_RULE)
AC_SUBST(INTLTOOL_DIRECTORY_RULE)
@@ -655,6 +514,7 @@
AC_SUBST(INTLTOOL_SCHEMAS_RULE)
AC_SUBST(INTLTOOL_THEME_RULE)
AC_SUBST(INTLTOOL_SERVICE_RULE)
+AC_SUBST(INTLTOOL_POLICY_RULE)
# Use the tools built into the package, not the ones that are installed.
AC_SUBST(INTLTOOL_EXTRACT, '$(top_builddir)/intltool-extract')
@@ -677,19 +537,16 @@
fi
fi
- -AC_PATH_PROG(INTLTOOL_ICONV, iconv, iconv)
- -AC_PATH_PROG(INTLTOOL_MSGFMT, msgfmt, msgfmt)
- -AC_PATH_PROG(INTLTOOL_MSGMERGE, msgmerge, msgmerge)
- -AC_PATH_PROG(INTLTOOL_XGETTEXT, xgettext, xgettext)
- -
# 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],
+ AC_LINK_IFELSE(
+ [AC_LANG_PROGRAM([[]],
+ [[extern int _nl_msg_cat_cntr;
+ return _nl_msg_cat_cntr]])],
[DATADIRNAME=share],
[case $host in
*-*-solaris*)
@@ -730,10 +587,6 @@
for file in intltool-extract intltool-merge intltool-update; do
sed -e "s|@INTLTOOL_EXTRACT@|`pwd`/intltool-extract|g" \
-e "s|@INTLTOOL_LIBDIR@|${INTLTOOL_LIBDIR}|g" \
- - -e "s|@INTLTOOL_ICONV@|${INTLTOOL_ICONV}|g" \
- - -e "s|@INTLTOOL_MSGFMT@|${INTLTOOL_MSGFMT}|g" \
- - -e "s|@INTLTOOL_MSGMERGE@|${INTLTOOL_MSGMERGE}|g" \
- - -e "s|@INTLTOOL_XGETTEXT@|${INTLTOOL_XGETTEXT}|g" \
-e "s|@INTLTOOL_PERL@|${INTLTOOL_PERL}|g" \
< ${ac_aux_dir}/${file}.in > ${file}.out
if cmp -s ${file} ${file}.out 2>/dev/null; then
@@ -748,9 +601,7 @@
],
[INTLTOOL_PERL='${INTLTOOL_PERL}' ac_aux_dir='${ac_aux_dir}'
prefix="$prefix" exec_prefix="$exec_prefix" INTLTOOL_LIBDIR="$libdir"
- -INTLTOOL_EXTRACT='${INTLTOOL_EXTRACT}' INTLTOOL_ICONV='${INTLTOOL_ICONV}'
- -INTLTOOL_MSGFMT='${INTLTOOL_MSGFMT}' INTLTOOL_MSGMERGE='${INTLTOOL_MSGMERGE}'
- -INTLTOOL_XGETTEXT='${INTLTOOL_XGETTEXT}'])
+INTLTOOL_EXTRACT='${INTLTOOL_EXTRACT}'])
])
@@ -799,7 +650,7 @@
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
- -# serial 48 Debian 1.5.22-4 AC_PROG_LIBTOOL
+# serial 51 Debian 1.5.24-1ubuntu1 AC_PROG_LIBTOOL
# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
@@ -962,7 +813,7 @@
test -z "$ac_objext" && ac_objext=o
# Determine commands to create old-style static archives.
- -old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
old_postinstall_cmds='chmod 644 $oldlib'
old_postuninstall_cmds=
@@ -1049,8 +900,9 @@
# Check for compiler boilerplate output or warnings with
# the simple compiler test code.
AC_DEFUN([_LT_COMPILER_BOILERPLATE],
- -[ac_outfile=conftest.$ac_objext
- -printf "$lt_simple_compile_test_code" >conftest.$ac_ext
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
_lt_compiler_boilerplate=`cat conftest.err`
$rm conftest*
@@ -1062,8 +914,9 @@
# Check for linker boilerplate output or warnings with
# the simple link test code.
AC_DEFUN([_LT_LINKER_BOILERPLATE],
- -[ac_outfile=conftest.$ac_objext
- -printf "$lt_simple_link_test_code" >conftest.$ac_ext
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_link_test_code" >conftest.$ac_ext
eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
_lt_linker_boilerplate=`cat conftest.err`
$rm conftest*
@@ -1079,12 +932,20 @@
# If we don't find anything, use the default library path according
# to the aix ld manual.
AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX],
- -[AC_LINK_IFELSE(AC_LANG_PROGRAM,[
- -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
- -}'`
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+AC_LINK_IFELSE(AC_LANG_PROGRAM,[
+lt_aix_libpath_sed='
+ /Import File Strings/,/^$/ {
+ /^0/ {
+ s/^0 *\(.*\)$/\1/
+ p
+ }
+ }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
# Check for a 64-bit object if we didn't find anything.
- -if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
- -}'`; fi],[])
+if test -z "$aix_libpath"; then
+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi],[])
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
])# _LT_AC_SYS_LIBPATH_AIX
@@ -1315,13 +1176,17 @@
rm -rf conftest*
;;
- -x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
+s390*-*linux*|sparc*-*linux*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
if AC_TRY_EVAL(ac_compile); then
case `/usr/bin/file conftest.o` in
*32-bit*)
case $host in
+ x86_64-*kfreebsd*-gnu)
+ LD="${LD-ld} -m elf_i386_fbsd"
+ ;;
x86_64-*linux*)
LD="${LD-ld} -m elf_i386"
;;
@@ -1338,6 +1203,9 @@
;;
*64-bit*)
case $host in
+ x86_64-*kfreebsd*-gnu)
+ LD="${LD-ld} -m elf_x86_64_fbsd"
+ ;;
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
;;
@@ -1409,7 +1277,7 @@
AC_CACHE_CHECK([$1], [$2],
[$2=no
ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
- - printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
lt_compiler_flag="$3"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
@@ -1450,11 +1318,12 @@
# ------------------------------------------------------------
# Check whether the given compiler option works
AC_DEFUN([AC_LIBTOOL_LINKER_OPTION],
- -[AC_CACHE_CHECK([$1], [$2],
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+AC_CACHE_CHECK([$1], [$2],
[$2=no
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS $3"
- - printf "$lt_simple_link_test_code" > conftest.$ac_ext
+ echo "$lt_simple_link_test_code" > conftest.$ac_ext
if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
# The linker can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -1568,24 +1437,27 @@
fi
;;
*)
- - # If test is not a shell built-in, we'll probably end up computing a
- - # maximum length that is only half of the actual maximum length, but
- - # we can't tell.
- - SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
- - while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
+ lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
+ if test -n "$lt_cv_sys_max_cmd_len"; then
+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+ else
+ SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
+ while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
= "XX$teststring") >/dev/null 2>&1 &&
- - new_result=`expr "X$teststring" : ".*" 2>&1` &&
- - lt_cv_sys_max_cmd_len=$new_result &&
- - test $i != 17 # 1/2 MB should be enough
- - do
- - i=`expr $i + 1`
- - teststring=$teststring$teststring
- - done
- - teststring=
- - # Add a significant safety factor because C++ compilers can tack on massive
- - # amounts of additional arguments before passing them to the linker.
- - # It appears as though 1/2 is a usable value.
- - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
+ new_result=`expr "X$teststring" : ".*" 2>&1` &&
+ lt_cv_sys_max_cmd_len=$new_result &&
+ test $i != 17 # 1/2 MB should be enough
+ do
+ i=`expr $i + 1`
+ teststring=$teststring$teststring
+ done
+ teststring=
+ # Add a significant safety factor because C++ compilers can tack on massive
+ # amounts of additional arguments before passing them to the linker.
+ # It appears as though 1/2 is a usable value.
+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
+ fi
;;
esac
])
@@ -1812,7 +1684,8 @@
# ---------------------------------
# Check to see if options -c and -o are simultaneously supported by compiler
AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O],
- -[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
[_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
[_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
@@ -1820,7 +1693,7 @@
mkdir conftest
cd conftest
mkdir out
- - printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
lt_compiler_flag="-o out/conftest2.$ac_objext"
# Insert the option either (1) after the last *FLAGS variable, or
@@ -1960,6 +1833,7 @@
darwin*)
if test -n "$STRIP" ; then
striplib="$STRIP -x"
+ old_striplib="$STRIP -S"
AC_MSG_RESULT([yes])
else
AC_MSG_RESULT([no])
@@ -1977,7 +1851,8 @@
# -----------------------------
# PORTME Fill in your ld.so characteristics
AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER],
- -[AC_MSG_CHECKING([dynamic linker characteristics])
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+AC_MSG_CHECKING([dynamic linker characteristics])
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -1991,20 +1866,58 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
+m4_if($1,[],[
if test "$GCC" = yes; then
- - sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
- - if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
+ case $host_os in
+ darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
+ *) lt_awk_arg="/^libraries:/" ;;
+ esac
+ lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+ if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then
# if the path contains ";" then we assume it to be the separator
# otherwise default to the standard path separator (i.e. ":") - it is
# assumed that no part of a normal pathname contains ";" but that should
# okay in the real world where ";" in dirpaths is itself problematic.
- - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+ lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'`
else
- - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+ lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
fi
+ # Ok, now we have the path, separated by spaces, we can step through it
+ # and add multilib dir if necessary.
+ lt_tmp_lt_search_path_spec=
+ lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
+ for lt_sys_path in $lt_search_path_spec; do
+ if test -d "$lt_sys_path/$lt_multi_os_dir"; then
+ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
+ else
+ test -d "$lt_sys_path" && \
+ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
+ fi
+ done
+ lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk '
+BEGIN {RS=" "; FS="/|\n";} {
+ lt_foo="";
+ lt_count=0;
+ for (lt_i = NF; lt_i > 0; lt_i--) {
+ if ($lt_i != "" && $lt_i != ".") {
+ if ($lt_i == "..") {
+ lt_count++;
+ } else {
+ if (lt_count == 0) {
+ lt_foo="/" $lt_i lt_foo;
+ } else {
+ lt_count--;
+ }
+ }
+ }
+ }
+ if (lt_foo != "") { lt_freq[[lt_foo]]++; }
+ if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
+}'`
+ sys_lib_search_path_spec=`echo $lt_search_path_spec`
else
sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
- -fi
+fi])
need_lib_prefix=unknown
hardcode_into_libs=no
@@ -2161,12 +2074,8 @@
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
- - # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
- - if test "$GCC" = yes; then
- - sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
- - else
- - sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
- - fi
+ m4_if([$1], [],[
+ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"])
sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
;;
@@ -2220,7 +2129,7 @@
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
;;
- - freebsd*) # from 4.6 on
+ *) # from 4.6 on, and DragonFly
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
@@ -2283,7 +2192,7 @@
postinstall_cmds='chmod 555 $lib'
;;
- -interix3*)
+interix[[3-9]]*)
version_type=linux
need_lib_prefix=no
need_version=no
@@ -2354,7 +2263,7 @@
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
- - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi
@@ -2460,6 +2369,10 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
+rdos*)
+ dynamic_linker=no
+ ;;
+
solaris*)
version_type=linux
need_lib_prefix=no
@@ -2565,7 +2478,8 @@
# _LT_AC_TAGCONFIG
# ----------------
AC_DEFUN([_LT_AC_TAGCONFIG],
- -[AC_ARG_WITH([tags],
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+AC_ARG_WITH([tags],
[AC_HELP_STRING([--with-tags@<:@=TAGS@:>@],
[include additional configurations @<:@automatic@:>@])],
[tagnames="$withval"])
@@ -2826,7 +2740,7 @@
# AC_PATH_TOOL_PREFIX
# -------------------
- -# find a file program which can recognise shared library
+# find a file program which can recognize shared library
AC_DEFUN([AC_PATH_TOOL_PREFIX],
[AC_REQUIRE([AC_PROG_EGREP])dnl
AC_MSG_CHECKING([for $1])
@@ -2889,7 +2803,7 @@
# AC_PATH_MAGIC
# -------------
- -# find a file program which can recognise a shared library
+# find a file program which can recognize a shared library
AC_DEFUN([AC_PATH_MAGIC],
[AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
if test -z "$lt_cv_path_MAGIC_CMD"; then
@@ -3036,7 +2950,7 @@
# how to check for library dependencies
# -- PORTME fill in with the dynamic library characteristics
AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
- -[AC_CACHE_CHECK([how to recognise dependent libraries],
+[AC_CACHE_CHECK([how to recognize dependent libraries],
lt_cv_deplibs_check_method,
[lt_cv_file_magic_cmd='$MAGIC_CMD'
lt_cv_file_magic_test_file=
@@ -3075,9 +2989,15 @@
mingw* | pw32*)
# Base MSYS/MinGW do not provide the 'file' command needed by
- - # func_win32_libid shell function, so use a weaker test based on 'objdump'.
- - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
- - lt_cv_file_magic_cmd='$OBJDUMP -f'
+ # func_win32_libid shell function, so use a weaker test based on 'objdump',
+ # unless we find 'file', for example because we are cross-compiling.
+ if ( file / ) >/dev/null 2>&1; then
+ lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+ lt_cv_file_magic_cmd='func_win32_libid'
+ else
+ lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
+ lt_cv_file_magic_cmd='$OBJDUMP -f'
+ fi
;;
darwin* | rhapsody*)
@@ -3122,7 +3042,7 @@
esac
;;
- -interix3*)
+interix[[3-9]]*)
# PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
;;
@@ -3172,6 +3092,10 @@
lt_cv_deplibs_check_method=pass_all
;;
+rdos*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
solaris*)
lt_cv_deplibs_check_method=pass_all
;;
@@ -3224,7 +3148,7 @@
lt_cv_path_NM="$NM"
else
lt_nm_to_check="${ac_tool_prefix}nm"
- - if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
+ if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
lt_nm_to_check="$lt_nm_to_check nm"
fi
for lt_tmp_nm in $lt_nm_to_check; do
@@ -3440,10 +3364,10 @@
_LT_AC_TAGVAR(objext, $1)=$objext
# Code to be used in simple compile tests
- -lt_simple_compile_test_code="int some_variable = 0;\n"
+lt_simple_compile_test_code="int some_variable = 0;"
# Code to be used in simple link tests
- -lt_simple_link_test_code='int main(){return(0);}\n'
+lt_simple_link_test_code='int main(){return(0);}'
_LT_AC_SYS_COMPILER
@@ -3545,10 +3469,10 @@
_LT_AC_TAGVAR(objext, $1)=$objext
# Code to be used in simple compile tests
- -lt_simple_compile_test_code="int some_variable = 0;\n"
+lt_simple_compile_test_code="int some_variable = 0;"
# Code to be used in simple link tests
- -lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }\n'
+lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }'
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
_LT_AC_SYS_COMPILER
@@ -3694,7 +3618,7 @@
strings "$collect2name" | grep resolve_lib_name >/dev/null
then
# We have reworked collect2
- - _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+ :
else
# We have old collect2
_LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
@@ -3853,10 +3777,10 @@
case $cc_basename in
xlc*)
output_verbose_link_cmd='echo'
- - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
_LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
# Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
- - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
_LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
;;
*)
@@ -3939,9 +3863,7 @@
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
case $host_cpu in
- - hppa*64*|ia64*)
- - _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
- - ;;
+ hppa*64*|ia64*) ;;
*)
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
;;
@@ -4009,7 +3931,7 @@
;;
esac
;;
- - interix3*)
+ interix[[3-9]]*)
_LT_AC_TAGVAR(hardcode_direct, $1)=no
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
@@ -4129,6 +4051,29 @@
# dependencies.
output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
;;
+ *)
+ case `$CC -V 2>&1 | sed 5q` in
+ *Sun\ C*)
+ # Sun C++ 5.9
+ _LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+
+ # Not sure whether something based on
+ # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
+ # would be better.
+ output_verbose_link_cmd='echo'
+
+ # Archives containing C++ object files must be created using
+ # "CC -xar", where "CC" is the Sun C++ compiler. This is
+ # necessary to make sure instantiated templates are included
+ # in the archive.
+ _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
+ ;;
+ esac
+ ;;
esac
;;
lynxos*)
@@ -4167,16 +4112,20 @@
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
openbsd*)
- - _LT_AC_TAGVAR(hardcode_direct, $1)=yes
- - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
- - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
- - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
- - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
- - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
- - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+ if test -f /usr/libexec/ld.so; then
+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+ fi
+ output_verbose_link_cmd='echo'
+ else
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
fi
- - output_verbose_link_cmd='echo'
;;
osf3*)
case $cc_basename in
@@ -4338,15 +4287,10 @@
case $host_os in
solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
*)
- - # The C++ compiler is used as linker so we must use $wl
- - # flag to pass the commands to the underlying system
- - # linker. We must also pass each convience library through
- - # to the system linker between allextract/defaultextract.
- - # The C++ compiler will combine linker options so we
- - # cannot just pass the convience library names through
- - # without $wl.
+ # The compiler driver will combine and reorder linker options,
+ # but understands `-z linker_flag'.
# Supported since Solaris 2.6 (maybe 2.5.1?)
- - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract'
+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
;;
esac
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
@@ -4393,6 +4337,12 @@
fi
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
+ case $host_os in
+ solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+ *)
+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+ ;;
+ esac
fi
;;
esac
@@ -4636,7 +4586,7 @@
# PORTME: override above test on systems where it is broken
ifelse([$1],[CXX],
[case $host_os in
- -interix3*)
+interix[[3-9]]*)
# Interix 3.5 installs completely hosed .la files for C++, so rather than
# hack all around it, let's just trust "g++" to DTRT.
_LT_AC_TAGVAR(predep_objects,$1)=
@@ -4644,13 +4594,46 @@
_LT_AC_TAGVAR(postdeps,$1)=
;;
+linux*)
+ case `$CC -V 2>&1 | sed 5q` in
+ *Sun\ C*)
+ # Sun C++ 5.9
+ #
+ # The more standards-conforming stlport4 library is
+ # incompatible with the Cstd library. Avoid specifying
+ # it if it's in CXXFLAGS. Ignore libCrun as
+ # -library=stlport4 depends on it.
+ case " $CXX $CXXFLAGS " in
+ *" -library=stlport4 "*)
+ solaris_use_stlport4=yes
+ ;;
+ esac
+ if test "$solaris_use_stlport4" != yes; then
+ _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
+ fi
+ ;;
+ esac
+ ;;
+
solaris*)
case $cc_basename in
CC*)
+ # The more standards-conforming stlport4 library is
+ # incompatible with the Cstd library. Avoid specifying
+ # it if it's in CXXFLAGS. Ignore libCrun as
+ # -library=stlport4 depends on it.
+ case " $CXX $CXXFLAGS " in
+ *" -library=stlport4 "*)
+ solaris_use_stlport4=yes
+ ;;
+ esac
+
# Adding this requires a known-good setup of shared libraries for
# Sun compiler versions before 5.6, else PIC objects from an old
# archive will be linked into the output, leading to subtle bugs.
- - _LT_AC_TAGVAR(postdeps,$1)='-lCstd -lCrun'
+ if test "$solaris_use_stlport4" != yes; then
+ _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
+ fi
;;
esac
;;
@@ -4699,10 +4682,17 @@
_LT_AC_TAGVAR(objext, $1)=$objext
# Code to be used in simple compile tests
- -lt_simple_compile_test_code=" subroutine t\n return\n end\n"
+lt_simple_compile_test_code="\
+ subroutine t
+ return
+ end
+"
# Code to be used in simple link tests
- -lt_simple_link_test_code=" program t\n end\n"
+lt_simple_link_test_code="\
+ program t
+ end
+"
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
_LT_AC_SYS_COMPILER
@@ -4781,10 +4771,10 @@
_LT_AC_TAGVAR(objext, $1)=$objext
# Code to be used in simple compile tests
- -lt_simple_compile_test_code="class foo {}\n"
+lt_simple_compile_test_code="class foo {}"
# Code to be used in simple link tests
- -lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }\n'
+lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }'
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
_LT_AC_SYS_COMPILER
@@ -4837,7 +4827,7 @@
_LT_AC_TAGVAR(objext, $1)=$objext
# Code to be used in simple compile tests
- -lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n'
+lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
# Code to be used in simple link tests
lt_simple_link_test_code="$lt_simple_compile_test_code"
@@ -4926,6 +4916,7 @@
_LT_AC_TAGVAR(module_cmds, $1) \
_LT_AC_TAGVAR(module_expsym_cmds, $1) \
_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) \
+ _LT_AC_TAGVAR(fix_srcfile_path, $1) \
_LT_AC_TAGVAR(exclude_expsyms, $1) \
_LT_AC_TAGVAR(include_expsyms, $1); do
@@ -4972,7 +4963,7 @@
# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
# NOTE: Changes made to this file will be lost: look at ltmain.sh.
#
- -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
# Free Software Foundation, Inc.
#
# This file is part of GNU Libtool:
@@ -5297,7 +5288,7 @@
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
# Fix the shell variable \$srcfile for the compiler.
- -fix_srcfile_path="$_LT_AC_TAGVAR(fix_srcfile_path, $1)"
+fix_srcfile_path=$lt_fix_srcfile_path
# Set to yes if exported symbols are required.
always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1)
@@ -5380,6 +5371,7 @@
# ---------------------------------
AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE],
[AC_REQUIRE([AC_CANONICAL_HOST])
+AC_REQUIRE([LT_AC_PROG_SED])
AC_REQUIRE([AC_PROG_NM])
AC_REQUIRE([AC_OBJEXT])
# Check for command to grab the raw symbol name followed by C symbol from nm.
@@ -5606,12 +5598,14 @@
# like `-m68040'.
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
;;
- - beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
# PIC is the default for these OSes.
;;
- - mingw* | os2* | pw32*)
+ mingw* | cygwin* | os2* | pw32*)
# This hack is so that the source file can tell whether it is being
# built for inclusion in a dll (and should export symbols for example).
+ # Although the cygwin gcc ignores -fPIC, still need this for old-style
+ # (--disable-auto-import) libraries
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
;;
darwin* | rhapsody*)
@@ -5623,7 +5617,7 @@
# DJGPP does not support shared libraries at all
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
;;
- - interix3*)
+ interix[[3-9]]*)
# Interix 3.x gcc -fpic/-fPIC options generate broken code.
# Instead, we relocate shared libraries at runtime.
;;
@@ -5759,6 +5753,14 @@
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
;;
*)
+ case `$CC -V 2>&1 | sed 5q` in
+ *Sun\ C*)
+ # Sun C++ 5.9
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+ ;;
+ esac
;;
esac
;;
@@ -5879,13 +5881,15 @@
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
;;
- - beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
# PIC is the default for these OSes.
;;
- - mingw* | pw32* | os2*)
+ mingw* | cygwin* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
# built for inclusion in a dll (and should export symbols for example).
+ # Although the cygwin gcc ignores -fPIC, still need this for old-style
+ # (--disable-auto-import) libraries
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
;;
@@ -5895,7 +5899,7 @@
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
;;
- - interix3*)
+ interix[[3-9]]*)
# Interix 3.x gcc -fpic/-fPIC options generate broken code.
# Instead, we relocate shared libraries at runtime.
;;
@@ -5953,7 +5957,7 @@
esac
;;
- - mingw* | pw32* | os2*)
+ mingw* | cygwin* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
# built for inclusion in a dll (and should export symbols for example).
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
@@ -6005,6 +6009,22 @@
# All Alpha code is PIC.
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
;;
+ *)
+ case `$CC -V 2>&1 | sed 5q` in
+ *Sun\ C*)
+ # Sun C 5.9
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ ;;
+ *Sun\ F*)
+ # Sun Fortran 8.3 passes all unrecognized flags to the linker
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)=''
+ ;;
+ esac
+ ;;
esac
;;
@@ -6014,6 +6034,10 @@
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
;;
+ rdos*)
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+ ;;
+
solaris*)
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
@@ -6108,7 +6132,8 @@
# ------------------------------------
# See if the linker supports building shared libraries.
AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS],
- -[AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
ifelse([$1],[CXX],[
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
case $host_os in
@@ -6125,7 +6150,7 @@
_LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
;;
cygwin* | mingw*)
- - _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([[^ ]]*\) [[^ ]]*/\1 DATA/;/^I /d;/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
+ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
;;
linux* | k*bsd*-gnu)
_LT_AC_TAGVAR(link_all_deplibs, $1)=no
@@ -6267,7 +6292,7 @@
_LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
_LT_AC_TAGVAR(always_export_symbols, $1)=no
_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
- - _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
+ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
@@ -6285,7 +6310,7 @@
fi
;;
- - interix3*)
+ interix[[3-9]]*)
_LT_AC_TAGVAR(hardcode_direct, $1)=no
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
@@ -6300,7 +6325,7 @@
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
;;
- - linux* | k*bsd*-gnu)
+ gnu* | linux* | k*bsd*-gnu)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
tmp_addflag=
case $cc_basename,$host_cpu in
@@ -6318,13 +6343,22 @@
ifc* | ifort*) # Intel Fortran compiler
tmp_addflag=' -nofor_main' ;;
esac
- - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ case `$CC -V 2>&1 | sed 5q` in
+ *Sun\ C*) # Sun C 5.9
+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+ tmp_sharedflag='-G' ;;
+ *Sun\ F*) # Sun Fortran 8.3
+ tmp_sharedflag='-G' ;;
+ *)
+ tmp_sharedflag='-shared' ;;
+ esac
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
if test $supports_anon_versioning = yes; then
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~
cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
$echo "local: *; };" >> $output_objdir/$libname.ver~
- - $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
fi
_LT_AC_TAGVAR(link_all_deplibs, $1)=no
else
@@ -6365,7 +6399,7 @@
sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
case `$LD -v 2>&1` in
- - *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*)
+ *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*)
_LT_AC_TAGVAR(ld_shlibs, $1)=no
cat <<_LT_EOF 1>&2
@@ -6484,7 +6518,7 @@
strings "$collect2name" | grep resolve_lib_name >/dev/null
then
# We have reworked collect2
- - _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+ :
else
# We have old collect2
_LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
@@ -6577,7 +6611,7 @@
# The linker will automatically build a .lib file if we build a DLL.
_LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true'
# FIXME: Should let the user specify the lib program.
- - _LT_AC_TAGVAR(old_archive_cmds, $1)='lib /OUT:$oldlib$oldobjs$old_deplibs'
+ _LT_AC_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
_LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
;;
@@ -6619,10 +6653,10 @@
case $cc_basename in
xlc*)
output_verbose_link_cmd='echo'
- - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
_LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
# Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
- - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
_LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
;;
*)
@@ -6784,24 +6818,28 @@
;;
openbsd*)
- - _LT_AC_TAGVAR(hardcode_direct, $1)=yes
- - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
- - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
- - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
- - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
- - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+ if test -f /usr/libexec/ld.so; then
+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+ else
+ case $host_os in
+ openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+ ;;
+ *)
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+ ;;
+ esac
+ fi
else
- - case $host_os in
- - openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
- - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
- - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
- - ;;
- - *)
- - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
- - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
- - ;;
- - esac
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
fi
;;
@@ -6860,17 +6898,16 @@
case $host_os in
solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
*)
- - # The compiler driver will combine linker options so we
- - # cannot just pass the convience library names through
- - # without $wl, iff we do not link with $LD.
- - # Luckily, gcc supports the same syntax we need for Sun Studio.
+ # The compiler driver will combine and reorder linker options,
+ # but understands `-z linker_flag'. GCC discards it without `$wl',
+ # but is careful enough not to reorder.
# Supported since Solaris 2.6 (maybe 2.5.1?)
- - case $wlarc in
- - '')
- - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;;
- - *)
- - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
- - esac ;;
+ if test "$GCC" = yes; then
+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+ else
+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
+ fi
+ ;;
esac
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
;;
@@ -6927,7 +6964,7 @@
fi
;;
- - sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7*)
+ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
_LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
@@ -7002,7 +7039,7 @@
# to ld, don't add -lc before -lgcc.
AC_MSG_CHECKING([whether -lc should be explicitly linked in])
$rm conftest*
- - printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
soname=conftest
@@ -7105,6 +7142,30 @@
[AC_CHECK_TOOL(RC, windres, no)
])
+
+# Cheap backport of AS_EXECUTABLE_P and required macros
+# from Autoconf 2.59; we should not use $as_executable_p directly.
+
+# _AS_TEST_PREPARE
+# ----------------
+m4_ifndef([_AS_TEST_PREPARE],
+[m4_defun([_AS_TEST_PREPARE],
+[if test -x / >/dev/null 2>&1; then
+ as_executable_p='test -x'
+else
+ as_executable_p='test -f'
+fi
+])])# _AS_TEST_PREPARE
+
+# AS_EXECUTABLE_P
+# ---------------
+# Check whether a file is executable.
+m4_ifndef([AS_EXECUTABLE_P],
+[m4_defun([AS_EXECUTABLE_P],
+[AS_REQUIRE([_AS_TEST_PREPARE])dnl
+$as_executable_p $1[]dnl
+])])# AS_EXECUTABLE_P
+
# NOTE: This macro has been submitted for inclusion into #
# GNU Autoconf as AC_PROG_SED. When it is available in #
# a released version of Autoconf we should remove this #
@@ -7125,12 +7186,13 @@
test -z "$as_dir" && as_dir=.
for lt_ac_prog in sed gsed; do
for ac_exec_ext in '' $ac_executable_extensions; do
- - if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
+ if AS_EXECUTABLE_P(["$as_dir/$lt_ac_prog$ac_exec_ext"]); then
lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
fi
done
done
done
+IFS=$as_save_IFS
lt_ac_max=0
lt_ac_count=0
# Add /usr/xpg4/bin/sed as it is typically found on Solaris
@@ -7163,6 +7225,7 @@
done
])
SED=$lt_cv_path_SED
+AC_SUBST([SED])
AC_MSG_RESULT([$SED])
])
@@ -7314,7 +7377,7 @@
_PKG_TEXT
- -To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.])],
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
[$4])
else
$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
diff -Nru /tmp/h5jzVb9LbI/tasks-0.11/configure /tmp/fbjxcJaeaG/tasks-0.11/configure
- --- /tmp/h5jzVb9LbI/tasks-0.11/configure 2007-08-13 17:20:19.000000000 -0300
+++ /tmp/fbjxcJaeaG/tasks-0.11/configure 2007-08-21 10:37:12.000000000 -0300
@@ -692,7 +692,6 @@
am__fastdepCC_FALSE
CPP
RANLIB
- -WARN_CFLAGS
INTLTOOL_DESKTOP_RULE
INTLTOOL_DIRECTORY_RULE
INTLTOOL_KEYS_RULE
@@ -711,14 +710,11 @@
INTLTOOL_SCHEMAS_RULE
INTLTOOL_THEME_RULE
INTLTOOL_SERVICE_RULE
+INTLTOOL_POLICY_RULE
INTLTOOL_EXTRACT
INTLTOOL_MERGE
INTLTOOL_UPDATE
INTLTOOL_PERL
- -INTLTOOL_ICONV
- -INTLTOOL_MSGFMT
- -INTLTOOL_MSGMERGE
- -INTLTOOL_XGETTEXT
ALL_LINGUAS
DATADIRNAME
GETTEXT_PACKAGE
@@ -1371,9 +1367,6 @@
--enable-static[=PKGS] build static libraries [default=no]
--disable-dependency-tracking speeds up one-time build
--enable-dependency-tracking do not reject slow dependency extractors
- - --enable-compile-warnings=[no/minimum/yes/maximum/error]
- - Turn on compiler warnings
- - --enable-iso-c Try to warn if code is not ISO C
--enable-gtk Build the GTK frontend
--enable-omoko Turn on OpenMoko frontend
--enable-hildon Turn on Hildon frontend
@@ -4670,138 +4663,7 @@
fi
- -
- -
- -
- - # Check whether --enable-compile-warnings was given.
- -if test "${enable_compile_warnings+set}" = set; then
- - enableval=$enable_compile_warnings;
- -else
- - enable_compile_warnings="yes"
- -fi
- -
- -
- - warnCFLAGS=
- - if test "x$GCC" != xyes; then
- - enable_compile_warnings=no
- - fi
- -
- - warning_flags=
- - realsave_CFLAGS="$CFLAGS"
- -
- - case "$enable_compile_warnings" in
- - no)
- - warning_flags=
- - ;;
- - minimum)
- - warning_flags="-Wall"
- - ;;
- - yes)
- - warning_flags="-Wall -Wmissing-prototypes"
- - ;;
- - maximum|error)
- - warning_flags="-Wall -Wmissing-prototypes -Wnested-externs -Wpointer-arith"
- - CFLAGS="$warning_flags $CFLAGS"
- - for option in -Wno-sign-compare; do
- - SAVE_CFLAGS="$CFLAGS"
- - CFLAGS="$CFLAGS $option"
- - { echo "$as_me:$LINENO: checking whether gcc understands $option" >&5
- -echo $ECHO_N "checking whether gcc understands $option... $ECHO_C" >&6; }
- - cat >conftest.$ac_ext <<_ACEOF
- -/* confdefs.h. */
- -_ACEOF
- -cat confdefs.h >>conftest.$ac_ext
- -cat >>conftest.$ac_ext <<_ACEOF
- -/* end confdefs.h. */
- -
- -int
- -main ()
- -{
- -
- - ;
- - return 0;
- -}
- -_ACEOF
- -rm -f conftest.$ac_objext
- -if { (ac_try="$ac_compile"
- -case "(($ac_try" in
- - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- - *) ac_try_echo=$ac_try;;
- -esac
- -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- - (eval "$ac_compile") 2>conftest.er1
- - ac_status=$?
- - grep -v '^ *+' conftest.er1 >conftest.err
- - rm -f conftest.er1
- - cat conftest.err >&5
- - echo "$as_me:$LINENO: \$? = $ac_status" >&5
- - (exit $ac_status); } && {
- - test -z "$ac_c_werror_flag" ||
- - test ! -s conftest.err
- - } && test -s conftest.$ac_objext; then
- - has_option=yes
- -else
- - echo "$as_me: failed program was:" >&5
- -sed 's/^/| /' conftest.$ac_ext >&5
- -
- - has_option=no
- -fi
- -
- -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- - CFLAGS="$SAVE_CFLAGS"
- - { echo "$as_me:$LINENO: result: $has_option" >&5
- -echo "${ECHO_T}$has_option" >&6; }
- - if test $has_option = yes; then
- - warning_flags="$warning_flags $option"
- - fi
- - unset has_option
- - unset SAVE_CFLAGS
- - done
- - unset option
- - if test "$enable_compile_warnings" = "error" ; then
- - warning_flags="$warning_flags -Werror"
- - fi
- - ;;
- - *)
- - { { echo "$as_me:$LINENO: error: Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" >&5
- -echo "$as_me: error: Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" >&2;}
- - { (exit 1); exit 1; }; }
- - ;;
- - esac
- - CFLAGS="$realsave_CFLAGS"
- - { echo "$as_me:$LINENO: checking what warning flags to pass to the C compiler" >&5
- -echo $ECHO_N "checking what warning flags to pass to the C compiler... $ECHO_C" >&6; }
- - { echo "$as_me:$LINENO: result: $warning_flags" >&5
- -echo "${ECHO_T}$warning_flags" >&6; }
- -
- - # Check whether --enable-iso-c was given.
- -if test "${enable_iso_c+set}" = set; then
- - enableval=$enable_iso_c;
- -else
- - enable_iso_c=no
- -fi
- -
- -
- - { echo "$as_me:$LINENO: checking what language compliance flags to pass to the C compiler" >&5
- -echo $ECHO_N "checking what language compliance flags to pass to the C compiler... $ECHO_C" >&6; }
- - complCFLAGS=
- - if test "x$enable_iso_c" != "xno"; then
- - if test "x$GCC" = "xyes"; then
- - case " $CFLAGS " in
- - *\ \ -ansi\ \ *) ;;
- - *) complCFLAGS="$complCFLAGS -ansi" ;;
- - esac
- - case " $CFLAGS " in
- - *\ \ -pedantic\ \ *) ;;
- - *) complCFLAGS="$complCFLAGS -pedantic" ;;
- - esac
- - fi
- - fi
- - { echo "$as_me:$LINENO: result: $complCFLAGS" >&5
- -echo "${ECHO_T}$complCFLAGS" >&6; }
- -
- - WARN_CFLAGS="$warning_flags $complCFLAGS"
- -
+GNOME_COMPILE_WARNINGS
@@ -4849,6 +4711,8 @@
INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+ INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+
@@ -4940,171 +4804,6 @@
fi
fi
- -# Extract the first word of "iconv", so it can be a program name with args.
- -set dummy iconv; ac_word=$2
- -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
- -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- -if test "${ac_cv_path_INTLTOOL_ICONV+set}" = set; then
- - echo $ECHO_N "(cached) $ECHO_C" >&6
- -else
- - case $INTLTOOL_ICONV in
- - [\\/]* | ?:[\\/]*)
- - ac_cv_path_INTLTOOL_ICONV="$INTLTOOL_ICONV" # Let the user override the test with a path.
- - ;;
- - *)
- - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
- -for as_dir in $PATH
- -do
- - IFS=$as_save_IFS
- - test -z "$as_dir" && as_dir=.
- - for ac_exec_ext in '' $ac_executable_extensions; do
- - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- - ac_cv_path_INTLTOOL_ICONV="$as_dir/$ac_word$ac_exec_ext"
- - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- - break 2
- - fi
- -done
- -done
- -IFS=$as_save_IFS
- -
- - test -z "$ac_cv_path_INTLTOOL_ICONV" && ac_cv_path_INTLTOOL_ICONV="iconv"
- - ;;
- -esac
- -fi
- -INTLTOOL_ICONV=$ac_cv_path_INTLTOOL_ICONV
- -if test -n "$INTLTOOL_ICONV"; then
- - { echo "$as_me:$LINENO: result: $INTLTOOL_ICONV" >&5
- -echo "${ECHO_T}$INTLTOOL_ICONV" >&6; }
- -else
- - { echo "$as_me:$LINENO: result: no" >&5
- -echo "${ECHO_T}no" >&6; }
- -fi
- -
- -
- -# Extract the first word of "msgfmt", so it can be a program name with args.
- -set dummy msgfmt; ac_word=$2
- -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
- -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- -if test "${ac_cv_path_INTLTOOL_MSGFMT+set}" = set; then
- - echo $ECHO_N "(cached) $ECHO_C" >&6
- -else
- - case $INTLTOOL_MSGFMT in
- - [\\/]* | ?:[\\/]*)
- - ac_cv_path_INTLTOOL_MSGFMT="$INTLTOOL_MSGFMT" # Let the user override the test with a path.
- - ;;
- - *)
- - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
- -for as_dir in $PATH
- -do
- - IFS=$as_save_IFS
- - test -z "$as_dir" && as_dir=.
- - for ac_exec_ext in '' $ac_executable_extensions; do
- - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- - ac_cv_path_INTLTOOL_MSGFMT="$as_dir/$ac_word$ac_exec_ext"
- - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- - break 2
- - fi
- -done
- -done
- -IFS=$as_save_IFS
- -
- - test -z "$ac_cv_path_INTLTOOL_MSGFMT" && ac_cv_path_INTLTOOL_MSGFMT="msgfmt"
- - ;;
- -esac
- -fi
- -INTLTOOL_MSGFMT=$ac_cv_path_INTLTOOL_MSGFMT
- -if test -n "$INTLTOOL_MSGFMT"; then
- - { echo "$as_me:$LINENO: result: $INTLTOOL_MSGFMT" >&5
- -echo "${ECHO_T}$INTLTOOL_MSGFMT" >&6; }
- -else
- - { echo "$as_me:$LINENO: result: no" >&5
- -echo "${ECHO_T}no" >&6; }
- -fi
- -
- -
- -# Extract the first word of "msgmerge", so it can be a program name with args.
- -set dummy msgmerge; ac_word=$2
- -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
- -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- -if test "${ac_cv_path_INTLTOOL_MSGMERGE+set}" = set; then
- - echo $ECHO_N "(cached) $ECHO_C" >&6
- -else
- - case $INTLTOOL_MSGMERGE in
- - [\\/]* | ?:[\\/]*)
- - ac_cv_path_INTLTOOL_MSGMERGE="$INTLTOOL_MSGMERGE" # Let the user override the test with a path.
- - ;;
- - *)
- - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
- -for as_dir in $PATH
- -do
- - IFS=$as_save_IFS
- - test -z "$as_dir" && as_dir=.
- - for ac_exec_ext in '' $ac_executable_extensions; do
- - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- - ac_cv_path_INTLTOOL_MSGMERGE="$as_dir/$ac_word$ac_exec_ext"
- - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- - break 2
- - fi
- -done
- -done
- -IFS=$as_save_IFS
- -
- - test -z "$ac_cv_path_INTLTOOL_MSGMERGE" && ac_cv_path_INTLTOOL_MSGMERGE="msgmerge"
- - ;;
- -esac
- -fi
- -INTLTOOL_MSGMERGE=$ac_cv_path_INTLTOOL_MSGMERGE
- -if test -n "$INTLTOOL_MSGMERGE"; then
- - { echo "$as_me:$LINENO: result: $INTLTOOL_MSGMERGE" >&5
- -echo "${ECHO_T}$INTLTOOL_MSGMERGE" >&6; }
- -else
- - { echo "$as_me:$LINENO: result: no" >&5
- -echo "${ECHO_T}no" >&6; }
- -fi
- -
- -
- -# Extract the first word of "xgettext", so it can be a program name with args.
- -set dummy xgettext; ac_word=$2
- -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
- -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- -if test "${ac_cv_path_INTLTOOL_XGETTEXT+set}" = set; then
- - echo $ECHO_N "(cached) $ECHO_C" >&6
- -else
- - case $INTLTOOL_XGETTEXT in
- - [\\/]* | ?:[\\/]*)
- - ac_cv_path_INTLTOOL_XGETTEXT="$INTLTOOL_XGETTEXT" # Let the user override the test with a path.
- - ;;
- - *)
- - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
- -for as_dir in $PATH
- -do
- - IFS=$as_save_IFS
- - test -z "$as_dir" && as_dir=.
- - for ac_exec_ext in '' $ac_executable_extensions; do
- - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- - ac_cv_path_INTLTOOL_XGETTEXT="$as_dir/$ac_word$ac_exec_ext"
- - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- - break 2
- - fi
- -done
- -done
- -IFS=$as_save_IFS
- -
- - test -z "$ac_cv_path_INTLTOOL_XGETTEXT" && ac_cv_path_INTLTOOL_XGETTEXT="xgettext"
- - ;;
- -esac
- -fi
- -INTLTOOL_XGETTEXT=$ac_cv_path_INTLTOOL_XGETTEXT
- -if test -n "$INTLTOOL_XGETTEXT"; then
- - { echo "$as_me:$LINENO: result: $INTLTOOL_XGETTEXT" >&5
- -echo "${ECHO_T}$INTLTOOL_XGETTEXT" >&6; }
- -else
- - { echo "$as_me:$LINENO: result: no" >&5
- -echo "${ECHO_T}no" >&6; }
- -fi
- -
- -
- -
# Substitute ALL_LINGUAS so we can use it in po/Makefile
@@ -5122,7 +4821,7 @@
main ()
{
extern int _nl_msg_cat_cntr;
- - return _nl_msg_cat_cntr
+ return _nl_msg_cat_cntr
;
return 0;
}
@@ -6938,8 +6637,8 @@
"Content-Transfer-Encoding: 8bit\n"
_ACEOF
- -if { (echo "$as_me:$LINENO: msgfmt -c -o /dev/null conftest.foo") >&5
- - (msgfmt -c -o /dev/null conftest.foo) 2>&5
+if { (echo "$as_me:$LINENO: \$MSGFMT -c -o /dev/null conftest.foo") >&5
+ ($MSGFMT -c -o /dev/null conftest.foo) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
@@ -7494,7 +7193,7 @@
and GTK_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
- -To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details." >&5
echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
@@ -7504,7 +7203,7 @@
and GTK_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
- -To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
@@ -7605,7 +7304,7 @@
and ECAL_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
- -To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details." >&5
echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
@@ -7615,7 +7314,7 @@
and ECAL_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
- -To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
@@ -7825,21 +7524,21 @@
pkg_cv_HILDON_CFLAGS="$HILDON_CFLAGS"
else
if test -n "$PKG_CONFIG" && \
- - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"hildon-libs >= 0.12.0,
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"hildon-1 >= 0.12.0,
dbus-1,
libosso,
- - libossomime\"") >&5
- - ($PKG_CONFIG --exists --print-errors "hildon-libs >= 0.12.0,
+ libossomime\"") >&5
+ ($PKG_CONFIG --exists --print-errors "hildon-1 >= 0.12.0,
dbus-1,
libosso,
- - libossomime") 2>&5
+ libossomime") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
- - pkg_cv_HILDON_CFLAGS=`$PKG_CONFIG --cflags "hildon-libs >= 0.12.0,
+ pkg_cv_HILDON_CFLAGS=`$PKG_CONFIG --cflags "hildon-1 >= 0.12.0,
dbus-1,
libosso,
- - libossomime" 2>/dev/null`
+ libossomime" 2>/dev/null`
else
pkg_failed=yes
fi
@@ -7852,21 +7551,21 @@
pkg_cv_HILDON_LIBS="$HILDON_LIBS"
else
if test -n "$PKG_CONFIG" && \
- - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"hildon-libs >= 0.12.0,
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"hildon-1 >= 0.12.0,
dbus-1,
libosso,
- - libossomime\"") >&5
- - ($PKG_CONFIG --exists --print-errors "hildon-libs >= 0.12.0,
+ libossomime\"") >&5
+ ($PKG_CONFIG --exists --print-errors "hildon-1 >= 0.12.0,
dbus-1,
libosso,
- - libossomime") 2>&5
+ libossomime") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
- - pkg_cv_HILDON_LIBS=`$PKG_CONFIG --libs "hildon-libs >= 0.12.0,
+ pkg_cv_HILDON_LIBS=`$PKG_CONFIG --libs "hildon-1 >= 0.12.0,
dbus-1,
libosso,
- - libossomime" 2>/dev/null`
+ libossomime" 2>/dev/null`
else
pkg_failed=yes
fi
@@ -7885,15 +7584,15 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- - HILDON_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "hildon-libs >= 0.12.0,
+ HILDON_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "hildon-1 >= 0.12.0,
dbus-1,
libosso,
- - libossomime"`
+ libossomime"`
else
- - HILDON_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "hildon-libs >= 0.12.0,
+ HILDON_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "hildon-1 >= 0.12.0,
dbus-1,
libosso,
- - libossomime"`
+ libossomime"`
fi
# Put the nasty error message in config.log where it belongs
echo "$HILDON_PKG_ERRORS" >&5
@@ -8824,9 +8523,7 @@
AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
INTLTOOL_PERL='${INTLTOOL_PERL}' ac_aux_dir='${ac_aux_dir}'
prefix="$prefix" exec_prefix="$exec_prefix" INTLTOOL_LIBDIR="$libdir"
- -INTLTOOL_EXTRACT='${INTLTOOL_EXTRACT}' INTLTOOL_ICONV='${INTLTOOL_ICONV}'
- -INTLTOOL_MSGFMT='${INTLTOOL_MSGFMT}' INTLTOOL_MSGMERGE='${INTLTOOL_MSGMERGE}'
- -INTLTOOL_XGETTEXT='${INTLTOOL_XGETTEXT}'
+INTLTOOL_EXTRACT='${INTLTOOL_EXTRACT}'
_ACEOF
@@ -8995,7 +8692,6 @@
am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim
CPP!$CPP$ac_delim
RANLIB!$RANLIB$ac_delim
- -WARN_CFLAGS!$WARN_CFLAGS$ac_delim
INTLTOOL_DESKTOP_RULE!$INTLTOOL_DESKTOP_RULE$ac_delim
INTLTOOL_DIRECTORY_RULE!$INTLTOOL_DIRECTORY_RULE$ac_delim
INTLTOOL_KEYS_RULE!$INTLTOOL_KEYS_RULE$ac_delim
@@ -9014,6 +8710,7 @@
INTLTOOL_SCHEMAS_RULE!$INTLTOOL_SCHEMAS_RULE$ac_delim
INTLTOOL_THEME_RULE!$INTLTOOL_THEME_RULE$ac_delim
INTLTOOL_SERVICE_RULE!$INTLTOOL_SERVICE_RULE$ac_delim
+INTLTOOL_POLICY_RULE!$INTLTOOL_POLICY_RULE$ac_delim
INTLTOOL_EXTRACT!$INTLTOOL_EXTRACT$ac_delim
_ACEOF
@@ -9059,10 +8756,6 @@
INTLTOOL_MERGE!$INTLTOOL_MERGE$ac_delim
INTLTOOL_UPDATE!$INTLTOOL_UPDATE$ac_delim
INTLTOOL_PERL!$INTLTOOL_PERL$ac_delim
- -INTLTOOL_ICONV!$INTLTOOL_ICONV$ac_delim
- -INTLTOOL_MSGFMT!$INTLTOOL_MSGFMT$ac_delim
- -INTLTOOL_MSGMERGE!$INTLTOOL_MSGMERGE$ac_delim
- -INTLTOOL_XGETTEXT!$INTLTOOL_XGETTEXT$ac_delim
ALL_LINGUAS!$ALL_LINGUAS$ac_delim
DATADIRNAME!$DATADIRNAME$ac_delim
GETTEXT_PACKAGE!$GETTEXT_PACKAGE$ac_delim
@@ -9114,7 +8807,7 @@
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 56; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 52; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
@@ -9685,10 +9378,6 @@
for file in intltool-extract intltool-merge intltool-update; do
sed -e "s|@INTLTOOL_EXTRACT@|`pwd`/intltool-extract|g" \
-e "s|@INTLTOOL_LIBDIR@|${INTLTOOL_LIBDIR}|g" \
- - -e "s|@INTLTOOL_ICONV@|${INTLTOOL_ICONV}|g" \
- - -e "s|@INTLTOOL_MSGFMT@|${INTLTOOL_MSGFMT}|g" \
- - -e "s|@INTLTOOL_MSGMERGE@|${INTLTOOL_MSGMERGE}|g" \
- - -e "s|@INTLTOOL_XGETTEXT@|${INTLTOOL_XGETTEXT}|g" \
-e "s|@INTLTOOL_PERL@|${INTLTOOL_PERL}|g" \
< ${ac_aux_dir}/${file}.in > ${file}.out
if cmp -s ${file} ${file}.out 2>/dev/null; then
diff -Nru /tmp/h5jzVb9LbI/tasks-0.11/configure.ac /tmp/fbjxcJaeaG/tasks-0.11/configure.ac
- --- /tmp/h5jzVb9LbI/tasks-0.11/configure.ac 2007-08-13 17:14:56.000000000 -0300
+++ /tmp/fbjxcJaeaG/tasks-0.11/configure.ac 2007-08-21 10:37:12.000000000 -0300
@@ -48,10 +48,10 @@
AC_ARG_ENABLE(hildon,AS_HELP_STRING([--enable-hildon],[Turn on Hildon frontend]),[
if test "x$enableval" = "xyes" ; then
PKG_CHECK_MODULES(HILDON,
- - [hildon-libs >= 0.12.0,
+ [hildon-1 >= 0.12.0,
dbus-1,
- - libosso,
- - libossomime],
+ libosso,
+ libossomime],
hildon=true, hildon=false)
fi])
diff -Nru /tmp/h5jzVb9LbI/tasks-0.11/data/icons/16x16/Makefile.in /tmp/fbjxcJaeaG/tasks-0.11/data/icons/16x16/Makefile.in
- --- /tmp/h5jzVb9LbI/tasks-0.11/data/icons/16x16/Makefile.in 2007-08-13 17:20:20.000000000 -0300
+++ /tmp/fbjxcJaeaG/tasks-0.11/data/icons/16x16/Makefile.in 2007-08-21 10:37:12.000000000 -0300
@@ -97,14 +97,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
- -INTLTOOL_ICONV = @INTLTOOL_ICONV@
INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
- -INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
- -INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
@@ -116,7 +114,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
- -INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
@@ -151,7 +148,6 @@
STRIP = @STRIP@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
- -WARN_CFLAGS = @WARN_CFLAGS@
XGETTEXT = @XGETTEXT@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
diff -Nru /tmp/h5jzVb9LbI/tasks-0.11/data/icons/22x22/Makefile.in /tmp/fbjxcJaeaG/tasks-0.11/data/icons/22x22/Makefile.in
- --- /tmp/h5jzVb9LbI/tasks-0.11/data/icons/22x22/Makefile.in 2007-08-13 17:20:20.000000000 -0300
+++ /tmp/fbjxcJaeaG/tasks-0.11/data/icons/22x22/Makefile.in 2007-08-21 10:37:12.000000000 -0300
@@ -97,14 +97,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
- -INTLTOOL_ICONV = @INTLTOOL_ICONV@
INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
- -INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
- -INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
@@ -116,7 +114,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
- -INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
@@ -151,7 +148,6 @@
STRIP = @STRIP@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
- -WARN_CFLAGS = @WARN_CFLAGS@
XGETTEXT = @XGETTEXT@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
diff -Nru /tmp/h5jzVb9LbI/tasks-0.11/data/icons/32x32/Makefile.in /tmp/fbjxcJaeaG/tasks-0.11/data/icons/32x32/Makefile.in
- --- /tmp/h5jzVb9LbI/tasks-0.11/data/icons/32x32/Makefile.in 2007-08-13 17:20:20.000000000 -0300
+++ /tmp/fbjxcJaeaG/tasks-0.11/data/icons/32x32/Makefile.in 2007-08-21 10:37:12.000000000 -0300
@@ -97,14 +97,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
- -INTLTOOL_ICONV = @INTLTOOL_ICONV@
INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
- -INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
- -INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
@@ -116,7 +114,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
- -INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
@@ -151,7 +148,6 @@
STRIP = @STRIP@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
- -WARN_CFLAGS = @WARN_CFLAGS@
XGETTEXT = @XGETTEXT@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
diff -Nru /tmp/h5jzVb9LbI/tasks-0.11/data/icons/48x48/Makefile.in /tmp/fbjxcJaeaG/tasks-0.11/data/icons/48x48/Makefile.in
- --- /tmp/h5jzVb9LbI/tasks-0.11/data/icons/48x48/Makefile.in 2007-08-13 17:20:20.000000000 -0300
+++ /tmp/fbjxcJaeaG/tasks-0.11/data/icons/48x48/Makefile.in 2007-08-21 10:37:12.000000000 -0300
@@ -97,14 +97,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
- -INTLTOOL_ICONV = @INTLTOOL_ICONV@
INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
- -INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
- -INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
@@ -116,7 +114,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
- -INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
@@ -151,7 +148,6 @@
STRIP = @STRIP@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
- -WARN_CFLAGS = @WARN_CFLAGS@
XGETTEXT = @XGETTEXT@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
diff -Nru /tmp/h5jzVb9LbI/tasks-0.11/data/icons/Makefile.in /tmp/fbjxcJaeaG/tasks-0.11/data/icons/Makefile.in
- --- /tmp/h5jzVb9LbI/tasks-0.11/data/icons/Makefile.in 2007-08-13 17:20:20.000000000 -0300
+++ /tmp/fbjxcJaeaG/tasks-0.11/data/icons/Makefile.in 2007-08-21 10:37:12.000000000 -0300
@@ -99,14 +99,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
- -INTLTOOL_ICONV = @INTLTOOL_ICONV@
INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
- -INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
- -INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
@@ -118,7 +116,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
- -INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
@@ -153,7 +150,6 @@
STRIP = @STRIP@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
- -WARN_CFLAGS = @WARN_CFLAGS@
XGETTEXT = @XGETTEXT@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
diff -Nru /tmp/h5jzVb9LbI/tasks-0.11/data/icons/scalable/Makefile.in /tmp/fbjxcJaeaG/tasks-0.11/data/icons/scalable/Makefile.in
- --- /tmp/h5jzVb9LbI/tasks-0.11/data/icons/scalable/Makefile.in 2007-08-13 17:20:21.000000000 -0300
+++ /tmp/fbjxcJaeaG/tasks-0.11/data/icons/scalable/Makefile.in 2007-08-21 10:37:12.000000000 -0300
@@ -97,14 +97,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
- -INTLTOOL_ICONV = @INTLTOOL_ICONV@
INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
- -INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
- -INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
@@ -116,7 +114,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
- -INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
@@ -151,7 +148,6 @@
STRIP = @STRIP@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
- -WARN_CFLAGS = @WARN_CFLAGS@
XGETTEXT = @XGETTEXT@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
diff -Nru /tmp/h5jzVb9LbI/tasks-0.11/data/Makefile.in /tmp/fbjxcJaeaG/tasks-0.11/data/Makefile.in
- --- /tmp/h5jzVb9LbI/tasks-0.11/data/Makefile.in 2007-08-13 17:20:20.000000000 -0300
+++ /tmp/fbjxcJaeaG/tasks-0.11/data/Makefile.in 2007-08-21 10:37:12.000000000 -0300
@@ -109,14 +109,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
- -INTLTOOL_ICONV = @INTLTOOL_ICONV@
INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
- -INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
- -INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
@@ -128,7 +126,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
- -INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
@@ -163,7 +160,6 @@
STRIP = @STRIP@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
- -WARN_CFLAGS = @WARN_CFLAGS@
XGETTEXT = @XGETTEXT@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
diff -Nru /tmp/h5jzVb9LbI/tasks-0.11/debian/changelog /tmp/fbjxcJaeaG/tasks-0.11/debian/changelog
- --- /tmp/h5jzVb9LbI/tasks-0.11/debian/changelog 2007-08-22 17:15:01.000000000 -0300
+++ /tmp/fbjxcJaeaG/tasks-0.11/debian/changelog 2007-08-21 10:41:38.000000000 -0300
@@ -1,3 +1,9 @@
+tasks (0.11-1ubuntu1) gutsy; urgency=low
+
+ * Updated rules and autoconf files to build correctly for UME.
+
+ -- Adilson Oliveira <adilson@ubuntu.com> Tue, 21 Aug 2007 10:11:22 -0300
+
tasks (0.11-1) unstable; urgency=low
* New upstream release
diff -Nru /tmp/h5jzVb9LbI/tasks-0.11/debian/rules /tmp/fbjxcJaeaG/tasks-0.11/debian/rules
- --- /tmp/h5jzVb9LbI/tasks-0.11/debian/rules 2007-08-22 17:15:01.000000000 -0300
+++ /tmp/fbjxcJaeaG/tasks-0.11/debian/rules 2007-08-21 10:37:12.000000000 -0300
@@ -5,6 +5,11 @@
include /usr/share/cdbs/1/rules/simple-patchsys.mk
include /usr/share/cdbs/1/rules/utils.mk
+# If compiling for lpia, enable Hildon interface
+ifeq ($(DEB_BUILD_ARCH), lpia)
+DEB_CONFIGURE_EXTRA_FLAGS += --enable-hildon
+endif
+
DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,-O1 -Wl,--as-needed"
DEB_DH_INSTALL_ARGS := --sourcedir=debian/tmp
diff -Nru /tmp/h5jzVb9LbI/tasks-0.11/intltool-merge.in /tmp/fbjxcJaeaG/tasks-0.11/intltool-merge.in
- --- /tmp/h5jzVb9LbI/tasks-0.11/intltool-merge.in 2007-08-13 17:20:14.000000000 -0300
+++ /tmp/fbjxcJaeaG/tasks-0.11/intltool-merge.in 2007-08-21 10:37:12.000000000 -0300
@@ -93,7 +93,7 @@
my %po_files_by_lang = ();
my %translations = ();
- -my $iconv = $ENV{"ICONV"} || $ENV{"INTLTOOL_ICONV"} || "@INTLTOOL_ICONV@";
+my $iconv = $ENV{"ICONV"} || $ENV{"INTLTOOL_ICONV"};
my $devnull = ($^O eq 'MSWin32' ? 'NUL:' : '/dev/null');
# Use this instead of \w for XML files to handle more possible characters.
diff -Nru /tmp/h5jzVb9LbI/tasks-0.11/libkoto/Makefile.in /tmp/fbjxcJaeaG/tasks-0.11/libkoto/Makefile.in
- --- /tmp/h5jzVb9LbI/tasks-0.11/libkoto/Makefile.in 2007-08-13 17:20:21.000000000 -0300
+++ /tmp/fbjxcJaeaG/tasks-0.11/libkoto/Makefile.in 2007-08-21 10:37:12.000000000 -0300
@@ -132,14 +132,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
- -INTLTOOL_ICONV = @INTLTOOL_ICONV@
INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
- -INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
- -INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
@@ -151,7 +149,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
- -INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
@@ -186,7 +183,6 @@
STRIP = @STRIP@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
- -WARN_CFLAGS = @WARN_CFLAGS@
XGETTEXT = @XGETTEXT@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
diff -Nru /tmp/h5jzVb9LbI/tasks-0.11/Makefile.in /tmp/fbjxcJaeaG/tasks-0.11/Makefile.in
- --- /tmp/h5jzVb9LbI/tasks-0.11/Makefile.in 2007-08-13 17:20:21.000000000 -0300
+++ /tmp/fbjxcJaeaG/tasks-0.11/Makefile.in 2007-08-21 10:37:12.000000000 -0300
@@ -114,14 +114,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
- -INTLTOOL_ICONV = @INTLTOOL_ICONV@
INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
- -INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
- -INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
@@ -133,7 +131,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
- -INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
@@ -168,7 +165,6 @@
STRIP = @STRIP@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
- -WARN_CFLAGS = @WARN_CFLAGS@
XGETTEXT = @XGETTEXT@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
diff -Nru /tmp/h5jzVb9LbI/tasks-0.11/src/gtk/Makefile.in /tmp/fbjxcJaeaG/tasks-0.11/src/gtk/Makefile.in
- --- /tmp/h5jzVb9LbI/tasks-0.11/src/gtk/Makefile.in 2007-08-13 17:20:21.000000000 -0300
+++ /tmp/fbjxcJaeaG/tasks-0.11/src/gtk/Makefile.in 2007-08-21 10:37:12.000000000 -0300
@@ -119,14 +119,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
- -INTLTOOL_ICONV = @INTLTOOL_ICONV@
INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
- -INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
- -INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
@@ -138,7 +136,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
- -INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
@@ -173,7 +170,6 @@
STRIP = @STRIP@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
- -WARN_CFLAGS = @WARN_CFLAGS@
XGETTEXT = @XGETTEXT@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
diff -Nru /tmp/h5jzVb9LbI/tasks-0.11/src/hildon/hildon-tasks.c /tmp/fbjxcJaeaG/tasks-0.11/src/hildon/hildon-tasks.c
- --- /tmp/h5jzVb9LbI/tasks-0.11/src/hildon/hildon-tasks.c 2007-07-31 16:51:11.000000000 -0300
+++ /tmp/fbjxcJaeaG/tasks-0.11/src/hildon/hildon-tasks.c 2007-08-21 10:37:12.000000000 -0300
@@ -25,7 +25,7 @@
#include <gtk/gtk.h>
#include <osso-uri.h>
- -#include <hildon-widgets/hildon-program.h>
+#include <hildon/hildon-program.h>
#include <libkoto/ical-util.h>
#include <libkoto/koto-category-group.h>
diff -Nru /tmp/h5jzVb9LbI/tasks-0.11/src/hildon/Makefile.in /tmp/fbjxcJaeaG/tasks-0.11/src/hildon/Makefile.in
- --- /tmp/h5jzVb9LbI/tasks-0.11/src/hildon/Makefile.in 2007-08-13 17:20:21.000000000 -0300
+++ /tmp/fbjxcJaeaG/tasks-0.11/src/hildon/Makefile.in 2007-08-21 10:37:12.000000000 -0300
@@ -119,14 +119,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
- -INTLTOOL_ICONV = @INTLTOOL_ICONV@
INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
- -INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
- -INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
@@ -138,7 +136,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
- -INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
@@ -173,7 +170,6 @@
STRIP = @STRIP@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
- -WARN_CFLAGS = @WARN_CFLAGS@
XGETTEXT = @XGETTEXT@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
diff -Nru /tmp/h5jzVb9LbI/tasks-0.11/src/Makefile.in /tmp/fbjxcJaeaG/tasks-0.11/src/Makefile.in
- --- /tmp/h5jzVb9LbI/tasks-0.11/src/Makefile.in 2007-08-13 17:20:21.000000000 -0300
+++ /tmp/fbjxcJaeaG/tasks-0.11/src/Makefile.in 2007-08-21 10:37:12.000000000 -0300
@@ -102,14 +102,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
- -INTLTOOL_ICONV = @INTLTOOL_ICONV@
INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
- -INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
- -INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
@@ -121,7 +119,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
- -INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
@@ -156,7 +153,6 @@
STRIP = @STRIP@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
- -WARN_CFLAGS = @WARN_CFLAGS@
XGETTEXT = @XGETTEXT@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
diff -Nru /tmp/h5jzVb9LbI/tasks-0.11/src/omoko/Makefile.in /tmp/fbjxcJaeaG/tasks-0.11/src/omoko/Makefile.in
- --- /tmp/h5jzVb9LbI/tasks-0.11/src/omoko/Makefile.in 2007-08-13 17:20:21.000000000 -0300
+++ /tmp/fbjxcJaeaG/tasks-0.11/src/omoko/Makefile.in 2007-08-21 10:37:12.000000000 -0300
@@ -109,14 +109,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
- -INTLTOOL_ICONV = @INTLTOOL_ICONV@
INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
- -INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
- -INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
@@ -128,7 +126,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
- -INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
@@ -163,7 +160,6 @@
STRIP = @STRIP@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
- -WARN_CFLAGS = @WARN_CFLAGS@
XGETTEXT = @XGETTEXT@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
iD8DBQFGzdVu2cB5Bt7H7YARAu0eAKDJ6fUTCDH2PBXdq2k0euk3LkpTVwCgnQA/
krX4sHV9d2AAsoxzbPUoC9Q=
=OPqj
-----END PGP SIGNATURE----- |
This patch makes the build for lpia arch to use the hildon interface. |
|
