266 lines
12 KiB
Diff
266 lines
12 KiB
Diff
diff -pruN pcmanfm-0.5.old/configure pcmanfm-0.5/configure
|
|
--- pcmanfm-0.5.old/configure 2008-08-01 12:53:31.000000000 +0200
|
|
+++ pcmanfm-0.5/configure 2008-08-01 13:07:42.000000000 +0200
|
|
@@ -12702,177 +12702,6 @@ fi
|
|
am_cv_prog_cc_stdc=$ac_cv_prog_cc_stdc
|
|
|
|
|
|
-case "$am__api_version" in
|
|
- 1.01234)
|
|
- { { $as_echo "$as_me:$LINENO: error: Automake 1.5 or newer is required to use intltool" >&5
|
|
-$as_echo "$as_me: error: Automake 1.5 or newer is required to use intltool" >&2;}
|
|
- { (exit 1); exit 1; }; }
|
|
- ;;
|
|
- *)
|
|
- ;;
|
|
-esac
|
|
-
|
|
-if test -n ""; then
|
|
- { $as_echo "$as_me:$LINENO: checking for intltool >= " >&5
|
|
-$as_echo_n "checking for intltool >= ... " >&6; }
|
|
-
|
|
- INTLTOOL_REQUIRED_VERSION_AS_INT=`echo | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
|
|
- INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
|
|
- INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
|
|
-
|
|
- { $as_echo "$as_me:$LINENO: result: $INTLTOOL_APPLIED_VERSION found" >&5
|
|
-$as_echo "$INTLTOOL_APPLIED_VERSION found" >&6; }
|
|
- test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
|
|
- { { $as_echo "$as_me:$LINENO: error: Your intltool is too old. You need intltool or later." >&5
|
|
-$as_echo "$as_me: error: Your intltool is too old. You need intltool or later." >&2;}
|
|
- { (exit 1); exit 1; }; }
|
|
-fi
|
|
-
|
|
-# Extract the first word of "intltool-update", so it can be a program name with args.
|
|
-set dummy intltool-update; ac_word=$2
|
|
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
-$as_echo_n "checking for $ac_word... " >&6; }
|
|
-if test "${ac_cv_path_INTLTOOL_UPDATE+set}" = set; then
|
|
- $as_echo_n "(cached) " >&6
|
|
-else
|
|
- case $INTLTOOL_UPDATE in
|
|
- [\\/]* | ?:[\\/]*)
|
|
- ac_cv_path_INTLTOOL_UPDATE="$INTLTOOL_UPDATE" # 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_UPDATE="$as_dir/$ac_word$ac_exec_ext"
|
|
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
- break 2
|
|
- fi
|
|
-done
|
|
-done
|
|
-IFS=$as_save_IFS
|
|
-
|
|
- ;;
|
|
-esac
|
|
-fi
|
|
-INTLTOOL_UPDATE=$ac_cv_path_INTLTOOL_UPDATE
|
|
-if test -n "$INTLTOOL_UPDATE"; then
|
|
- { $as_echo "$as_me:$LINENO: result: $INTLTOOL_UPDATE" >&5
|
|
-$as_echo "$INTLTOOL_UPDATE" >&6; }
|
|
-else
|
|
- { $as_echo "$as_me:$LINENO: result: no" >&5
|
|
-$as_echo "no" >&6; }
|
|
-fi
|
|
-
|
|
-
|
|
-# Extract the first word of "intltool-merge", so it can be a program name with args.
|
|
-set dummy intltool-merge; ac_word=$2
|
|
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
-$as_echo_n "checking for $ac_word... " >&6; }
|
|
-if test "${ac_cv_path_INTLTOOL_MERGE+set}" = set; then
|
|
- $as_echo_n "(cached) " >&6
|
|
-else
|
|
- case $INTLTOOL_MERGE in
|
|
- [\\/]* | ?:[\\/]*)
|
|
- ac_cv_path_INTLTOOL_MERGE="$INTLTOOL_MERGE" # 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_MERGE="$as_dir/$ac_word$ac_exec_ext"
|
|
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
- break 2
|
|
- fi
|
|
-done
|
|
-done
|
|
-IFS=$as_save_IFS
|
|
-
|
|
- ;;
|
|
-esac
|
|
-fi
|
|
-INTLTOOL_MERGE=$ac_cv_path_INTLTOOL_MERGE
|
|
-if test -n "$INTLTOOL_MERGE"; then
|
|
- { $as_echo "$as_me:$LINENO: result: $INTLTOOL_MERGE" >&5
|
|
-$as_echo "$INTLTOOL_MERGE" >&6; }
|
|
-else
|
|
- { $as_echo "$as_me:$LINENO: result: no" >&5
|
|
-$as_echo "no" >&6; }
|
|
-fi
|
|
-
|
|
-
|
|
-# Extract the first word of "intltool-extract", so it can be a program name with args.
|
|
-set dummy intltool-extract; ac_word=$2
|
|
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
-$as_echo_n "checking for $ac_word... " >&6; }
|
|
-if test "${ac_cv_path_INTLTOOL_EXTRACT+set}" = set; then
|
|
- $as_echo_n "(cached) " >&6
|
|
-else
|
|
- case $INTLTOOL_EXTRACT in
|
|
- [\\/]* | ?:[\\/]*)
|
|
- ac_cv_path_INTLTOOL_EXTRACT="$INTLTOOL_EXTRACT" # 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_EXTRACT="$as_dir/$ac_word$ac_exec_ext"
|
|
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
- break 2
|
|
- fi
|
|
-done
|
|
-done
|
|
-IFS=$as_save_IFS
|
|
-
|
|
- ;;
|
|
-esac
|
|
-fi
|
|
-INTLTOOL_EXTRACT=$ac_cv_path_INTLTOOL_EXTRACT
|
|
-if test -n "$INTLTOOL_EXTRACT"; then
|
|
- { $as_echo "$as_me:$LINENO: result: $INTLTOOL_EXTRACT" >&5
|
|
-$as_echo "$INTLTOOL_EXTRACT" >&6; }
|
|
-else
|
|
- { $as_echo "$as_me:$LINENO: result: no" >&5
|
|
-$as_echo "no" >&6; }
|
|
-fi
|
|
-
|
|
-
|
|
-if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then
|
|
- { { $as_echo "$as_me:$LINENO: error: The intltool scripts were not found. Please install intltool." >&5
|
|
-$as_echo "$as_me: error: The intltool scripts were not found. Please install intltool." >&2;}
|
|
- { (exit 1); exit 1; }; }
|
|
-fi
|
|
-
|
|
- INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.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_DIRECTORY_RULE='%.directory: %.directory.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_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
|
|
- INTLTOOL_PROP_RULE='%.prop: %.prop.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_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< $@'
|
|
- INTLTOOL_PONG_RULE='%.pong: %.pong.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 $< $@'
|
|
- INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
|
|
- INTLTOOL_SHEET_RULE='%.sheet: %.sheet.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 $< $@'
|
|
-INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.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_UI_RULE='%.ui: %.ui.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 $< $@'
|
|
- INTLTOOL_XML_RULE='%.xml: %.xml.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 $< $@'
|
|
- INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< $@'
|
|
- INTLTOOL_XAM_RULE='%.xam: %.xml.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 $< $@'
|
|
- INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
|
|
- INTLTOOL_CAVES_RULE='%.caves: %.caves.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_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 $< $@'
|
|
|
|
|
|
|
|
@@ -13015,83 +12844,6 @@ $as_echo "no" >&6; }
|
|
fi
|
|
|
|
|
|
-if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then
|
|
- { { $as_echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5
|
|
-$as_echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;}
|
|
- { (exit 1); exit 1; }; }
|
|
-fi
|
|
-xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`"
|
|
-mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`"
|
|
-mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`"
|
|
-if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then
|
|
- { { $as_echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5
|
|
-$as_echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;}
|
|
- { (exit 1); exit 1; }; }
|
|
-fi
|
|
-
|
|
-# Extract the first word of "perl", so it can be a program name with args.
|
|
-set dummy perl; ac_word=$2
|
|
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
-$as_echo_n "checking for $ac_word... " >&6; }
|
|
-if test "${ac_cv_path_INTLTOOL_PERL+set}" = set; then
|
|
- $as_echo_n "(cached) " >&6
|
|
-else
|
|
- case $INTLTOOL_PERL in
|
|
- [\\/]* | ?:[\\/]*)
|
|
- ac_cv_path_INTLTOOL_PERL="$INTLTOOL_PERL" # 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_PERL="$as_dir/$ac_word$ac_exec_ext"
|
|
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
- break 2
|
|
- fi
|
|
-done
|
|
-done
|
|
-IFS=$as_save_IFS
|
|
-
|
|
- ;;
|
|
-esac
|
|
-fi
|
|
-INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL
|
|
-if test -n "$INTLTOOL_PERL"; then
|
|
- { $as_echo "$as_me:$LINENO: result: $INTLTOOL_PERL" >&5
|
|
-$as_echo "$INTLTOOL_PERL" >&6; }
|
|
-else
|
|
- { $as_echo "$as_me:$LINENO: result: no" >&5
|
|
-$as_echo "no" >&6; }
|
|
-fi
|
|
-
|
|
-
|
|
-if test -z "$INTLTOOL_PERL"; then
|
|
- { { $as_echo "$as_me:$LINENO: error: perl not found; required for intltool" >&5
|
|
-$as_echo "$as_me: error: perl not found; required for intltool" >&2;}
|
|
- { (exit 1); exit 1; }; }
|
|
-fi
|
|
-if test -z "`$INTLTOOL_PERL -v | fgrep '5.' 2> /dev/null`"; then
|
|
- { { $as_echo "$as_me:$LINENO: error: perl 5.x required for intltool" >&5
|
|
-$as_echo "$as_me: error: perl 5.x required for intltool" >&2;}
|
|
- { (exit 1); exit 1; }; }
|
|
-fi
|
|
-if test "x" != "xno-xml"; then
|
|
- { $as_echo "$as_me:$LINENO: checking for XML::Parser" >&5
|
|
-$as_echo_n "checking for XML::Parser... " >&6; }
|
|
- if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
|
|
- { $as_echo "$as_me:$LINENO: result: ok" >&5
|
|
-$as_echo "ok" >&6; }
|
|
- else
|
|
- { { $as_echo "$as_me:$LINENO: error: XML::Parser perl module is required for intltool" >&5
|
|
-$as_echo "$as_me: error: XML::Parser perl module is required for intltool" >&2;}
|
|
- { (exit 1); exit 1; }; }
|
|
- fi
|
|
-fi
|
|
-
|
|
# Substitute ALL_LINGUAS so we can use it in po/Makefile
|
|
|
|
|