01f63fdbb2
* 02_hurd_stub_backend.patch: re-add an implementation of the stub backend, for the Hurd. Closes: #557446. * 03_kfreebsd_installdirs.patch: patch to install binaries in libexecdir so that we can version the installation directory. Also use DESTDIR in the installation hooks. * Rename 90_autoconf.patch to 90_autotools.patch, re-run all the autotools on top of that. * Pass a versioned libexecdir to the configure arguments. * Install the server binary on kfreebsd. * Exclude it from dh_fixperms.
36333 lines
1.2 MiB
Plaintext
36333 lines
1.2 MiB
Plaintext
libtoolize --force --copy
|
|
aclocal
|
|
automake -acf -Wno-portability
|
|
autoheader
|
|
autoconf
|
|
rm -rf config.h.in~ autom4te.cache/
|
|
|
|
Index: libgtop-2.28.0/configure
|
|
===================================================================
|
|
--- libgtop-2.28.0.orig/configure 2009-11-22 17:21:35.149688747 +0100
|
|
+++ libgtop-2.28.0/configure 2009-11-22 17:53:21.053182276 +0100
|
|
@@ -1,62 +1,83 @@
|
|
#! /bin/sh
|
|
# Guess values for system-dependent variables and create Makefiles.
|
|
-# Generated by GNU Autoconf 2.61 for libgtop 2.28.0.
|
|
+# Generated by GNU Autoconf 2.64 for libgtop 2.28.0.
|
|
#
|
|
# Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=libgtop>.
|
|
#
|
|
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
|
|
-# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
|
|
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
|
|
+# Foundation, Inc.
|
|
+#
|
|
# This configure script is free software; the Free Software Foundation
|
|
# gives unlimited permission to copy, distribute and modify it.
|
|
-## --------------------- ##
|
|
-## M4sh Initialization. ##
|
|
-## --------------------- ##
|
|
+## -------------------- ##
|
|
+## M4sh Initialization. ##
|
|
+## -------------------- ##
|
|
|
|
# Be more Bourne compatible
|
|
DUALCASE=1; export DUALCASE # for MKS sh
|
|
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
|
|
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
|
|
emulate sh
|
|
NULLCMD=:
|
|
- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
|
|
+ # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
|
|
# is contrary to our usage. Disable this feature.
|
|
alias -g '${1+"$@"}'='"$@"'
|
|
setopt NO_GLOB_SUBST
|
|
else
|
|
- case `(set -o) 2>/dev/null` in
|
|
- *posix*) set -o posix ;;
|
|
+ case `(set -o) 2>/dev/null` in #(
|
|
+ *posix*) :
|
|
+ set -o posix ;; #(
|
|
+ *) :
|
|
+ ;;
|
|
esac
|
|
-
|
|
fi
|
|
|
|
|
|
-
|
|
-
|
|
-# PATH needs CR
|
|
-# Avoid depending upon Character Ranges.
|
|
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
|
|
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
|
|
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
|
|
-as_cr_digits='0123456789'
|
|
-as_cr_alnum=$as_cr_Letters$as_cr_digits
|
|
-
|
|
-# The user is always right.
|
|
-if test "${PATH_SEPARATOR+set}" != set; then
|
|
- echo "#! /bin/sh" >conf$$.sh
|
|
- echo "exit 0" >>conf$$.sh
|
|
- chmod +x conf$$.sh
|
|
- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
|
|
- PATH_SEPARATOR=';'
|
|
+as_nl='
|
|
+'
|
|
+export as_nl
|
|
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
|
|
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
|
|
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
|
|
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
|
|
+# Prefer a ksh shell builtin over an external printf program on Solaris,
|
|
+# but without wasting forks for bash or zsh.
|
|
+if test -z "$BASH_VERSION$ZSH_VERSION" \
|
|
+ && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
|
|
+ as_echo='print -r --'
|
|
+ as_echo_n='print -rn --'
|
|
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
|
|
+ as_echo='printf %s\n'
|
|
+ as_echo_n='printf %s'
|
|
+else
|
|
+ if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
|
|
+ as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
|
|
+ as_echo_n='/usr/ucb/echo -n'
|
|
else
|
|
- PATH_SEPARATOR=:
|
|
+ as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
|
|
+ as_echo_n_body='eval
|
|
+ arg=$1;
|
|
+ case $arg in #(
|
|
+ *"$as_nl"*)
|
|
+ expr "X$arg" : "X\\(.*\\)$as_nl";
|
|
+ arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
|
|
+ esac;
|
|
+ expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
|
|
+ '
|
|
+ export as_echo_n_body
|
|
+ as_echo_n='sh -c $as_echo_n_body as_echo'
|
|
fi
|
|
- rm -f conf$$.sh
|
|
+ export as_echo_body
|
|
+ as_echo='sh -c $as_echo_body as_echo'
|
|
fi
|
|
|
|
-# Support unset when possible.
|
|
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
|
|
- as_unset=unset
|
|
-else
|
|
- as_unset=false
|
|
+# The user is always right.
|
|
+if test "${PATH_SEPARATOR+set}" != set; then
|
|
+ PATH_SEPARATOR=:
|
|
+ (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
|
|
+ (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
|
|
+ PATH_SEPARATOR=';'
|
|
+ }
|
|
fi
|
|
|
|
|
|
@@ -65,20 +86,18 @@ fi
|
|
# there to prevent editors from complaining about space-tab.
|
|
# (If _AS_PATH_WALK were called with IFS unset, it would disable word
|
|
# splitting by setting IFS to empty value.)
|
|
-as_nl='
|
|
-'
|
|
IFS=" "" $as_nl"
|
|
|
|
# Find who we are. Look in the path if we contain no directory separator.
|
|
-case $0 in
|
|
+case $0 in #((
|
|
*[\\/]* ) as_myself=$0 ;;
|
|
*) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
|
for as_dir in $PATH
|
|
do
|
|
IFS=$as_save_IFS
|
|
test -z "$as_dir" && as_dir=.
|
|
- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
|
|
-done
|
|
+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
|
|
+ done
|
|
IFS=$as_save_IFS
|
|
|
|
;;
|
|
@@ -89,354 +108,323 @@ if test "x$as_myself" = x; then
|
|
as_myself=$0
|
|
fi
|
|
if test ! -f "$as_myself"; then
|
|
- echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
|
|
- { (exit 1); exit 1; }
|
|
+ $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
|
|
+ exit 1
|
|
fi
|
|
|
|
-# Work around bugs in pre-3.0 UWIN ksh.
|
|
-for as_var in ENV MAIL MAILPATH
|
|
-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
|
|
+# Unset variables that we do not need and which cause bugs (e.g. in
|
|
+# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1"
|
|
+# suppresses any "Segmentation fault" message there. '((' could
|
|
+# trigger a bug in pdksh 5.2.14.
|
|
+for as_var in BASH_ENV ENV MAIL MAILPATH
|
|
+do eval test x\${$as_var+set} = xset \
|
|
+ && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
|
|
done
|
|
PS1='$ '
|
|
PS2='> '
|
|
PS4='+ '
|
|
|
|
# NLS nuisances.
|
|
-for as_var in \
|
|
- LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
|
|
- LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
|
|
- LC_TELEPHONE LC_TIME
|
|
-do
|
|
- if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
|
|
- eval $as_var=C; export $as_var
|
|
- else
|
|
- ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
|
|
- fi
|
|
-done
|
|
-
|
|
-# Required to use basename.
|
|
-if expr a : '\(a\)' >/dev/null 2>&1 &&
|
|
- test "X`expr 00001 : '.*\(...\)'`" = X001; then
|
|
- as_expr=expr
|
|
-else
|
|
- as_expr=false
|
|
-fi
|
|
-
|
|
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
|
|
- as_basename=basename
|
|
-else
|
|
- as_basename=false
|
|
-fi
|
|
-
|
|
-
|
|
-# Name of the executable.
|
|
-as_me=`$as_basename -- "$0" ||
|
|
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
|
|
- X"$0" : 'X\(//\)$' \| \
|
|
- X"$0" : 'X\(/\)' \| . 2>/dev/null ||
|
|
-echo X/"$0" |
|
|
- sed '/^.*\/\([^/][^/]*\)\/*$/{
|
|
- s//\1/
|
|
- q
|
|
- }
|
|
- /^X\/\(\/\/\)$/{
|
|
- s//\1/
|
|
- q
|
|
- }
|
|
- /^X\/\(\/\).*/{
|
|
- s//\1/
|
|
- q
|
|
- }
|
|
- s/.*/./; q'`
|
|
+LC_ALL=C
|
|
+export LC_ALL
|
|
+LANGUAGE=C
|
|
+export LANGUAGE
|
|
|
|
# CDPATH.
|
|
-$as_unset CDPATH
|
|
-
|
|
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
|
|
|
|
if test "x$CONFIG_SHELL" = x; then
|
|
- if (eval ":") 2>/dev/null; then
|
|
- as_have_required=yes
|
|
+ as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
|
|
+ emulate sh
|
|
+ NULLCMD=:
|
|
+ # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
|
|
+ # is contrary to our usage. Disable this feature.
|
|
+ alias -g '\${1+\"\$@\"}'='\"\$@\"'
|
|
+ setopt NO_GLOB_SUBST
|
|
else
|
|
- as_have_required=no
|
|
+ case \`(set -o) 2>/dev/null\` in #(
|
|
+ *posix*) :
|
|
+ set -o posix ;; #(
|
|
+ *) :
|
|
+ ;;
|
|
+esac
|
|
fi
|
|
-
|
|
- if test $as_have_required = yes && (eval ":
|
|
-(as_func_return () {
|
|
- (exit \$1)
|
|
-}
|
|
-as_func_success () {
|
|
- as_func_return 0
|
|
-}
|
|
-as_func_failure () {
|
|
- as_func_return 1
|
|
-}
|
|
-as_func_ret_success () {
|
|
- return 0
|
|
-}
|
|
-as_func_ret_failure () {
|
|
- return 1
|
|
-}
|
|
+"
|
|
+ as_required="as_fn_return () { (exit \$1); }
|
|
+as_fn_success () { as_fn_return 0; }
|
|
+as_fn_failure () { as_fn_return 1; }
|
|
+as_fn_ret_success () { return 0; }
|
|
+as_fn_ret_failure () { return 1; }
|
|
|
|
exitcode=0
|
|
-if as_func_success; then
|
|
- :
|
|
-else
|
|
- exitcode=1
|
|
- echo as_func_success failed.
|
|
-fi
|
|
-
|
|
-if as_func_failure; then
|
|
- exitcode=1
|
|
- echo as_func_failure succeeded.
|
|
-fi
|
|
-
|
|
-if as_func_ret_success; then
|
|
- :
|
|
-else
|
|
- exitcode=1
|
|
- echo as_func_ret_success failed.
|
|
-fi
|
|
-
|
|
-if as_func_ret_failure; then
|
|
- exitcode=1
|
|
- echo as_func_ret_failure succeeded.
|
|
-fi
|
|
-
|
|
-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
|
|
- :
|
|
+as_fn_success || { exitcode=1; echo as_fn_success failed.; }
|
|
+as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
|
|
+as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
|
|
+as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
|
|
+if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
|
|
+
|
|
+else
|
|
+ exitcode=1; echo positional parameters were not saved.
|
|
+fi
|
|
+test x\$exitcode = x0 || exit 1"
|
|
+ as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
|
|
+ as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
|
|
+ eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
|
|
+ test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
|
|
+test \$(( 1 + 1 )) = 2 || exit 1"
|
|
+ if (eval "$as_required") 2>/dev/null; then :
|
|
+ as_have_required=yes
|
|
else
|
|
- exitcode=1
|
|
- echo positional parameters were not saved.
|
|
+ as_have_required=no
|
|
fi
|
|
+ if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
|
|
|
|
-test \$exitcode = 0) || { (exit 1); exit 1; }
|
|
-
|
|
-(
|
|
- as_lineno_1=\$LINENO
|
|
- as_lineno_2=\$LINENO
|
|
- test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
|
|
- test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
|
|
-") 2> /dev/null; then
|
|
- :
|
|
else
|
|
- as_candidate_shells=
|
|
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
|
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
|
+as_found=false
|
|
for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
|
|
do
|
|
IFS=$as_save_IFS
|
|
test -z "$as_dir" && as_dir=.
|
|
- case $as_dir in
|
|
+ as_found=:
|
|
+ case $as_dir in #(
|
|
/*)
|
|
for as_base in sh bash ksh sh5; do
|
|
- as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
|
|
+ # Try only shells that exist, to save several forks.
|
|
+ as_shell=$as_dir/$as_base
|
|
+ if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
|
|
+ { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
|
|
+ CONFIG_SHELL=$as_shell as_have_required=yes
|
|
+ if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
|
|
+ break 2
|
|
+fi
|
|
+fi
|
|
done;;
|
|
esac
|
|
+ as_found=false
|
|
done
|
|
+$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
|
|
+ { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
|
|
+ CONFIG_SHELL=$SHELL as_have_required=yes
|
|
+fi; }
|
|
IFS=$as_save_IFS
|
|
|
|
|
|
- for as_shell in $as_candidate_shells $SHELL; do
|
|
- # Try only shells that exist, to save several forks.
|
|
- if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
|
|
- { ("$as_shell") 2> /dev/null <<\_ASEOF
|
|
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
|
|
- emulate sh
|
|
- NULLCMD=:
|
|
- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
|
|
- # is contrary to our usage. Disable this feature.
|
|
- alias -g '${1+"$@"}'='"$@"'
|
|
- setopt NO_GLOB_SUBST
|
|
-else
|
|
- case `(set -o) 2>/dev/null` in
|
|
- *posix*) set -o posix ;;
|
|
-esac
|
|
-
|
|
+ if test "x$CONFIG_SHELL" != x; then :
|
|
+ # We cannot yet assume a decent shell, so we have to provide a
|
|
+ # neutralization value for shells without unset; and this also
|
|
+ # works around shells that cannot unset nonexistent variables.
|
|
+ BASH_ENV=/dev/null
|
|
+ ENV=/dev/null
|
|
+ (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
|
|
+ export CONFIG_SHELL
|
|
+ exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
|
|
+fi
|
|
+
|
|
+ if test x$as_have_required = xno; then :
|
|
+ $as_echo "$0: This script requires a shell more modern than all"
|
|
+ $as_echo "$0: the shells that I found on your system."
|
|
+ if test x${ZSH_VERSION+set} = xset ; then
|
|
+ $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
|
|
+ $as_echo "$0: be upgraded to zsh 4.3.4 or later."
|
|
+ else
|
|
+ $as_echo "$0: Please tell bug-autoconf@gnu.org and
|
|
+$0: http://bugzilla.gnome.org/enter_bug.cgi?product=libgtop
|
|
+$0: about your system, including any error possibly output
|
|
+$0: before this message. Then install a modern shell, or
|
|
+$0: manually run the script under such a shell if you do
|
|
+$0: have one."
|
|
+ fi
|
|
+ exit 1
|
|
fi
|
|
-
|
|
-
|
|
-:
|
|
-_ASEOF
|
|
-}; then
|
|
- CONFIG_SHELL=$as_shell
|
|
- as_have_required=yes
|
|
- if { "$as_shell" 2> /dev/null <<\_ASEOF
|
|
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
|
|
- emulate sh
|
|
- NULLCMD=:
|
|
- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
|
|
- # is contrary to our usage. Disable this feature.
|
|
- alias -g '${1+"$@"}'='"$@"'
|
|
- setopt NO_GLOB_SUBST
|
|
-else
|
|
- case `(set -o) 2>/dev/null` in
|
|
- *posix*) set -o posix ;;
|
|
-esac
|
|
-
|
|
fi
|
|
-
|
|
-
|
|
-:
|
|
-(as_func_return () {
|
|
- (exit $1)
|
|
-}
|
|
-as_func_success () {
|
|
- as_func_return 0
|
|
-}
|
|
-as_func_failure () {
|
|
- as_func_return 1
|
|
-}
|
|
-as_func_ret_success () {
|
|
- return 0
|
|
-}
|
|
-as_func_ret_failure () {
|
|
- return 1
|
|
-}
|
|
-
|
|
-exitcode=0
|
|
-if as_func_success; then
|
|
- :
|
|
-else
|
|
- exitcode=1
|
|
- echo as_func_success failed.
|
|
fi
|
|
+SHELL=${CONFIG_SHELL-/bin/sh}
|
|
+export SHELL
|
|
+# Unset more variables known to interfere with behavior of common tools.
|
|
+CLICOLOR_FORCE= GREP_OPTIONS=
|
|
+unset CLICOLOR_FORCE GREP_OPTIONS
|
|
|
|
-if as_func_failure; then
|
|
- exitcode=1
|
|
- echo as_func_failure succeeded.
|
|
-fi
|
|
+## --------------------- ##
|
|
+## M4sh Shell Functions. ##
|
|
+## --------------------- ##
|
|
+# as_fn_unset VAR
|
|
+# ---------------
|
|
+# Portably unset VAR.
|
|
+as_fn_unset ()
|
|
+{
|
|
+ { eval $1=; unset $1;}
|
|
+}
|
|
+as_unset=as_fn_unset
|
|
+
|
|
+# as_fn_set_status STATUS
|
|
+# -----------------------
|
|
+# Set $? to STATUS, without forking.
|
|
+as_fn_set_status ()
|
|
+{
|
|
+ return $1
|
|
+} # as_fn_set_status
|
|
+
|
|
+# as_fn_exit STATUS
|
|
+# -----------------
|
|
+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
|
|
+as_fn_exit ()
|
|
+{
|
|
+ set +e
|
|
+ as_fn_set_status $1
|
|
+ exit $1
|
|
+} # as_fn_exit
|
|
+
|
|
+# as_fn_mkdir_p
|
|
+# -------------
|
|
+# Create "$as_dir" as a directory, including parents if necessary.
|
|
+as_fn_mkdir_p ()
|
|
+{
|
|
|
|
-if as_func_ret_success; then
|
|
- :
|
|
-else
|
|
- exitcode=1
|
|
- echo as_func_ret_success failed.
|
|
-fi
|
|
+ case $as_dir in #(
|
|
+ -*) as_dir=./$as_dir;;
|
|
+ esac
|
|
+ test -d "$as_dir" || eval $as_mkdir_p || {
|
|
+ as_dirs=
|
|
+ while :; do
|
|
+ case $as_dir in #(
|
|
+ *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
|
|
+ *) as_qdir=$as_dir;;
|
|
+ esac
|
|
+ as_dirs="'$as_qdir' $as_dirs"
|
|
+ as_dir=`$as_dirname -- "$as_dir" ||
|
|
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
|
|
+ X"$as_dir" : 'X\(//\)[^/]' \| \
|
|
+ X"$as_dir" : 'X\(//\)$' \| \
|
|
+ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
|
|
+$as_echo X"$as_dir" |
|
|
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
|
|
+ s//\1/
|
|
+ q
|
|
+ }
|
|
+ /^X\(\/\/\)[^/].*/{
|
|
+ s//\1/
|
|
+ q
|
|
+ }
|
|
+ /^X\(\/\/\)$/{
|
|
+ s//\1/
|
|
+ q
|
|
+ }
|
|
+ /^X\(\/\).*/{
|
|
+ s//\1/
|
|
+ q
|
|
+ }
|
|
+ s/.*/./; q'`
|
|
+ test -d "$as_dir" && break
|
|
+ done
|
|
+ test -z "$as_dirs" || eval "mkdir $as_dirs"
|
|
+ } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
|
|
|
|
-if as_func_ret_failure; then
|
|
- exitcode=1
|
|
- echo as_func_ret_failure succeeded.
|
|
-fi
|
|
|
|
-if ( set x; as_func_ret_success y && test x = "$1" ); then
|
|
- :
|
|
+} # as_fn_mkdir_p
|
|
+# as_fn_append VAR VALUE
|
|
+# ----------------------
|
|
+# Append the text in VALUE to the end of the definition contained in VAR. Take
|
|
+# advantage of any shell optimizations that allow amortized linear growth over
|
|
+# repeated appends, instead of the typical quadratic growth present in naive
|
|
+# implementations.
|
|
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
|
|
+ eval 'as_fn_append ()
|
|
+ {
|
|
+ eval $1+=\$2
|
|
+ }'
|
|
else
|
|
- exitcode=1
|
|
- echo positional parameters were not saved.
|
|
-fi
|
|
-
|
|
-test $exitcode = 0) || { (exit 1); exit 1; }
|
|
-
|
|
-(
|
|
- as_lineno_1=$LINENO
|
|
- as_lineno_2=$LINENO
|
|
- test "x$as_lineno_1" != "x$as_lineno_2" &&
|
|
- test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
|
|
-
|
|
-_ASEOF
|
|
-}; then
|
|
- break
|
|
-fi
|
|
-
|
|
-fi
|
|
-
|
|
- done
|
|
-
|
|
- if test "x$CONFIG_SHELL" != x; then
|
|
- for as_var in BASH_ENV ENV
|
|
- do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
|
|
- done
|
|
- export CONFIG_SHELL
|
|
- exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
|
|
-fi
|
|
-
|
|
-
|
|
- if test $as_have_required = no; then
|
|
- echo This script requires a shell more modern than all the
|
|
- echo shells that I found on your system. Please install a
|
|
- echo modern shell, or manually run the script under such a
|
|
- echo shell if you do have one.
|
|
- { (exit 1); exit 1; }
|
|
-fi
|
|
-
|
|
-
|
|
-fi
|
|
-
|
|
-fi
|
|
+ as_fn_append ()
|
|
+ {
|
|
+ eval $1=\$$1\$2
|
|
+ }
|
|
+fi # as_fn_append
|
|
|
|
+# as_fn_arith ARG...
|
|
+# ------------------
|
|
+# Perform arithmetic evaluation on the ARGs, and store the result in the
|
|
+# global $as_val. Take advantage of shells that can avoid forks. The arguments
|
|
+# must be portable across $(()) and expr.
|
|
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
|
|
+ eval 'as_fn_arith ()
|
|
+ {
|
|
+ as_val=$(( $* ))
|
|
+ }'
|
|
+else
|
|
+ as_fn_arith ()
|
|
+ {
|
|
+ as_val=`expr "$@" || test $? -eq 1`
|
|
+ }
|
|
+fi # as_fn_arith
|
|
|
|
|
|
-(eval "as_func_return () {
|
|
- (exit \$1)
|
|
-}
|
|
-as_func_success () {
|
|
- as_func_return 0
|
|
-}
|
|
-as_func_failure () {
|
|
- as_func_return 1
|
|
-}
|
|
-as_func_ret_success () {
|
|
- return 0
|
|
-}
|
|
-as_func_ret_failure () {
|
|
- return 1
|
|
-}
|
|
+# as_fn_error ERROR [LINENO LOG_FD]
|
|
+# ---------------------------------
|
|
+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
|
|
+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
|
|
+# script with status $?, using 1 if that was 0.
|
|
+as_fn_error ()
|
|
+{
|
|
+ as_status=$?; test $as_status -eq 0 && as_status=1
|
|
+ if test "$3"; then
|
|
+ as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
|
|
+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
|
|
+ fi
|
|
+ $as_echo "$as_me: error: $1" >&2
|
|
+ as_fn_exit $as_status
|
|
+} # as_fn_error
|
|
|
|
-exitcode=0
|
|
-if as_func_success; then
|
|
- :
|
|
+if expr a : '\(a\)' >/dev/null 2>&1 &&
|
|
+ test "X`expr 00001 : '.*\(...\)'`" = X001; then
|
|
+ as_expr=expr
|
|
else
|
|
- exitcode=1
|
|
- echo as_func_success failed.
|
|
-fi
|
|
-
|
|
-if as_func_failure; then
|
|
- exitcode=1
|
|
- echo as_func_failure succeeded.
|
|
+ as_expr=false
|
|
fi
|
|
|
|
-if as_func_ret_success; then
|
|
- :
|
|
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
|
|
+ as_basename=basename
|
|
else
|
|
- exitcode=1
|
|
- echo as_func_ret_success failed.
|
|
-fi
|
|
-
|
|
-if as_func_ret_failure; then
|
|
- exitcode=1
|
|
- echo as_func_ret_failure succeeded.
|
|
+ as_basename=false
|
|
fi
|
|
|
|
-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
|
|
- :
|
|
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
|
|
+ as_dirname=dirname
|
|
else
|
|
- exitcode=1
|
|
- echo positional parameters were not saved.
|
|
+ as_dirname=false
|
|
fi
|
|
|
|
-test \$exitcode = 0") || {
|
|
- echo No shell found that supports shell functions.
|
|
- echo Please tell autoconf@gnu.org about your system,
|
|
- echo including any error possibly output before this
|
|
- echo message
|
|
-}
|
|
+as_me=`$as_basename -- "$0" ||
|
|
+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
|
|
+ X"$0" : 'X\(//\)$' \| \
|
|
+ X"$0" : 'X\(/\)' \| . 2>/dev/null ||
|
|
+$as_echo X/"$0" |
|
|
+ sed '/^.*\/\([^/][^/]*\)\/*$/{
|
|
+ s//\1/
|
|
+ q
|
|
+ }
|
|
+ /^X\/\(\/\/\)$/{
|
|
+ s//\1/
|
|
+ q
|
|
+ }
|
|
+ /^X\/\(\/\).*/{
|
|
+ s//\1/
|
|
+ q
|
|
+ }
|
|
+ s/.*/./; q'`
|
|
|
|
+# Avoid depending upon Character Ranges.
|
|
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
|
|
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
|
|
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
|
|
+as_cr_digits='0123456789'
|
|
+as_cr_alnum=$as_cr_Letters$as_cr_digits
|
|
|
|
|
|
- as_lineno_1=$LINENO
|
|
- as_lineno_2=$LINENO
|
|
- test "x$as_lineno_1" != "x$as_lineno_2" &&
|
|
- test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
|
|
-
|
|
- # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
|
|
- # uniformly replaced by the line number. The first 'sed' inserts a
|
|
- # line-number line after each line using $LINENO; the second 'sed'
|
|
- # does the real work. The second script uses 'N' to pair each
|
|
- # line-number line with the line containing $LINENO, and appends
|
|
- # trailing '-' during substitution so that $LINENO is not a special
|
|
- # case at line end.
|
|
- # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
|
|
- # scripts with optimization help from Paolo Bonzini. Blame Lee
|
|
- # E. McMahon (1931-1989) for sed's syntax. :-)
|
|
+ as_lineno_1=$LINENO as_lineno_1a=$LINENO
|
|
+ as_lineno_2=$LINENO as_lineno_2a=$LINENO
|
|
+ eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
|
|
+ test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
|
|
+ # Blame Lee E. McMahon (1931-1989) for sed's syntax. :-)
|
|
sed -n '
|
|
p
|
|
/[$]LINENO/=
|
|
@@ -453,8 +441,7 @@ test \$exitcode = 0") || {
|
|
s/-\n.*//
|
|
' >$as_me.lineno &&
|
|
chmod +x "$as_me.lineno" ||
|
|
- { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
|
|
- { (exit 1); exit 1; }; }
|
|
+ { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
|
|
|
|
# Don't try to exec as it changes $[0], causing all sort of problems
|
|
# (the dirname of $[0] is not the place where we might find the
|
|
@@ -464,49 +451,40 @@ test \$exitcode = 0") || {
|
|
exit
|
|
}
|
|
|
|
-
|
|
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
|
|
- as_dirname=dirname
|
|
-else
|
|
- as_dirname=false
|
|
-fi
|
|
-
|
|
ECHO_C= ECHO_N= ECHO_T=
|
|
-case `echo -n x` in
|
|
+case `echo -n x` in #(((((
|
|
-n*)
|
|
- case `echo 'x\c'` in
|
|
+ case `echo 'xy\c'` in
|
|
*c*) ECHO_T=' ';; # ECHO_T is single tab character.
|
|
- *) ECHO_C='\c';;
|
|
+ xy) ECHO_C='\c';;
|
|
+ *) echo `echo ksh88 bug on AIX 6.1` > /dev/null
|
|
+ ECHO_T=' ';;
|
|
esac;;
|
|
*)
|
|
ECHO_N='-n';;
|
|
esac
|
|
|
|
-if expr a : '\(a\)' >/dev/null 2>&1 &&
|
|
- test "X`expr 00001 : '.*\(...\)'`" = X001; then
|
|
- as_expr=expr
|
|
-else
|
|
- as_expr=false
|
|
-fi
|
|
-
|
|
rm -f conf$$ conf$$.exe conf$$.file
|
|
if test -d conf$$.dir; then
|
|
rm -f conf$$.dir/conf$$.file
|
|
else
|
|
rm -f conf$$.dir
|
|
- mkdir conf$$.dir
|
|
+ mkdir conf$$.dir 2>/dev/null
|
|
fi
|
|
-echo >conf$$.file
|
|
-if ln -s conf$$.file conf$$ 2>/dev/null; then
|
|
- as_ln_s='ln -s'
|
|
- # ... but there are two gotchas:
|
|
- # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
|
|
- # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
|
|
- # In both cases, we have to default to `cp -p'.
|
|
- ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
|
|
+if (echo >conf$$.file) 2>/dev/null; then
|
|
+ if ln -s conf$$.file conf$$ 2>/dev/null; then
|
|
+ as_ln_s='ln -s'
|
|
+ # ... but there are two gotchas:
|
|
+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
|
|
+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
|
|
+ # In both cases, we have to default to `cp -p'.
|
|
+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
|
|
+ as_ln_s='cp -p'
|
|
+ elif ln conf$$.file conf$$ 2>/dev/null; then
|
|
+ as_ln_s=ln
|
|
+ else
|
|
as_ln_s='cp -p'
|
|
-elif ln conf$$.file conf$$ 2>/dev/null; then
|
|
- as_ln_s=ln
|
|
+ fi
|
|
else
|
|
as_ln_s='cp -p'
|
|
fi
|
|
@@ -514,7 +492,7 @@ rm -f conf$$ conf$$.exe conf$$.dir/conf$
|
|
rmdir conf$$.dir 2>/dev/null
|
|
|
|
if mkdir -p . 2>/dev/null; then
|
|
- as_mkdir_p=:
|
|
+ as_mkdir_p='mkdir -p "$as_dir"'
|
|
else
|
|
test -d ./-p && rmdir ./-p
|
|
as_mkdir_p=false
|
|
@@ -531,12 +509,12 @@ else
|
|
as_test_x='
|
|
eval sh -c '\''
|
|
if test -d "$1"; then
|
|
- test -d "$1/.";
|
|
+ test -d "$1/.";
|
|
else
|
|
- case $1 in
|
|
- -*)set "./$1";;
|
|
+ case $1 in #(
|
|
+ -*)set "./$1";;
|
|
esac;
|
|
- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
|
|
+ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
|
|
???[sx]*):;;*)false;;esac;fi
|
|
'\'' sh
|
|
'
|
|
@@ -551,7 +529,6 @@ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr
|
|
|
|
|
|
|
|
-
|
|
# Check that we are running under the correct shell.
|
|
SHELL=${CONFIG_SHELL-/bin/sh}
|
|
|
|
@@ -718,7 +695,6 @@ cross_compiling=no
|
|
subdirs=
|
|
MFLAGS=
|
|
MAKEFLAGS=
|
|
-SHELL=${CONFIG_SHELL-/bin/sh}
|
|
|
|
# Identity of this package.
|
|
PACKAGE_NAME='libgtop'
|
|
@@ -726,6 +702,7 @@ PACKAGE_TARNAME='libgtop'
|
|
PACKAGE_VERSION='2.28.0'
|
|
PACKAGE_STRING='libgtop 2.28.0'
|
|
PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=libgtop'
|
|
+PACKAGE_URL=''
|
|
|
|
ac_unique_file="copyright.txt"
|
|
# Factoring default headers for most tests.
|
|
@@ -764,214 +741,237 @@ ac_includes_default="\
|
|
# include <unistd.h>
|
|
#endif"
|
|
|
|
-ac_subst_vars='SHELL
|
|
-PATH_SEPARATOR
|
|
-PACKAGE_NAME
|
|
-PACKAGE_TARNAME
|
|
-PACKAGE_VERSION
|
|
-PACKAGE_STRING
|
|
-PACKAGE_BUGREPORT
|
|
-exec_prefix
|
|
-prefix
|
|
-program_transform_name
|
|
-bindir
|
|
-sbindir
|
|
-libexecdir
|
|
-datarootdir
|
|
-datadir
|
|
-sysconfdir
|
|
-sharedstatedir
|
|
-localstatedir
|
|
-includedir
|
|
-oldincludedir
|
|
-docdir
|
|
-infodir
|
|
-htmldir
|
|
-dvidir
|
|
-pdfdir
|
|
-psdir
|
|
-libdir
|
|
-localedir
|
|
-mandir
|
|
-DEFS
|
|
-ECHO_C
|
|
-ECHO_N
|
|
-ECHO_T
|
|
-LIBS
|
|
+ac_subst_vars='am__EXEEXT_FALSE
|
|
+am__EXEEXT_TRUE
|
|
+LTLIBOBJS
|
|
+GTK_DOC_USE_LIBTOOL_FALSE
|
|
+GTK_DOC_USE_LIBTOOL_TRUE
|
|
+ENABLE_GTK_DOC_FALSE
|
|
+ENABLE_GTK_DOC_TRUE
|
|
+GTKDOC_CHECK
|
|
+HTML_DIR
|
|
+server_programs
|
|
+sysdeps_suid_lib
|
|
+LIBGTOP_SERVER
|
|
+LIBGTOP_BINDIR
|
|
+LIBGTOP_INCS
|
|
+LIBGTOP_LIBS
|
|
+LIBGTOP_EXTRA_LIBS
|
|
+INCLUDES
|
|
+machine_incs
|
|
+sysdeps_dir
|
|
+libs_xauth
|
|
+X_EXTRA_LIBS
|
|
+X_LIBS
|
|
+X_PRE_LIBS
|
|
+X_CFLAGS
|
|
+XMKMF
|
|
+MKINSTALLDIRS
|
|
+POSUB
|
|
+POFILES
|
|
+PO_IN_DATADIR_FALSE
|
|
+PO_IN_DATADIR_TRUE
|
|
+INTLLIBS
|
|
+INSTOBJEXT
|
|
+GMOFILES
|
|
+CATOBJEXT
|
|
+CATALOGS
|
|
+MSGFMT_OPTS
|
|
+GETTEXT_PACKAGE
|
|
+DATADIRNAME
|
|
+ALL_LINGUAS
|
|
+INTLTOOL_PERL
|
|
+GMSGFMT
|
|
+MSGFMT
|
|
+MSGMERGE
|
|
+XGETTEXT
|
|
+INTLTOOL_POLICY_RULE
|
|
+INTLTOOL_SERVICE_RULE
|
|
+INTLTOOL_THEME_RULE
|
|
+INTLTOOL_SCHEMAS_RULE
|
|
+INTLTOOL_CAVES_RULE
|
|
+INTLTOOL_XML_NOMERGE_RULE
|
|
+INTLTOOL_XML_RULE
|
|
+INTLTOOL_KBD_RULE
|
|
+INTLTOOL_XAM_RULE
|
|
+INTLTOOL_UI_RULE
|
|
+INTLTOOL_SOUNDLIST_RULE
|
|
+INTLTOOL_SHEET_RULE
|
|
+INTLTOOL_SERVER_RULE
|
|
+INTLTOOL_PONG_RULE
|
|
+INTLTOOL_OAF_RULE
|
|
+INTLTOOL_PROP_RULE
|
|
+INTLTOOL_KEYS_RULE
|
|
+INTLTOOL_DIRECTORY_RULE
|
|
+INTLTOOL_DESKTOP_RULE
|
|
+INTLTOOL_EXTRACT
|
|
+INTLTOOL_MERGE
|
|
+INTLTOOL_UPDATE
|
|
+USE_NLS
|
|
+ALLOCA
|
|
+DL_LIB
|
|
+LIBOBJS
|
|
+GLIB_LIBS
|
|
+GLIB_CFLAGS
|
|
+PKG_CONFIG
|
|
+LIBGTOP_SYSDEPS_PRIVATE_FSUSAGE_FALSE
|
|
+LIBGTOP_SYSDEPS_PRIVATE_FSUSAGE_TRUE
|
|
+LIBGTOP_SYSDEPS_PRIVATE_MOUNTLIST_FALSE
|
|
+LIBGTOP_SYSDEPS_PRIVATE_MOUNTLIST_TRUE
|
|
+NEED_LIBGTOP_FALSE
|
|
+NEED_LIBGTOP_TRUE
|
|
+EXTRA_SYSDEPS_LIBS
|
|
+KVM_LIBS
|
|
+libgtop_have_sysinfo
|
|
+libgtop_postinstall
|
|
+LIBGTOP_SMP_FALSE
|
|
+LIBGTOP_SMP_TRUE
|
|
+HACKER_MODE_FALSE
|
|
+HACKER_MODE_TRUE
|
|
+EXAMPLES_FALSE
|
|
+EXAMPLES_TRUE
|
|
+libgtop_need_server
|
|
+libgtop_use_machine_h
|
|
+libgtop_sysdeps_dir
|
|
+CROSS_COMPILING_FALSE
|
|
+CROSS_COMPILING_TRUE
|
|
+OTOOL64
|
|
+OTOOL
|
|
+LIPO
|
|
+NMEDIT
|
|
+DSYMUTIL
|
|
+lt_ECHO
|
|
+OBJDUMP
|
|
+NM
|
|
+ac_ct_DUMPBIN
|
|
+DUMPBIN
|
|
+LD
|
|
+FGREP
|
|
+SED
|
|
+LIBTOOL
|
|
+LN_S
|
|
+AR
|
|
+AS
|
|
+RANLIB
|
|
+PERL
|
|
+libgtop_top_builddir
|
|
+EGREP
|
|
+GREP
|
|
+CPP
|
|
+am__fastdepCC_FALSE
|
|
+am__fastdepCC_TRUE
|
|
+CCDEPMODE
|
|
+AMDEPBACKSLASH
|
|
+AMDEP_FALSE
|
|
+AMDEP_TRUE
|
|
+am__quote
|
|
+am__include
|
|
+DEPDIR
|
|
+OBJEXT
|
|
+EXEEXT
|
|
+ac_ct_CC
|
|
+CPPFLAGS
|
|
+LDFLAGS
|
|
+CFLAGS
|
|
+CC
|
|
+LT_VERSION_INFO
|
|
+LIBGTOP_VERSION_CODE
|
|
+LIBGTOP_VERSION
|
|
+LIBGTOP_SERVER_VERSION
|
|
+LIBGTOP_MICRO_VERSION
|
|
+LIBGTOP_MINOR_VERSION
|
|
+LIBGTOP_MAJOR_VERSION
|
|
+ACLOCAL_AMFLAGS
|
|
+am__untar
|
|
+am__tar
|
|
+AMTAR
|
|
+am__leading_dot
|
|
+SET_MAKE
|
|
+AWK
|
|
+mkdir_p
|
|
+MKDIR_P
|
|
+INSTALL_STRIP_PROGRAM
|
|
+STRIP
|
|
+install_sh
|
|
+MAKEINFO
|
|
+AUTOHEADER
|
|
+AUTOMAKE
|
|
+AUTOCONF
|
|
+ACLOCAL
|
|
+VERSION
|
|
+PACKAGE
|
|
+CYGPATH_W
|
|
+am__isrc
|
|
+INSTALL_DATA
|
|
+INSTALL_SCRIPT
|
|
+INSTALL_PROGRAM
|
|
+host_os
|
|
+host_vendor
|
|
+host_cpu
|
|
+host
|
|
+build_os
|
|
+build_vendor
|
|
+build_cpu
|
|
+build
|
|
+target_alias
|
|
+host_alias
|
|
build_alias
|
|
-host_alias
|
|
-target_alias
|
|
-build
|
|
-build_cpu
|
|
-build_vendor
|
|
-build_os
|
|
-host
|
|
-host_cpu
|
|
-host_vendor
|
|
-host_os
|
|
-INSTALL_PROGRAM
|
|
-INSTALL_SCRIPT
|
|
-INSTALL_DATA
|
|
-am__isrc
|
|
-CYGPATH_W
|
|
-PACKAGE
|
|
-VERSION
|
|
-ACLOCAL
|
|
-AUTOCONF
|
|
-AUTOMAKE
|
|
-AUTOHEADER
|
|
-MAKEINFO
|
|
-install_sh
|
|
-STRIP
|
|
-INSTALL_STRIP_PROGRAM
|
|
-mkdir_p
|
|
-AWK
|
|
-SET_MAKE
|
|
-am__leading_dot
|
|
-AMTAR
|
|
-am__tar
|
|
-am__untar
|
|
-ACLOCAL_AMFLAGS
|
|
-LIBGTOP_MAJOR_VERSION
|
|
-LIBGTOP_MINOR_VERSION
|
|
-LIBGTOP_MICRO_VERSION
|
|
-LIBGTOP_SERVER_VERSION
|
|
-LIBGTOP_VERSION
|
|
-LIBGTOP_VERSION_CODE
|
|
-LT_VERSION_INFO
|
|
-CC
|
|
-CFLAGS
|
|
-LDFLAGS
|
|
-CPPFLAGS
|
|
-ac_ct_CC
|
|
-EXEEXT
|
|
-OBJEXT
|
|
-DEPDIR
|
|
-am__include
|
|
-am__quote
|
|
-AMDEP_TRUE
|
|
-AMDEP_FALSE
|
|
-AMDEPBACKSLASH
|
|
-CCDEPMODE
|
|
-am__fastdepCC_TRUE
|
|
-am__fastdepCC_FALSE
|
|
-CPP
|
|
-GREP
|
|
-EGREP
|
|
-libgtop_top_builddir
|
|
-PERL
|
|
-RANLIB
|
|
-AS
|
|
-AR
|
|
-LN_S
|
|
-LIBTOOL
|
|
-SED
|
|
-FGREP
|
|
-LD
|
|
-DUMPBIN
|
|
-ac_ct_DUMPBIN
|
|
-NM
|
|
-OBJDUMP
|
|
-lt_ECHO
|
|
-DSYMUTIL
|
|
-NMEDIT
|
|
-LIPO
|
|
-OTOOL
|
|
-OTOOL64
|
|
-CROSS_COMPILING_TRUE
|
|
-CROSS_COMPILING_FALSE
|
|
-libgtop_sysdeps_dir
|
|
-libgtop_use_machine_h
|
|
-libgtop_need_server
|
|
-EXAMPLES_TRUE
|
|
-EXAMPLES_FALSE
|
|
-HACKER_MODE_TRUE
|
|
-HACKER_MODE_FALSE
|
|
-LIBGTOP_SMP_TRUE
|
|
-LIBGTOP_SMP_FALSE
|
|
-libgtop_postinstall
|
|
-libgtop_have_sysinfo
|
|
-KVM_LIBS
|
|
-EXTRA_SYSDEPS_LIBS
|
|
-NEED_LIBGTOP_TRUE
|
|
-NEED_LIBGTOP_FALSE
|
|
-LIBGTOP_SYSDEPS_PRIVATE_MOUNTLIST_TRUE
|
|
-LIBGTOP_SYSDEPS_PRIVATE_MOUNTLIST_FALSE
|
|
-LIBGTOP_SYSDEPS_PRIVATE_FSUSAGE_TRUE
|
|
-LIBGTOP_SYSDEPS_PRIVATE_FSUSAGE_FALSE
|
|
-PKG_CONFIG
|
|
-GLIB_CFLAGS
|
|
-GLIB_LIBS
|
|
-LIBOBJS
|
|
-DL_LIB
|
|
-ALLOCA
|
|
-INTLTOOL_UPDATE
|
|
-INTLTOOL_MERGE
|
|
-INTLTOOL_EXTRACT
|
|
-INTLTOOL_DESKTOP_RULE
|
|
-INTLTOOL_DIRECTORY_RULE
|
|
-INTLTOOL_KEYS_RULE
|
|
-INTLTOOL_PROP_RULE
|
|
-INTLTOOL_OAF_RULE
|
|
-INTLTOOL_PONG_RULE
|
|
-INTLTOOL_SERVER_RULE
|
|
-INTLTOOL_SHEET_RULE
|
|
-INTLTOOL_SOUNDLIST_RULE
|
|
-INTLTOOL_UI_RULE
|
|
-INTLTOOL_XAM_RULE
|
|
-INTLTOOL_KBD_RULE
|
|
-INTLTOOL_XML_RULE
|
|
-INTLTOOL_XML_NOMERGE_RULE
|
|
-INTLTOOL_CAVES_RULE
|
|
-INTLTOOL_SCHEMAS_RULE
|
|
-INTLTOOL_THEME_RULE
|
|
-INTLTOOL_SERVICE_RULE
|
|
-INTLTOOL_POLICY_RULE
|
|
-XGETTEXT
|
|
-MSGMERGE
|
|
-MSGFMT
|
|
-INTLTOOL_PERL
|
|
-ALL_LINGUAS
|
|
-DATADIRNAME
|
|
-GETTEXT_PACKAGE
|
|
-USE_NLS
|
|
-MSGFMT_OPTS
|
|
-GMSGFMT
|
|
-CATALOGS
|
|
-CATOBJEXT
|
|
-GMOFILES
|
|
-INSTOBJEXT
|
|
-INTLLIBS
|
|
-PO_IN_DATADIR_TRUE
|
|
-PO_IN_DATADIR_FALSE
|
|
-POFILES
|
|
-POSUB
|
|
-MKINSTALLDIRS
|
|
-XMKMF
|
|
-X_CFLAGS
|
|
-X_PRE_LIBS
|
|
-X_LIBS
|
|
-X_EXTRA_LIBS
|
|
-libs_xauth
|
|
-sysdeps_dir
|
|
-machine_incs
|
|
-INCLUDES
|
|
-LIBGTOP_EXTRA_LIBS
|
|
-LIBGTOP_LIBS
|
|
-LIBGTOP_INCS
|
|
-LIBGTOP_BINDIR
|
|
-LIBGTOP_SERVER
|
|
-sysdeps_suid_lib
|
|
-server_programs
|
|
-HTML_DIR
|
|
-GTKDOC_CHECK
|
|
-ENABLE_GTK_DOC_TRUE
|
|
-ENABLE_GTK_DOC_FALSE
|
|
-GTK_DOC_USE_LIBTOOL_TRUE
|
|
-GTK_DOC_USE_LIBTOOL_FALSE
|
|
-LTLIBOBJS'
|
|
-ac_subst_files=''
|
|
- ac_precious_vars='build_alias
|
|
+LIBS
|
|
+ECHO_T
|
|
+ECHO_N
|
|
+ECHO_C
|
|
+DEFS
|
|
+mandir
|
|
+localedir
|
|
+libdir
|
|
+psdir
|
|
+pdfdir
|
|
+dvidir
|
|
+htmldir
|
|
+infodir
|
|
+docdir
|
|
+oldincludedir
|
|
+includedir
|
|
+localstatedir
|
|
+sharedstatedir
|
|
+sysconfdir
|
|
+datadir
|
|
+datarootdir
|
|
+libexecdir
|
|
+sbindir
|
|
+bindir
|
|
+program_transform_name
|
|
+prefix
|
|
+exec_prefix
|
|
+PACKAGE_URL
|
|
+PACKAGE_BUGREPORT
|
|
+PACKAGE_STRING
|
|
+PACKAGE_VERSION
|
|
+PACKAGE_TARNAME
|
|
+PACKAGE_NAME
|
|
+PATH_SEPARATOR
|
|
+SHELL'
|
|
+ac_subst_files=''
|
|
+ac_user_opts='
|
|
+enable_option_checking
|
|
+enable_dependency_tracking
|
|
+enable_shared
|
|
+enable_static
|
|
+with_pic
|
|
+enable_fast_install
|
|
+with_gnu_ld
|
|
+enable_libtool_lock
|
|
+with_libgtop_examples
|
|
+enable_hacker_mode
|
|
+with_libgtop_smp
|
|
+enable_nls
|
|
+with_x
|
|
+enable_debug
|
|
+enable_fatal_warnings
|
|
+with_html_dir
|
|
+enable_gtk_doc
|
|
+'
|
|
+ ac_precious_vars='build_alias
|
|
host_alias
|
|
target_alias
|
|
CC
|
|
@@ -989,6 +989,8 @@ XMKMF'
|
|
# Initialize some variables set by options.
|
|
ac_init_help=
|
|
ac_init_version=false
|
|
+ac_unrecognized_opts=
|
|
+ac_unrecognized_sep=
|
|
# The variables have the same names as the options, with
|
|
# dashes changed to underlines.
|
|
cache_file=/dev/null
|
|
@@ -1087,13 +1089,20 @@ do
|
|
datarootdir=$ac_optarg ;;
|
|
|
|
-disable-* | --disable-*)
|
|
- ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
|
|
+ ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
|
|
# Reject names that are not valid shell variable names.
|
|
- expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
|
|
- { echo "$as_me: error: invalid feature name: $ac_feature" >&2
|
|
- { (exit 1); exit 1; }; }
|
|
- ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
|
|
- eval enable_$ac_feature=no ;;
|
|
+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
|
|
+ as_fn_error "invalid feature name: $ac_useropt"
|
|
+ ac_useropt_orig=$ac_useropt
|
|
+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
|
|
+ case $ac_user_opts in
|
|
+ *"
|
|
+"enable_$ac_useropt"
|
|
+"*) ;;
|
|
+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
|
|
+ ac_unrecognized_sep=', ';;
|
|
+ esac
|
|
+ eval enable_$ac_useropt=no ;;
|
|
|
|
-docdir | --docdir | --docdi | --doc | --do)
|
|
ac_prev=docdir ;;
|
|
@@ -1106,13 +1115,20 @@ do
|
|
dvidir=$ac_optarg ;;
|
|
|
|
-enable-* | --enable-*)
|
|
- ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
|
|
+ ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
|
|
# Reject names that are not valid shell variable names.
|
|
- expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
|
|
- { echo "$as_me: error: invalid feature name: $ac_feature" >&2
|
|
- { (exit 1); exit 1; }; }
|
|
- ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
|
|
- eval enable_$ac_feature=\$ac_optarg ;;
|
|
+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
|
|
+ as_fn_error "invalid feature name: $ac_useropt"
|
|
+ ac_useropt_orig=$ac_useropt
|
|
+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
|
|
+ case $ac_user_opts in
|
|
+ *"
|
|
+"enable_$ac_useropt"
|
|
+"*) ;;
|
|
+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
|
|
+ ac_unrecognized_sep=', ';;
|
|
+ esac
|
|
+ eval enable_$ac_useropt=\$ac_optarg ;;
|
|
|
|
-exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
|
|
| --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
|
|
@@ -1303,22 +1319,36 @@ do
|
|
ac_init_version=: ;;
|
|
|
|
-with-* | --with-*)
|
|
- ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
|
|
+ ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
|
|
# Reject names that are not valid shell variable names.
|
|
- expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
|
|
- { echo "$as_me: error: invalid package name: $ac_package" >&2
|
|
- { (exit 1); exit 1; }; }
|
|
- ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
|
|
- eval with_$ac_package=\$ac_optarg ;;
|
|
+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
|
|
+ as_fn_error "invalid package name: $ac_useropt"
|
|
+ ac_useropt_orig=$ac_useropt
|
|
+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
|
|
+ case $ac_user_opts in
|
|
+ *"
|
|
+"with_$ac_useropt"
|
|
+"*) ;;
|
|
+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
|
|
+ ac_unrecognized_sep=', ';;
|
|
+ esac
|
|
+ eval with_$ac_useropt=\$ac_optarg ;;
|
|
|
|
-without-* | --without-*)
|
|
- ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
|
|
+ ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
|
|
# Reject names that are not valid shell variable names.
|
|
- expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
|
|
- { echo "$as_me: error: invalid package name: $ac_package" >&2
|
|
- { (exit 1); exit 1; }; }
|
|
- ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
|
|
- eval with_$ac_package=no ;;
|
|
+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
|
|
+ as_fn_error "invalid package name: $ac_useropt"
|
|
+ ac_useropt_orig=$ac_useropt
|
|
+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
|
|
+ case $ac_user_opts in
|
|
+ *"
|
|
+"with_$ac_useropt"
|
|
+"*) ;;
|
|
+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
|
|
+ ac_unrecognized_sep=', ';;
|
|
+ esac
|
|
+ eval with_$ac_useropt=no ;;
|
|
|
|
--x)
|
|
# Obsolete; use --with-x.
|
|
@@ -1338,25 +1368,25 @@ do
|
|
| --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
|
|
x_libraries=$ac_optarg ;;
|
|
|
|
- -*) { echo "$as_me: error: unrecognized option: $ac_option
|
|
-Try \`$0 --help' for more information." >&2
|
|
- { (exit 1); exit 1; }; }
|
|
+ -*) as_fn_error "unrecognized option: \`$ac_option'
|
|
+Try \`$0 --help' for more information."
|
|
;;
|
|
|
|
*=*)
|
|
ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
|
|
# Reject names that are not valid shell variable names.
|
|
- expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
|
|
- { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
|
|
- { (exit 1); exit 1; }; }
|
|
+ case $ac_envvar in #(
|
|
+ '' | [0-9]* | *[!_$as_cr_alnum]* )
|
|
+ as_fn_error "invalid variable name: \`$ac_envvar'" ;;
|
|
+ esac
|
|
eval $ac_envvar=\$ac_optarg
|
|
export $ac_envvar ;;
|
|
|
|
*)
|
|
# FIXME: should be removed in autoconf 3.0.
|
|
- echo "$as_me: WARNING: you should use --build, --host, --target" >&2
|
|
+ $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
|
|
expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
|
|
- echo "$as_me: WARNING: invalid host type: $ac_option" >&2
|
|
+ $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
|
|
: ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
|
|
;;
|
|
|
|
@@ -1365,23 +1395,36 @@ done
|
|
|
|
if test -n "$ac_prev"; then
|
|
ac_option=--`echo $ac_prev | sed 's/_/-/g'`
|
|
- { echo "$as_me: error: missing argument to $ac_option" >&2
|
|
- { (exit 1); exit 1; }; }
|
|
+ as_fn_error "missing argument to $ac_option"
|
|
+fi
|
|
+
|
|
+if test -n "$ac_unrecognized_opts"; then
|
|
+ case $enable_option_checking in
|
|
+ no) ;;
|
|
+ fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
|
|
+ *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
|
|
+ esac
|
|
fi
|
|
|
|
-# Be sure to have absolute directory names.
|
|
+# Check all directory arguments for consistency.
|
|
for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
|
|
datadir sysconfdir sharedstatedir localstatedir includedir \
|
|
oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
|
|
libdir localedir mandir
|
|
do
|
|
eval ac_val=\$$ac_var
|
|
+ # Remove trailing slashes.
|
|
+ case $ac_val in
|
|
+ */ )
|
|
+ ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
|
|
+ eval $ac_var=\$ac_val;;
|
|
+ esac
|
|
+ # Be sure to have absolute directory names.
|
|
case $ac_val in
|
|
[\\/$]* | ?:[\\/]* ) continue;;
|
|
NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
|
|
esac
|
|
- { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
|
|
- { (exit 1); exit 1; }; }
|
|
+ as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
|
|
done
|
|
|
|
# There might be people who depend on the old broken behavior: `$host'
|
|
@@ -1395,7 +1438,7 @@ target=$target_alias
|
|
if test "x$host_alias" != x; then
|
|
if test "x$build_alias" = x; then
|
|
cross_compiling=maybe
|
|
- echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
|
|
+ $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
|
|
If a cross compiler is detected then cross compile mode will be used." >&2
|
|
elif test "x$build_alias" != "x$host_alias"; then
|
|
cross_compiling=yes
|
|
@@ -1411,23 +1454,21 @@ test "$silent" = yes && exec 6>/dev/null
|
|
ac_pwd=`pwd` && test -n "$ac_pwd" &&
|
|
ac_ls_di=`ls -di .` &&
|
|
ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
|
|
- { echo "$as_me: error: Working directory cannot be determined" >&2
|
|
- { (exit 1); exit 1; }; }
|
|
+ as_fn_error "working directory cannot be determined"
|
|
test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
|
|
- { echo "$as_me: error: pwd does not report name of working directory" >&2
|
|
- { (exit 1); exit 1; }; }
|
|
+ as_fn_error "pwd does not report name of working directory"
|
|
|
|
|
|
# Find the source files, if location was not specified.
|
|
if test -z "$srcdir"; then
|
|
ac_srcdir_defaulted=yes
|
|
# Try the directory containing this script, then the parent directory.
|
|
- ac_confdir=`$as_dirname -- "$0" ||
|
|
-$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
|
|
- X"$0" : 'X\(//\)[^/]' \| \
|
|
- X"$0" : 'X\(//\)$' \| \
|
|
- X"$0" : 'X\(/\)' \| . 2>/dev/null ||
|
|
-echo X"$0" |
|
|
+ ac_confdir=`$as_dirname -- "$as_myself" ||
|
|
+$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
|
|
+ X"$as_myself" : 'X\(//\)[^/]' \| \
|
|
+ X"$as_myself" : 'X\(//\)$' \| \
|
|
+ X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
|
|
+$as_echo X"$as_myself" |
|
|
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
|
|
s//\1/
|
|
q
|
|
@@ -1454,13 +1495,11 @@ else
|
|
fi
|
|
if test ! -r "$srcdir/$ac_unique_file"; then
|
|
test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
|
|
- { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
|
|
- { (exit 1); exit 1; }; }
|
|
+ as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
|
|
fi
|
|
ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
|
|
ac_abs_confdir=`(
|
|
- cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2
|
|
- { (exit 1); exit 1; }; }
|
|
+ cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
|
|
pwd)`
|
|
# When building in place, set srcdir=.
|
|
if test "$ac_abs_confdir" = "$ac_pwd"; then
|
|
@@ -1508,9 +1547,9 @@ Configuration:
|
|
|
|
Installation directories:
|
|
--prefix=PREFIX install architecture-independent files in PREFIX
|
|
- [$ac_default_prefix]
|
|
+ [$ac_default_prefix]
|
|
--exec-prefix=EPREFIX install architecture-dependent files in EPREFIX
|
|
- [PREFIX]
|
|
+ [PREFIX]
|
|
|
|
By default, \`make install' will install all the files in
|
|
\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify
|
|
@@ -1520,25 +1559,25 @@ for instance \`--prefix=\$HOME'.
|
|
For better control, use the options below.
|
|
|
|
Fine tuning of the installation directories:
|
|
- --bindir=DIR user executables [EPREFIX/bin]
|
|
- --sbindir=DIR system admin executables [EPREFIX/sbin]
|
|
- --libexecdir=DIR program executables [EPREFIX/libexec]
|
|
- --sysconfdir=DIR read-only single-machine data [PREFIX/etc]
|
|
- --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
|
|
- --localstatedir=DIR modifiable single-machine data [PREFIX/var]
|
|
- --libdir=DIR object code libraries [EPREFIX/lib]
|
|
- --includedir=DIR C header files [PREFIX/include]
|
|
- --oldincludedir=DIR C header files for non-gcc [/usr/include]
|
|
- --datarootdir=DIR read-only arch.-independent data root [PREFIX/share]
|
|
- --datadir=DIR read-only architecture-independent data [DATAROOTDIR]
|
|
- --infodir=DIR info documentation [DATAROOTDIR/info]
|
|
- --localedir=DIR locale-dependent data [DATAROOTDIR/locale]
|
|
- --mandir=DIR man documentation [DATAROOTDIR/man]
|
|
- --docdir=DIR documentation root [DATAROOTDIR/doc/libgtop]
|
|
- --htmldir=DIR html documentation [DOCDIR]
|
|
- --dvidir=DIR dvi documentation [DOCDIR]
|
|
- --pdfdir=DIR pdf documentation [DOCDIR]
|
|
- --psdir=DIR ps documentation [DOCDIR]
|
|
+ --bindir=DIR user executables [EPREFIX/bin]
|
|
+ --sbindir=DIR system admin executables [EPREFIX/sbin]
|
|
+ --libexecdir=DIR program executables [EPREFIX/libexec]
|
|
+ --sysconfdir=DIR read-only single-machine data [PREFIX/etc]
|
|
+ --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
|
|
+ --localstatedir=DIR modifiable single-machine data [PREFIX/var]
|
|
+ --libdir=DIR object code libraries [EPREFIX/lib]
|
|
+ --includedir=DIR C header files [PREFIX/include]
|
|
+ --oldincludedir=DIR C header files for non-gcc [/usr/include]
|
|
+ --datarootdir=DIR read-only arch.-independent data root [PREFIX/share]
|
|
+ --datadir=DIR read-only architecture-independent data [DATAROOTDIR]
|
|
+ --infodir=DIR info documentation [DATAROOTDIR/info]
|
|
+ --localedir=DIR locale-dependent data [DATAROOTDIR/locale]
|
|
+ --mandir=DIR man documentation [DATAROOTDIR/man]
|
|
+ --docdir=DIR documentation root [DATAROOTDIR/doc/libgtop]
|
|
+ --htmldir=DIR html documentation [DOCDIR]
|
|
+ --dvidir=DIR dvi documentation [DOCDIR]
|
|
+ --pdfdir=DIR pdf documentation [DOCDIR]
|
|
+ --psdir=DIR ps documentation [DOCDIR]
|
|
_ACEOF
|
|
|
|
cat <<\_ACEOF
|
|
@@ -1565,6 +1604,7 @@ if test -n "$ac_init_help"; then
|
|
cat <<\_ACEOF
|
|
|
|
Optional Features:
|
|
+ --disable-option-checking ignore unrecognized --enable/--with options
|
|
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
|
|
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
|
|
--disable-dependency-tracking speeds up one-time build
|
|
@@ -1575,6 +1615,7 @@ Optional Features:
|
|
optimize for fast installation [default=yes]
|
|
--disable-libtool-lock avoid locking (might break parallel builds)
|
|
--enable-hacker-mode Enable building of unstable sysdeps
|
|
+ --disable-nls do not use Native Language Support
|
|
--enable-debug Turn on debugging [default=no]
|
|
--enable-fatal-warnings Make all warnings fatal [debug=no]
|
|
--enable-gtk-doc use gtk-doc to build documentation [default=no]
|
|
@@ -1615,15 +1656,17 @@ fi
|
|
if test "$ac_init_help" = "recursive"; then
|
|
# If there are subdirs, report their specific --help.
|
|
for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
|
|
- test -d "$ac_dir" || continue
|
|
+ test -d "$ac_dir" ||
|
|
+ { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
|
|
+ continue
|
|
ac_builddir=.
|
|
|
|
case "$ac_dir" in
|
|
.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
|
|
*)
|
|
- ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
|
|
+ ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
|
|
# A ".." for each directory in $ac_dir_suffix.
|
|
- ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
|
|
+ ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
|
|
case $ac_top_builddir_sub in
|
|
"") ac_top_builddir_sub=. ac_top_build_prefix= ;;
|
|
*) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
|
|
@@ -1659,7 +1702,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_
|
|
echo &&
|
|
$SHELL "$ac_srcdir/configure" --help=recursive
|
|
else
|
|
- echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
|
|
+ $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
|
|
fi || ac_status=$?
|
|
cd "$ac_pwd" || { ac_status=$?; break; }
|
|
done
|
|
@@ -1669,61 +1712,529 @@ test -n "$ac_init_help" && exit $ac_stat
|
|
if $ac_init_version; then
|
|
cat <<\_ACEOF
|
|
libgtop configure 2.28.0
|
|
-generated by GNU Autoconf 2.61
|
|
+generated by GNU Autoconf 2.64
|
|
|
|
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
|
|
-2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
|
|
+Copyright (C) 2009 Free Software Foundation, Inc.
|
|
This configure script is free software; the Free Software Foundation
|
|
gives unlimited permission to copy, distribute and modify it.
|
|
_ACEOF
|
|
exit
|
|
fi
|
|
-cat >config.log <<_ACEOF
|
|
-This file contains any messages produced by compilers while
|
|
-running configure, to aid debugging if configure makes a mistake.
|
|
|
|
-It was created by libgtop $as_me 2.28.0, which was
|
|
-generated by GNU Autoconf 2.61. Invocation command line was
|
|
+## ------------------------ ##
|
|
+## Autoconf initialization. ##
|
|
+## ------------------------ ##
|
|
+
|
|
+# ac_fn_c_try_compile LINENO
|
|
+# --------------------------
|
|
+# Try to compile conftest.$ac_ext, and return whether this succeeded.
|
|
+ac_fn_c_try_compile ()
|
|
+{
|
|
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
|
|
+ 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 ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
|
|
+$as_echo "$ac_try_echo"; } >&5
|
|
+ (eval "$ac_compile") 2>conftest.err
|
|
+ ac_status=$?
|
|
+ if test -s conftest.err; then
|
|
+ grep -v '^ *+' conftest.err >conftest.er1
|
|
+ cat conftest.er1 >&5
|
|
+ mv -f conftest.er1 conftest.err
|
|
+ fi
|
|
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
|
+ test $ac_status = 0; } && {
|
|
+ test -z "$ac_c_werror_flag" ||
|
|
+ test ! -s conftest.err
|
|
+ } && test -s conftest.$ac_objext; then :
|
|
+ ac_retval=0
|
|
+else
|
|
+ $as_echo "$as_me: failed program was:" >&5
|
|
+sed 's/^/| /' conftest.$ac_ext >&5
|
|
|
|
- $ $0 $@
|
|
+ ac_retval=1
|
|
+fi
|
|
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
|
|
+ return $ac_retval
|
|
|
|
-_ACEOF
|
|
-exec 5>>config.log
|
|
+} # ac_fn_c_try_compile
|
|
+
|
|
+# ac_fn_c_try_link LINENO
|
|
+# -----------------------
|
|
+# Try to link conftest.$ac_ext, and return whether this succeeded.
|
|
+ac_fn_c_try_link ()
|
|
{
|
|
-cat <<_ASUNAME
|
|
-## --------- ##
|
|
-## Platform. ##
|
|
-## --------- ##
|
|
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
|
|
+ rm -f conftest.$ac_objext conftest$ac_exeext
|
|
+ if { { ac_try="$ac_link"
|
|
+case "(($ac_try" in
|
|
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
+ *) ac_try_echo=$ac_try;;
|
|
+esac
|
|
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
|
|
+$as_echo "$ac_try_echo"; } >&5
|
|
+ (eval "$ac_link") 2>conftest.err
|
|
+ ac_status=$?
|
|
+ if test -s conftest.err; then
|
|
+ grep -v '^ *+' conftest.err >conftest.er1
|
|
+ cat conftest.er1 >&5
|
|
+ mv -f conftest.er1 conftest.err
|
|
+ fi
|
|
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
|
+ test $ac_status = 0; } && {
|
|
+ test -z "$ac_c_werror_flag" ||
|
|
+ test ! -s conftest.err
|
|
+ } && test -s conftest$ac_exeext && {
|
|
+ test "$cross_compiling" = yes ||
|
|
+ $as_test_x conftest$ac_exeext
|
|
+ }; then :
|
|
+ ac_retval=0
|
|
+else
|
|
+ $as_echo "$as_me: failed program was:" >&5
|
|
+sed 's/^/| /' conftest.$ac_ext >&5
|
|
|
|
-hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
|
|
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
|
|
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
|
|
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
|
|
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
|
|
+ ac_retval=1
|
|
+fi
|
|
+ # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
|
|
+ # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
|
|
+ # interfere with the next link command; also delete a directory that is
|
|
+ # left behind by Apple's compiler. We do this before executing the actions.
|
|
+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo
|
|
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
|
|
+ return $ac_retval
|
|
|
|
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
|
|
-/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown`
|
|
+} # ac_fn_c_try_link
|
|
|
|
-/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown`
|
|
-/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown`
|
|
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
|
|
-/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown`
|
|
-/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown`
|
|
-/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown`
|
|
-/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown`
|
|
+# ac_fn_c_try_cpp LINENO
|
|
+# ----------------------
|
|
+# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
|
|
+ac_fn_c_try_cpp ()
|
|
+{
|
|
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
|
|
+ if { { ac_try="$ac_cpp conftest.$ac_ext"
|
|
+case "(($ac_try" in
|
|
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
+ *) ac_try_echo=$ac_try;;
|
|
+esac
|
|
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
|
|
+$as_echo "$ac_try_echo"; } >&5
|
|
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
|
|
+ ac_status=$?
|
|
+ if test -s conftest.err; then
|
|
+ grep -v '^ *+' conftest.err >conftest.er1
|
|
+ cat conftest.er1 >&5
|
|
+ mv -f conftest.er1 conftest.err
|
|
+ fi
|
|
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
|
+ test $ac_status = 0; } >/dev/null && {
|
|
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
|
|
+ test ! -s conftest.err
|
|
+ }; then :
|
|
+ ac_retval=0
|
|
+else
|
|
+ $as_echo "$as_me: failed program was:" >&5
|
|
+sed 's/^/| /' conftest.$ac_ext >&5
|
|
|
|
-_ASUNAME
|
|
+ ac_retval=1
|
|
+fi
|
|
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
|
|
+ return $ac_retval
|
|
|
|
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
|
-for as_dir in $PATH
|
|
-do
|
|
- IFS=$as_save_IFS
|
|
- test -z "$as_dir" && as_dir=.
|
|
- echo "PATH: $as_dir"
|
|
-done
|
|
-IFS=$as_save_IFS
|
|
+} # ac_fn_c_try_cpp
|
|
|
|
-} >&5
|
|
+# ac_fn_c_try_run LINENO
|
|
+# ----------------------
|
|
+# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
|
|
+# that executables *can* be run.
|
|
+ac_fn_c_try_run ()
|
|
+{
|
|
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
|
|
+ if { { ac_try="$ac_link"
|
|
+case "(($ac_try" in
|
|
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
+ *) ac_try_echo=$ac_try;;
|
|
+esac
|
|
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
|
|
+$as_echo "$ac_try_echo"; } >&5
|
|
+ (eval "$ac_link") 2>&5
|
|
+ ac_status=$?
|
|
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
|
+ test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
|
|
+ { { case "(($ac_try" in
|
|
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
+ *) ac_try_echo=$ac_try;;
|
|
+esac
|
|
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
|
|
+$as_echo "$ac_try_echo"; } >&5
|
|
+ (eval "$ac_try") 2>&5
|
|
+ ac_status=$?
|
|
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
|
+ test $ac_status = 0; }; }; then :
|
|
+ ac_retval=0
|
|
+else
|
|
+ $as_echo "$as_me: program exited with status $ac_status" >&5
|
|
+ $as_echo "$as_me: failed program was:" >&5
|
|
+sed 's/^/| /' conftest.$ac_ext >&5
|
|
+
|
|
+ ac_retval=$ac_status
|
|
+fi
|
|
+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo
|
|
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
|
|
+ return $ac_retval
|
|
+
|
|
+} # ac_fn_c_try_run
|
|
+
|
|
+# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
|
|
+# -------------------------------------------------------
|
|
+# Tests whether HEADER exists and can be compiled using the include files in
|
|
+# INCLUDES, setting the cache variable VAR accordingly.
|
|
+ac_fn_c_check_header_compile ()
|
|
+{
|
|
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
|
|
+$as_echo_n "checking for $2... " >&6; }
|
|
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
+else
|
|
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
+/* end confdefs.h. */
|
|
+$4
|
|
+#include <$2>
|
|
+_ACEOF
|
|
+if ac_fn_c_try_compile "$LINENO"; then :
|
|
+ eval "$3=yes"
|
|
+else
|
|
+ eval "$3=no"
|
|
+fi
|
|
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
+fi
|
|
+eval ac_res=\$$3
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
|
|
+$as_echo "$ac_res" >&6; }
|
|
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
|
|
+
|
|
+} # ac_fn_c_check_header_compile
|
|
+
|
|
+# ac_fn_c_check_func LINENO FUNC VAR
|
|
+# ----------------------------------
|
|
+# Tests whether FUNC exists, setting the cache variable VAR accordingly
|
|
+ac_fn_c_check_func ()
|
|
+{
|
|
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
|
|
+$as_echo_n "checking for $2... " >&6; }
|
|
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
+else
|
|
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
+/* end confdefs.h. */
|
|
+/* Define $2 to an innocuous variant, in case <limits.h> declares $2.
|
|
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
|
|
+#define $2 innocuous_$2
|
|
+
|
|
+/* System header to define __stub macros and hopefully few prototypes,
|
|
+ which can conflict with char $2 (); below.
|
|
+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
|
|
+ <limits.h> exists even on freestanding compilers. */
|
|
+
|
|
+#ifdef __STDC__
|
|
+# include <limits.h>
|
|
+#else
|
|
+# include <assert.h>
|
|
+#endif
|
|
+
|
|
+#undef $2
|
|
+
|
|
+/* Override any GCC internal prototype to avoid an error.
|
|
+ Use char because int might match the return type of a GCC
|
|
+ builtin and then its argument prototype would still apply. */
|
|
+#ifdef __cplusplus
|
|
+extern "C"
|
|
+#endif
|
|
+char $2 ();
|
|
+/* The GNU C library defines this for functions which it implements
|
|
+ to always fail with ENOSYS. Some functions are actually named
|
|
+ something starting with __ and the normal name is an alias. */
|
|
+#if defined __stub_$2 || defined __stub___$2
|
|
+choke me
|
|
+#endif
|
|
+
|
|
+int
|
|
+main ()
|
|
+{
|
|
+return $2 ();
|
|
+ ;
|
|
+ return 0;
|
|
+}
|
|
+_ACEOF
|
|
+if ac_fn_c_try_link "$LINENO"; then :
|
|
+ eval "$3=yes"
|
|
+else
|
|
+ eval "$3=no"
|
|
+fi
|
|
+rm -f core conftest.err conftest.$ac_objext \
|
|
+ conftest$ac_exeext conftest.$ac_ext
|
|
+fi
|
|
+eval ac_res=\$$3
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
|
|
+$as_echo "$ac_res" >&6; }
|
|
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
|
|
+
|
|
+} # ac_fn_c_check_func
|
|
+
|
|
+# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
|
|
+# -------------------------------------------------------
|
|
+# Tests whether HEADER exists, giving a warning if it cannot be compiled using
|
|
+# the include files in INCLUDES and setting the cache variable VAR
|
|
+# accordingly.
|
|
+ac_fn_c_check_header_mongrel ()
|
|
+{
|
|
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
|
|
+ if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
|
|
+$as_echo_n "checking for $2... " >&6; }
|
|
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
+fi
|
|
+eval ac_res=\$$3
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
|
|
+$as_echo "$ac_res" >&6; }
|
|
+else
|
|
+ # Is the header compilable?
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
|
|
+$as_echo_n "checking $2 usability... " >&6; }
|
|
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
+/* end confdefs.h. */
|
|
+$4
|
|
+#include <$2>
|
|
+_ACEOF
|
|
+if ac_fn_c_try_compile "$LINENO"; then :
|
|
+ ac_header_compiler=yes
|
|
+else
|
|
+ ac_header_compiler=no
|
|
+fi
|
|
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
|
|
+$as_echo "$ac_header_compiler" >&6; }
|
|
+
|
|
+# Is the header present?
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
|
|
+$as_echo_n "checking $2 presence... " >&6; }
|
|
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
+/* end confdefs.h. */
|
|
+#include <$2>
|
|
+_ACEOF
|
|
+if ac_fn_c_try_cpp "$LINENO"; then :
|
|
+ ac_header_preproc=yes
|
|
+else
|
|
+ ac_header_preproc=no
|
|
+fi
|
|
+rm -f conftest.err conftest.$ac_ext
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
|
|
+$as_echo "$ac_header_preproc" >&6; }
|
|
+
|
|
+# So? What about this header?
|
|
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
|
|
+ yes:no: )
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
|
|
+$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
|
|
+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
|
|
+ ;;
|
|
+ no:yes:* )
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
|
|
+$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5
|
|
+$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;}
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
|
|
+$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5
|
|
+$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;}
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
|
|
+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
|
|
+( cat <<\_ASBOX
|
|
+## ---------------------------------------------------------------------- ##
|
|
+## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=libgtop ##
|
|
+## ---------------------------------------------------------------------- ##
|
|
+_ASBOX
|
|
+ ) | sed "s/^/$as_me: WARNING: /" >&2
|
|
+ ;;
|
|
+esac
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
|
|
+$as_echo_n "checking for $2... " >&6; }
|
|
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
+else
|
|
+ eval "$3=\$ac_header_compiler"
|
|
+fi
|
|
+eval ac_res=\$$3
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
|
|
+$as_echo "$ac_res" >&6; }
|
|
+fi
|
|
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
|
|
+
|
|
+} # ac_fn_c_check_header_mongrel
|
|
+
|
|
+# ac_fn_c_check_type LINENO TYPE VAR INCLUDES
|
|
+# -------------------------------------------
|
|
+# Tests whether TYPE exists after having included INCLUDES, setting cache
|
|
+# variable VAR accordingly.
|
|
+ac_fn_c_check_type ()
|
|
+{
|
|
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
|
|
+$as_echo_n "checking for $2... " >&6; }
|
|
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
+else
|
|
+ eval "$3=no"
|
|
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
+/* end confdefs.h. */
|
|
+$4
|
|
+int
|
|
+main ()
|
|
+{
|
|
+if (sizeof ($2))
|
|
+ return 0;
|
|
+ ;
|
|
+ return 0;
|
|
+}
|
|
+_ACEOF
|
|
+if ac_fn_c_try_compile "$LINENO"; then :
|
|
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
+/* end confdefs.h. */
|
|
+$4
|
|
+int
|
|
+main ()
|
|
+{
|
|
+if (sizeof (($2)))
|
|
+ return 0;
|
|
+ ;
|
|
+ return 0;
|
|
+}
|
|
+_ACEOF
|
|
+if ac_fn_c_try_compile "$LINENO"; then :
|
|
+
|
|
+else
|
|
+ eval "$3=yes"
|
|
+fi
|
|
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
+fi
|
|
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
+fi
|
|
+eval ac_res=\$$3
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
|
|
+$as_echo "$ac_res" >&6; }
|
|
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
|
|
+
|
|
+} # ac_fn_c_check_type
|
|
+
|
|
+# ac_fn_c_check_member LINENO AGGR MEMBER VAR INCLUDES
|
|
+# ----------------------------------------------------
|
|
+# Tries to find if the field MEMBER exists in type AGGR, after including
|
|
+# INCLUDES, setting cache variable VAR accordingly.
|
|
+ac_fn_c_check_member ()
|
|
+{
|
|
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5
|
|
+$as_echo_n "checking for $2.$3... " >&6; }
|
|
+if { as_var=$4; eval "test \"\${$as_var+set}\" = set"; }; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
+else
|
|
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
+/* end confdefs.h. */
|
|
+$5
|
|
+int
|
|
+main ()
|
|
+{
|
|
+static $2 ac_aggr;
|
|
+if (ac_aggr.$3)
|
|
+return 0;
|
|
+ ;
|
|
+ return 0;
|
|
+}
|
|
+_ACEOF
|
|
+if ac_fn_c_try_compile "$LINENO"; then :
|
|
+ eval "$4=yes"
|
|
+else
|
|
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
+/* end confdefs.h. */
|
|
+$5
|
|
+int
|
|
+main ()
|
|
+{
|
|
+static $2 ac_aggr;
|
|
+if (sizeof ac_aggr.$3)
|
|
+return 0;
|
|
+ ;
|
|
+ return 0;
|
|
+}
|
|
+_ACEOF
|
|
+if ac_fn_c_try_compile "$LINENO"; then :
|
|
+ eval "$4=yes"
|
|
+else
|
|
+ eval "$4=no"
|
|
+fi
|
|
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
+fi
|
|
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
+fi
|
|
+eval ac_res=\$$4
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
|
|
+$as_echo "$ac_res" >&6; }
|
|
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
|
|
+
|
|
+} # ac_fn_c_check_member
|
|
+cat >config.log <<_ACEOF
|
|
+This file contains any messages produced by compilers while
|
|
+running configure, to aid debugging if configure makes a mistake.
|
|
+
|
|
+It was created by libgtop $as_me 2.28.0, which was
|
|
+generated by GNU Autoconf 2.64. Invocation command line was
|
|
+
|
|
+ $ $0 $@
|
|
+
|
|
+_ACEOF
|
|
+exec 5>>config.log
|
|
+{
|
|
+cat <<_ASUNAME
|
|
+## --------- ##
|
|
+## Platform. ##
|
|
+## --------- ##
|
|
+
|
|
+hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
|
|
+uname -m = `(uname -m) 2>/dev/null || echo unknown`
|
|
+uname -r = `(uname -r) 2>/dev/null || echo unknown`
|
|
+uname -s = `(uname -s) 2>/dev/null || echo unknown`
|
|
+uname -v = `(uname -v) 2>/dev/null || echo unknown`
|
|
+
|
|
+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
|
|
+/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown`
|
|
+
|
|
+/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown`
|
|
+/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown`
|
|
+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
|
|
+/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown`
|
|
+/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown`
|
|
+/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown`
|
|
+/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown`
|
|
+
|
|
+_ASUNAME
|
|
+
|
|
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
|
+for as_dir in $PATH
|
|
+do
|
|
+ IFS=$as_save_IFS
|
|
+ test -z "$as_dir" && as_dir=.
|
|
+ $as_echo "PATH: $as_dir"
|
|
+ done
|
|
+IFS=$as_save_IFS
|
|
+
|
|
+} >&5
|
|
|
|
cat >&5 <<_ACEOF
|
|
|
|
@@ -1754,12 +2265,12 @@ do
|
|
| -silent | --silent | --silen | --sile | --sil)
|
|
continue ;;
|
|
*\'*)
|
|
- ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
|
|
+ ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
|
|
esac
|
|
case $ac_pass in
|
|
- 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
|
|
+ 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
|
|
2)
|
|
- ac_configure_args1="$ac_configure_args1 '$ac_arg'"
|
|
+ as_fn_append ac_configure_args1 " '$ac_arg'"
|
|
if test $ac_must_keep_next = true; then
|
|
ac_must_keep_next=false # Got value, back to normal.
|
|
else
|
|
@@ -1775,13 +2286,13 @@ do
|
|
-* ) ac_must_keep_next=true ;;
|
|
esac
|
|
fi
|
|
- ac_configure_args="$ac_configure_args '$ac_arg'"
|
|
+ as_fn_append ac_configure_args " '$ac_arg'"
|
|
;;
|
|
esac
|
|
done
|
|
done
|
|
-$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
|
|
-$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
|
|
+{ ac_configure_args0=; unset ac_configure_args0;}
|
|
+{ ac_configure_args1=; unset ac_configure_args1;}
|
|
|
|
# When interrupted or exit'd, cleanup temporary files, and complete
|
|
# config.log. We remove comments because anyway the quotes in there
|
|
@@ -1806,12 +2317,13 @@ _ASBOX
|
|
case $ac_val in #(
|
|
*${as_nl}*)
|
|
case $ac_var in #(
|
|
- *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
|
|
-echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
|
|
+ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
|
|
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
|
|
esac
|
|
case $ac_var in #(
|
|
_ | IFS | as_nl) ;; #(
|
|
- *) $as_unset $ac_var ;;
|
|
+ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
|
|
+ *) { eval $ac_var=; unset $ac_var;} ;;
|
|
esac ;;
|
|
esac
|
|
done
|
|
@@ -1840,9 +2352,9 @@ _ASBOX
|
|
do
|
|
eval ac_val=\$$ac_var
|
|
case $ac_val in
|
|
- *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
|
|
+ *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
|
|
esac
|
|
- echo "$ac_var='\''$ac_val'\''"
|
|
+ $as_echo "$ac_var='\''$ac_val'\''"
|
|
done | sort
|
|
echo
|
|
|
|
@@ -1857,9 +2369,9 @@ _ASBOX
|
|
do
|
|
eval ac_val=\$$ac_var
|
|
case $ac_val in
|
|
- *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
|
|
+ *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
|
|
esac
|
|
- echo "$ac_var='\''$ac_val'\''"
|
|
+ $as_echo "$ac_var='\''$ac_val'\''"
|
|
done | sort
|
|
echo
|
|
fi
|
|
@@ -1875,64 +2387,69 @@ _ASBOX
|
|
echo
|
|
fi
|
|
test "$ac_signal" != 0 &&
|
|
- echo "$as_me: caught signal $ac_signal"
|
|
- echo "$as_me: exit $exit_status"
|
|
+ $as_echo "$as_me: caught signal $ac_signal"
|
|
+ $as_echo "$as_me: exit $exit_status"
|
|
} >&5
|
|
rm -f core *.core core.conftest.* &&
|
|
rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
|
|
exit $exit_status
|
|
' 0
|
|
for ac_signal in 1 2 13 15; do
|
|
- trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
|
|
+ trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal
|
|
done
|
|
ac_signal=0
|
|
|
|
# confdefs.h avoids OS command line length limits that DEFS can exceed.
|
|
rm -f -r conftest* confdefs.h
|
|
|
|
+$as_echo "/* confdefs.h */" > confdefs.h
|
|
+
|
|
# Predefined preprocessor variables.
|
|
|
|
cat >>confdefs.h <<_ACEOF
|
|
#define PACKAGE_NAME "$PACKAGE_NAME"
|
|
_ACEOF
|
|
|
|
-
|
|
cat >>confdefs.h <<_ACEOF
|
|
#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
|
|
_ACEOF
|
|
|
|
-
|
|
cat >>confdefs.h <<_ACEOF
|
|
#define PACKAGE_VERSION "$PACKAGE_VERSION"
|
|
_ACEOF
|
|
|
|
-
|
|
cat >>confdefs.h <<_ACEOF
|
|
#define PACKAGE_STRING "$PACKAGE_STRING"
|
|
_ACEOF
|
|
|
|
-
|
|
cat >>confdefs.h <<_ACEOF
|
|
#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
|
|
_ACEOF
|
|
|
|
+cat >>confdefs.h <<_ACEOF
|
|
+#define PACKAGE_URL "$PACKAGE_URL"
|
|
+_ACEOF
|
|
+
|
|
|
|
# Let the site file select an alternate cache file if it wants to.
|
|
-# Prefer explicitly selected file to automatically selected ones.
|
|
+# Prefer an explicitly selected file to automatically selected ones.
|
|
+ac_site_file1=NONE
|
|
+ac_site_file2=NONE
|
|
if test -n "$CONFIG_SITE"; then
|
|
- set x "$CONFIG_SITE"
|
|
+ ac_site_file1=$CONFIG_SITE
|
|
elif test "x$prefix" != xNONE; then
|
|
- set x "$prefix/share/config.site" "$prefix/etc/config.site"
|
|
+ ac_site_file1=$prefix/share/config.site
|
|
+ ac_site_file2=$prefix/etc/config.site
|
|
else
|
|
- set x "$ac_default_prefix/share/config.site" \
|
|
- "$ac_default_prefix/etc/config.site"
|
|
+ ac_site_file1=$ac_default_prefix/share/config.site
|
|
+ ac_site_file2=$ac_default_prefix/etc/config.site
|
|
fi
|
|
-shift
|
|
-for ac_site_file
|
|
+for ac_site_file in "$ac_site_file1" "$ac_site_file2"
|
|
do
|
|
+ test "x$ac_site_file" = xNONE && continue
|
|
if test -r "$ac_site_file"; then
|
|
- { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
|
|
-echo "$as_me: loading site script $ac_site_file" >&6;}
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
|
|
+$as_echo "$as_me: loading site script $ac_site_file" >&6;}
|
|
sed 's/^/| /' "$ac_site_file" >&5
|
|
. "$ac_site_file"
|
|
fi
|
|
@@ -1942,16 +2459,16 @@ if test -r "$cache_file"; then
|
|
# Some versions of bash will fail to source /dev/null (special
|
|
# files actually), so we avoid doing that.
|
|
if test -f "$cache_file"; then
|
|
- { echo "$as_me:$LINENO: loading cache $cache_file" >&5
|
|
-echo "$as_me: loading cache $cache_file" >&6;}
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
|
|
+$as_echo "$as_me: loading cache $cache_file" >&6;}
|
|
case $cache_file in
|
|
[\\/]* | ?:[\\/]* ) . "$cache_file";;
|
|
*) . "./$cache_file";;
|
|
esac
|
|
fi
|
|
else
|
|
- { echo "$as_me:$LINENO: creating cache $cache_file" >&5
|
|
-echo "$as_me: creating cache $cache_file" >&6;}
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
|
|
+$as_echo "$as_me: creating cache $cache_file" >&6;}
|
|
>$cache_file
|
|
fi
|
|
|
|
@@ -1965,68 +2482,56 @@ for ac_var in $ac_precious_vars; do
|
|
eval ac_new_val=\$ac_env_${ac_var}_value
|
|
case $ac_old_set,$ac_new_set in
|
|
set,)
|
|
- { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
|
|
-echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
|
|
+$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
|
|
ac_cache_corrupted=: ;;
|
|
,set)
|
|
- { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
|
|
-echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
|
|
+$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
|
|
ac_cache_corrupted=: ;;
|
|
,);;
|
|
*)
|
|
if test "x$ac_old_val" != "x$ac_new_val"; then
|
|
- { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
|
|
-echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
|
|
- { echo "$as_me:$LINENO: former value: $ac_old_val" >&5
|
|
-echo "$as_me: former value: $ac_old_val" >&2;}
|
|
- { echo "$as_me:$LINENO: current value: $ac_new_val" >&5
|
|
-echo "$as_me: current value: $ac_new_val" >&2;}
|
|
- ac_cache_corrupted=:
|
|
+ # differences in whitespace do not lead to failure.
|
|
+ ac_old_val_w=`echo x $ac_old_val`
|
|
+ ac_new_val_w=`echo x $ac_new_val`
|
|
+ if test "$ac_old_val_w" != "$ac_new_val_w"; then
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
|
|
+$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
|
|
+ ac_cache_corrupted=:
|
|
+ else
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
|
|
+$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
|
|
+ eval $ac_var=\$ac_old_val
|
|
+ fi
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5
|
|
+$as_echo "$as_me: former value: \`$ac_old_val'" >&2;}
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5
|
|
+$as_echo "$as_me: current value: \`$ac_new_val'" >&2;}
|
|
fi;;
|
|
esac
|
|
# Pass precious variables to config.status.
|
|
if test "$ac_new_set" = set; then
|
|
case $ac_new_val in
|
|
- *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
|
|
+ *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
|
|
*) ac_arg=$ac_var=$ac_new_val ;;
|
|
esac
|
|
case " $ac_configure_args " in
|
|
*" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy.
|
|
- *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
|
|
+ *) as_fn_append ac_configure_args " '$ac_arg'" ;;
|
|
esac
|
|
fi
|
|
done
|
|
if $ac_cache_corrupted; then
|
|
- { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
|
|
-echo "$as_me: error: changes in the environment can compromise the build" >&2;}
|
|
- { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
|
|
-echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
|
|
- { (exit 1); exit 1; }; }
|
|
-fi
|
|
-
|
|
-
|
|
-
|
|
-
|
|
-
|
|
-
|
|
-
|
|
-
|
|
-
|
|
-
|
|
-
|
|
-
|
|
-
|
|
-
|
|
-
|
|
-
|
|
-
|
|
-
|
|
-
|
|
-
|
|
-
|
|
-
|
|
-
|
|
-
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
|
|
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
|
|
+$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
|
|
+ as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
|
|
+fi
|
|
+## -------------------- ##
|
|
+## Main body of script. ##
|
|
+## -------------------- ##
|
|
|
|
ac_ext=c
|
|
ac_cpp='$CPP $CPPFLAGS'
|
|
@@ -2041,24 +2546,16 @@ ac_config_headers="$ac_config_headers co
|
|
|
|
ac_aux_dir=
|
|
for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
|
|
- if test -f "$ac_dir/install-sh"; then
|
|
- ac_aux_dir=$ac_dir
|
|
- ac_install_sh="$ac_aux_dir/install-sh -c"
|
|
- break
|
|
- elif test -f "$ac_dir/install.sh"; then
|
|
- ac_aux_dir=$ac_dir
|
|
- ac_install_sh="$ac_aux_dir/install.sh -c"
|
|
- break
|
|
- elif test -f "$ac_dir/shtool"; then
|
|
- ac_aux_dir=$ac_dir
|
|
- ac_install_sh="$ac_aux_dir/shtool install -c"
|
|
- break
|
|
- fi
|
|
+ for ac_t in install-sh install.sh shtool; do
|
|
+ if test -f "$ac_dir/$ac_t"; then
|
|
+ ac_aux_dir=$ac_dir
|
|
+ ac_install_sh="$ac_aux_dir/$ac_t -c"
|
|
+ break 2
|
|
+ fi
|
|
+ done
|
|
done
|
|
if test -z "$ac_aux_dir"; then
|
|
- { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
|
|
-echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;}
|
|
- { (exit 1); exit 1; }; }
|
|
+ as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
|
|
fi
|
|
|
|
# These three variables are undocumented and unsupported,
|
|
@@ -2072,35 +2569,27 @@ ac_configure="$SHELL $ac_aux_dir/configu
|
|
|
|
# Make sure we can run config.sub.
|
|
$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
|
|
- { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
|
|
-echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
|
|
- { (exit 1); exit 1; }; }
|
|
-
|
|
-{ echo "$as_me:$LINENO: checking build system type" >&5
|
|
-echo $ECHO_N "checking build system type... $ECHO_C" >&6; }
|
|
-if test "${ac_cv_build+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+ as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
|
|
+
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
|
|
+$as_echo_n "checking build system type... " >&6; }
|
|
+if test "${ac_cv_build+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
ac_build_alias=$build_alias
|
|
test "x$ac_build_alias" = x &&
|
|
ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
|
|
test "x$ac_build_alias" = x &&
|
|
- { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
|
|
-echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
|
|
- { (exit 1); exit 1; }; }
|
|
+ as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5
|
|
ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
|
|
- { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
|
|
-echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
|
|
- { (exit 1); exit 1; }; }
|
|
+ as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
|
|
|
|
fi
|
|
-{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5
|
|
-echo "${ECHO_T}$ac_cv_build" >&6; }
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
|
|
+$as_echo "$ac_cv_build" >&6; }
|
|
case $ac_cv_build in
|
|
*-*-*) ;;
|
|
-*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
|
|
-echo "$as_me: error: invalid value of canonical build" >&2;}
|
|
- { (exit 1); exit 1; }; };;
|
|
+*) as_fn_error "invalid value of canonical build" "$LINENO" 5;;
|
|
esac
|
|
build=$ac_cv_build
|
|
ac_save_IFS=$IFS; IFS='-'
|
|
@@ -2116,28 +2605,24 @@ IFS=$ac_save_IFS
|
|
case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
|
|
|
|
|
|
-{ echo "$as_me:$LINENO: checking host system type" >&5
|
|
-echo $ECHO_N "checking host system type... $ECHO_C" >&6; }
|
|
-if test "${ac_cv_host+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
|
|
+$as_echo_n "checking host system type... " >&6; }
|
|
+if test "${ac_cv_host+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
if test "x$host_alias" = x; then
|
|
ac_cv_host=$ac_cv_build
|
|
else
|
|
ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
|
|
- { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
|
|
-echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
|
|
- { (exit 1); exit 1; }; }
|
|
+ as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
|
|
fi
|
|
|
|
fi
|
|
-{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5
|
|
-echo "${ECHO_T}$ac_cv_host" >&6; }
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
|
|
+$as_echo "$ac_cv_host" >&6; }
|
|
case $ac_cv_host in
|
|
*-*-*) ;;
|
|
-*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
|
|
-echo "$as_me: error: invalid value of canonical host" >&2;}
|
|
- { (exit 1); exit 1; }; };;
|
|
+*) as_fn_error "invalid value of canonical host" "$LINENO" 5;;
|
|
esac
|
|
host=$ac_cv_host
|
|
ac_save_IFS=$IFS; IFS='-'
|
|
@@ -2154,7 +2639,7 @@ case $host_os in *\ *) host_os=`echo "$h
|
|
|
|
|
|
|
|
-am__api_version='1.10'
|
|
+am__api_version='1.11'
|
|
|
|
# Find a good install program. We prefer a C program (faster),
|
|
# so one script is as good as another. But avoid the broken or
|
|
@@ -2169,22 +2654,23 @@ am__api_version='1.10'
|
|
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
|
|
# OS/2's system install, which has a completely different semantic
|
|
# ./install, which can be erroneously created by make from ./install.sh.
|
|
-{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
|
|
-echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
|
|
+# Reject install programs that cannot install multiple files.
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
|
|
+$as_echo_n "checking for a BSD-compatible install... " >&6; }
|
|
if test -z "$INSTALL"; then
|
|
-if test "${ac_cv_path_install+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+if test "${ac_cv_path_install+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
|
for as_dir in $PATH
|
|
do
|
|
IFS=$as_save_IFS
|
|
test -z "$as_dir" && as_dir=.
|
|
- # Account for people who put trailing slashes in PATH elements.
|
|
-case $as_dir/ in
|
|
- ./ | .// | /cC/* | \
|
|
+ # Account for people who put trailing slashes in PATH elements.
|
|
+case $as_dir/ in #((
|
|
+ ./ | .// | /[cC]/* | \
|
|
/etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
|
|
- ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
|
|
+ ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \
|
|
/usr/ucb/* ) ;;
|
|
*)
|
|
# OSF1 and SCO ODT 3.0 have their own names for install.
|
|
@@ -2202,17 +2688,29 @@ case $as_dir/ in
|
|
# program-specific install script used by HP pwplus--don't use.
|
|
:
|
|
else
|
|
- ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
|
|
- break 3
|
|
+ rm -rf conftest.one conftest.two conftest.dir
|
|
+ echo one > conftest.one
|
|
+ echo two > conftest.two
|
|
+ mkdir conftest.dir
|
|
+ if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
|
|
+ test -s conftest.one && test -s conftest.two &&
|
|
+ test -s conftest.dir/conftest.one &&
|
|
+ test -s conftest.dir/conftest.two
|
|
+ then
|
|
+ ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
|
|
+ break 3
|
|
+ fi
|
|
fi
|
|
fi
|
|
done
|
|
done
|
|
;;
|
|
esac
|
|
-done
|
|
+
|
|
+ done
|
|
IFS=$as_save_IFS
|
|
|
|
+rm -rf conftest.one conftest.two conftest.dir
|
|
|
|
fi
|
|
if test "${ac_cv_path_install+set}" = set; then
|
|
@@ -2225,8 +2723,8 @@ fi
|
|
INSTALL=$ac_install_sh
|
|
fi
|
|
fi
|
|
-{ echo "$as_me:$LINENO: result: $INSTALL" >&5
|
|
-echo "${ECHO_T}$INSTALL" >&6; }
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
|
|
+$as_echo "$INSTALL" >&6; }
|
|
|
|
# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
|
|
# It thinks the first close brace ends the variable substitution.
|
|
@@ -2236,21 +2734,34 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCR
|
|
|
|
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
|
|
|
|
-{ echo "$as_me:$LINENO: checking whether build environment is sane" >&5
|
|
-echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6; }
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
|
|
+$as_echo_n "checking whether build environment is sane... " >&6; }
|
|
# Just in case
|
|
sleep 1
|
|
echo timestamp > conftest.file
|
|
+# Reject unsafe characters in $srcdir or the absolute working directory
|
|
+# name. Accept space and tab only in the latter.
|
|
+am_lf='
|
|
+'
|
|
+case `pwd` in
|
|
+ *[\\\"\#\$\&\'\`$am_lf]*)
|
|
+ as_fn_error "unsafe absolute working directory name" "$LINENO" 5;;
|
|
+esac
|
|
+case $srcdir in
|
|
+ *[\\\"\#\$\&\'\`$am_lf\ \ ]*)
|
|
+ as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
|
|
+esac
|
|
+
|
|
# Do `set' in a subshell so we don't clobber the current shell's
|
|
# arguments. Must try -L first in case configure is actually a
|
|
# symlink; some systems play weird games with the mod time of symlinks
|
|
# (eg FreeBSD returns the mod time of the symlink's containing
|
|
# directory).
|
|
if (
|
|
- set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
|
|
+ set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
|
|
if test "$*" = "X"; then
|
|
# -L didn't work.
|
|
- set X `ls -t $srcdir/configure conftest.file`
|
|
+ set X `ls -t "$srcdir/configure" conftest.file`
|
|
fi
|
|
rm -f conftest.file
|
|
if test "$*" != "X $srcdir/configure conftest.file" \
|
|
@@ -2260,11 +2771,8 @@ if (
|
|
# if, for instance, CONFIG_SHELL is bash and it inherits a
|
|
# broken ls alias from the environment. This has actually
|
|
# happened. Such a system could not be considered "sane".
|
|
- { { echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken
|
|
-alias in your environment" >&5
|
|
-echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken
|
|
-alias in your environment" >&2;}
|
|
- { (exit 1); exit 1; }; }
|
|
+ as_fn_error "ls -t appears to fail. Make sure there is not a broken
|
|
+alias in your environment" "$LINENO" 5
|
|
fi
|
|
|
|
test "$2" = conftest.file
|
|
@@ -2273,52 +2781,162 @@ then
|
|
# Ok.
|
|
:
|
|
else
|
|
- { { echo "$as_me:$LINENO: error: newly created file is older than distributed files!
|
|
-Check your system clock" >&5
|
|
-echo "$as_me: error: newly created file is older than distributed files!
|
|
-Check your system clock" >&2;}
|
|
- { (exit 1); exit 1; }; }
|
|
+ as_fn_error "newly created file is older than distributed files!
|
|
+Check your system clock" "$LINENO" 5
|
|
fi
|
|
-{ echo "$as_me:$LINENO: result: yes" >&5
|
|
-echo "${ECHO_T}yes" >&6; }
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
|
+$as_echo "yes" >&6; }
|
|
test "$program_prefix" != NONE &&
|
|
program_transform_name="s&^&$program_prefix&;$program_transform_name"
|
|
# Use a double $ so make ignores it.
|
|
test "$program_suffix" != NONE &&
|
|
program_transform_name="s&\$&$program_suffix&;$program_transform_name"
|
|
-# Double any \ or $. echo might interpret backslashes.
|
|
+# Double any \ or $.
|
|
# By default was `s,x,x', remove it if useless.
|
|
-cat <<\_ACEOF >conftest.sed
|
|
-s/[\\$]/&&/g;s/;s,x,x,$//
|
|
-_ACEOF
|
|
-program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
|
|
-rm -f conftest.sed
|
|
+ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
|
|
+program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
|
|
|
|
# expand $ac_aux_dir to an absolute path
|
|
am_aux_dir=`cd $ac_aux_dir && pwd`
|
|
|
|
-test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
|
|
+if test x"${MISSING+set}" != xset; then
|
|
+ case $am_aux_dir in
|
|
+ *\ * | *\ *)
|
|
+ MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
|
|
+ *)
|
|
+ MISSING="\${SHELL} $am_aux_dir/missing" ;;
|
|
+ esac
|
|
+fi
|
|
# Use eval to expand $SHELL
|
|
if eval "$MISSING --run true"; then
|
|
am_missing_run="$MISSING --run "
|
|
else
|
|
am_missing_run=
|
|
- { echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5
|
|
-echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5
|
|
+$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
|
|
+fi
|
|
+
|
|
+if test x"${install_sh}" != xset; then
|
|
+ case $am_aux_dir in
|
|
+ *\ * | *\ *)
|
|
+ install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
|
|
+ *)
|
|
+ install_sh="\${SHELL} $am_aux_dir/install-sh"
|
|
+ esac
|
|
+fi
|
|
+
|
|
+# Installed binaries are usually stripped using `strip' when the user
|
|
+# run `make install-strip'. However `strip' might not be the right
|
|
+# tool to use in cross-compilation environments, therefore Automake
|
|
+# will honor the `STRIP' environment variable to overrule this program.
|
|
+if test "$cross_compiling" != no; then
|
|
+ if test -n "$ac_tool_prefix"; then
|
|
+ # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
|
|
+set dummy ${ac_tool_prefix}strip; ac_word=$2
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
|
+$as_echo_n "checking for $ac_word... " >&6; }
|
|
+if test "${ac_cv_prog_STRIP+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
+else
|
|
+ if test -n "$STRIP"; then
|
|
+ ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
|
|
+else
|
|
+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_prog_STRIP="${ac_tool_prefix}strip"
|
|
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
+ break 2
|
|
+ fi
|
|
+done
|
|
+ done
|
|
+IFS=$as_save_IFS
|
|
+
|
|
+fi
|
|
+fi
|
|
+STRIP=$ac_cv_prog_STRIP
|
|
+if test -n "$STRIP"; then
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
|
|
+$as_echo "$STRIP" >&6; }
|
|
+else
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
+$as_echo "no" >&6; }
|
|
+fi
|
|
+
|
|
+
|
|
+fi
|
|
+if test -z "$ac_cv_prog_STRIP"; then
|
|
+ ac_ct_STRIP=$STRIP
|
|
+ # Extract the first word of "strip", so it can be a program name with args.
|
|
+set dummy strip; ac_word=$2
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
|
+$as_echo_n "checking for $ac_word... " >&6; }
|
|
+if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
+else
|
|
+ if test -n "$ac_ct_STRIP"; then
|
|
+ ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
|
|
+else
|
|
+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_prog_ac_ct_STRIP="strip"
|
|
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
+ break 2
|
|
+ fi
|
|
+done
|
|
+ done
|
|
+IFS=$as_save_IFS
|
|
+
|
|
+fi
|
|
+fi
|
|
+ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
|
|
+if test -n "$ac_ct_STRIP"; then
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
|
|
+$as_echo "$ac_ct_STRIP" >&6; }
|
|
+else
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
+$as_echo "no" >&6; }
|
|
+fi
|
|
+
|
|
+ if test "x$ac_ct_STRIP" = x; then
|
|
+ STRIP=":"
|
|
+ else
|
|
+ case $cross_compiling:$ac_tool_warned in
|
|
+yes:)
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
|
|
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
|
|
+ac_tool_warned=yes ;;
|
|
+esac
|
|
+ STRIP=$ac_ct_STRIP
|
|
+ fi
|
|
+else
|
|
+ STRIP="$ac_cv_prog_STRIP"
|
|
fi
|
|
|
|
-{ echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
|
|
-echo $ECHO_N "checking for a thread-safe mkdir -p... $ECHO_C" >&6; }
|
|
+fi
|
|
+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
|
|
+
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
|
|
+$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
|
|
if test -z "$MKDIR_P"; then
|
|
- if test "${ac_cv_path_mkdir+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+ if test "${ac_cv_path_mkdir+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
|
for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
|
|
do
|
|
IFS=$as_save_IFS
|
|
test -z "$as_dir" && as_dir=.
|
|
- for ac_prog in mkdir gmkdir; do
|
|
+ for ac_prog in mkdir gmkdir; do
|
|
for ac_exec_ext in '' $ac_executable_extensions; do
|
|
{ test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
|
|
case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
|
|
@@ -2330,7 +2948,7 @@ do
|
|
esac
|
|
done
|
|
done
|
|
-done
|
|
+ done
|
|
IFS=$as_save_IFS
|
|
|
|
fi
|
|
@@ -2346,8 +2964,8 @@ fi
|
|
MKDIR_P="$ac_install_sh -d"
|
|
fi
|
|
fi
|
|
-{ echo "$as_me:$LINENO: result: $MKDIR_P" >&5
|
|
-echo "${ECHO_T}$MKDIR_P" >&6; }
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
|
|
+$as_echo "$MKDIR_P" >&6; }
|
|
|
|
mkdir_p="$MKDIR_P"
|
|
case $mkdir_p in
|
|
@@ -2359,10 +2977,10 @@ for ac_prog in gawk mawk nawk awk
|
|
do
|
|
# Extract the first word of "$ac_prog", so it can be a program name with args.
|
|
set dummy $ac_prog; 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_prog_AWK+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
|
+$as_echo_n "checking for $ac_word... " >&6; }
|
|
+if test "${ac_cv_prog_AWK+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
if test -n "$AWK"; then
|
|
ac_cv_prog_AWK="$AWK" # Let the user override the test.
|
|
@@ -2372,36 +2990,37 @@ 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
|
|
+ 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_prog_AWK="$ac_prog"
|
|
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
break 2
|
|
fi
|
|
done
|
|
-done
|
|
+ done
|
|
IFS=$as_save_IFS
|
|
|
|
fi
|
|
fi
|
|
AWK=$ac_cv_prog_AWK
|
|
if test -n "$AWK"; then
|
|
- { echo "$as_me:$LINENO: result: $AWK" >&5
|
|
-echo "${ECHO_T}$AWK" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
|
|
+$as_echo "$AWK" >&6; }
|
|
else
|
|
- { echo "$as_me:$LINENO: result: no" >&5
|
|
-echo "${ECHO_T}no" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
+$as_echo "no" >&6; }
|
|
fi
|
|
|
|
|
|
test -n "$AWK" && break
|
|
done
|
|
|
|
-{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
|
|
-echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
|
|
-set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
|
|
-if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
|
|
+$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
|
|
+set x ${MAKE-make}
|
|
+ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
|
|
+if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
cat >conftest.make <<\_ACEOF
|
|
SHELL = /bin/sh
|
|
@@ -2418,12 +3037,12 @@ esac
|
|
rm -f conftest.make
|
|
fi
|
|
if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
|
|
- { echo "$as_me:$LINENO: result: yes" >&5
|
|
-echo "${ECHO_T}yes" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
|
+$as_echo "yes" >&6; }
|
|
SET_MAKE=
|
|
else
|
|
- { echo "$as_me:$LINENO: result: no" >&5
|
|
-echo "${ECHO_T}no" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
+$as_echo "no" >&6; }
|
|
SET_MAKE="MAKE=${MAKE-make}"
|
|
fi
|
|
|
|
@@ -2442,9 +3061,7 @@ if test "`cd $srcdir && pwd`" != "`pwd`"
|
|
am__isrc=' -I$(srcdir)'
|
|
# test to see if srcdir already configured
|
|
if test -f $srcdir/config.status; then
|
|
- { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
|
|
-echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
|
|
- { (exit 1); exit 1; }; }
|
|
+ as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
|
|
fi
|
|
fi
|
|
|
|
@@ -2488,112 +3105,6 @@ AUTOHEADER=${AUTOHEADER-"${am_missing_ru
|
|
|
|
MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
|
|
|
|
-install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
|
|
-
|
|
-# Installed binaries are usually stripped using `strip' when the user
|
|
-# run `make install-strip'. However `strip' might not be the right
|
|
-# tool to use in cross-compilation environments, therefore Automake
|
|
-# will honor the `STRIP' environment variable to overrule this program.
|
|
-if test "$cross_compiling" != no; then
|
|
- if test -n "$ac_tool_prefix"; then
|
|
- # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
|
|
-set dummy ${ac_tool_prefix}strip; 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_prog_STRIP+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
-else
|
|
- if test -n "$STRIP"; then
|
|
- ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
|
|
-else
|
|
-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_prog_STRIP="${ac_tool_prefix}strip"
|
|
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
- break 2
|
|
- fi
|
|
-done
|
|
-done
|
|
-IFS=$as_save_IFS
|
|
-
|
|
-fi
|
|
-fi
|
|
-STRIP=$ac_cv_prog_STRIP
|
|
-if test -n "$STRIP"; then
|
|
- { echo "$as_me:$LINENO: result: $STRIP" >&5
|
|
-echo "${ECHO_T}$STRIP" >&6; }
|
|
-else
|
|
- { echo "$as_me:$LINENO: result: no" >&5
|
|
-echo "${ECHO_T}no" >&6; }
|
|
-fi
|
|
-
|
|
-
|
|
-fi
|
|
-if test -z "$ac_cv_prog_STRIP"; then
|
|
- ac_ct_STRIP=$STRIP
|
|
- # Extract the first word of "strip", so it can be a program name with args.
|
|
-set dummy strip; 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_prog_ac_ct_STRIP+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
-else
|
|
- if test -n "$ac_ct_STRIP"; then
|
|
- ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
|
|
-else
|
|
-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_prog_ac_ct_STRIP="strip"
|
|
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
- break 2
|
|
- fi
|
|
-done
|
|
-done
|
|
-IFS=$as_save_IFS
|
|
-
|
|
-fi
|
|
-fi
|
|
-ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
|
|
-if test -n "$ac_ct_STRIP"; then
|
|
- { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
|
|
-echo "${ECHO_T}$ac_ct_STRIP" >&6; }
|
|
-else
|
|
- { echo "$as_me:$LINENO: result: no" >&5
|
|
-echo "${ECHO_T}no" >&6; }
|
|
-fi
|
|
-
|
|
- if test "x$ac_ct_STRIP" = x; then
|
|
- STRIP=":"
|
|
- else
|
|
- case $cross_compiling:$ac_tool_warned in
|
|
-yes:)
|
|
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
|
|
-whose name does not start with the host triplet. If you think this
|
|
-configuration is useful to you, please write to autoconf@gnu.org." >&5
|
|
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
|
|
-whose name does not start with the host triplet. If you think this
|
|
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
|
|
-ac_tool_warned=yes ;;
|
|
-esac
|
|
- STRIP=$ac_ct_STRIP
|
|
- fi
|
|
-else
|
|
- STRIP="$ac_cv_prog_STRIP"
|
|
-fi
|
|
-
|
|
-fi
|
|
-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
|
|
-
|
|
# We need awk for the "check" target. The system "awk" is bad on
|
|
# some platforms.
|
|
# Always define AMTAR for backward compatibility.
|
|
@@ -2636,44 +3147,44 @@ ac_config_commands="$ac_config_commands
|
|
am_make=${MAKE-make}
|
|
cat > confinc << 'END'
|
|
am__doit:
|
|
- @echo done
|
|
+ @echo this is the am__doit target
|
|
.PHONY: am__doit
|
|
END
|
|
# If we don't find an include directive, just comment out the code.
|
|
-{ echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
|
|
-echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6; }
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5
|
|
+$as_echo_n "checking for style of include used by $am_make... " >&6; }
|
|
am__include="#"
|
|
am__quote=
|
|
_am_result=none
|
|
# First try GNU make style include.
|
|
echo "include confinc" > confmf
|
|
-# We grep out `Entering directory' and `Leaving directory'
|
|
-# messages which can occur if `w' ends up in MAKEFLAGS.
|
|
-# In particular we don't look at `^make:' because GNU make might
|
|
-# be invoked under some other name (usually "gmake"), in which
|
|
-# case it prints its new name instead of `make'.
|
|
-if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
|
|
- am__include=include
|
|
- am__quote=
|
|
- _am_result=GNU
|
|
-fi
|
|
+# Ignore all kinds of additional output from `make'.
|
|
+case `$am_make -s -f confmf 2> /dev/null` in #(
|
|
+*the\ am__doit\ target*)
|
|
+ am__include=include
|
|
+ am__quote=
|
|
+ _am_result=GNU
|
|
+ ;;
|
|
+esac
|
|
# Now try BSD make style include.
|
|
if test "$am__include" = "#"; then
|
|
echo '.include "confinc"' > confmf
|
|
- if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
|
|
- am__include=.include
|
|
- am__quote="\""
|
|
- _am_result=BSD
|
|
- fi
|
|
+ case `$am_make -s -f confmf 2> /dev/null` in #(
|
|
+ *the\ am__doit\ target*)
|
|
+ am__include=.include
|
|
+ am__quote="\""
|
|
+ _am_result=BSD
|
|
+ ;;
|
|
+ esac
|
|
fi
|
|
|
|
|
|
-{ echo "$as_me:$LINENO: result: $_am_result" >&5
|
|
-echo "${ECHO_T}$_am_result" >&6; }
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5
|
|
+$as_echo "$_am_result" >&6; }
|
|
rm -f confinc confmf
|
|
|
|
# Check whether --enable-dependency-tracking was given.
|
|
-if test "${enable_dependency_tracking+set}" = set; then
|
|
+if test "${enable_dependency_tracking+set}" = set; then :
|
|
enableval=$enable_dependency_tracking;
|
|
fi
|
|
|
|
@@ -2698,10 +3209,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
|
|
if test -n "$ac_tool_prefix"; then
|
|
# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
|
|
set dummy ${ac_tool_prefix}gcc; 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_prog_CC+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
|
+$as_echo_n "checking for $ac_word... " >&6; }
|
|
+if test "${ac_cv_prog_CC+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
if test -n "$CC"; then
|
|
ac_cv_prog_CC="$CC" # Let the user override the test.
|
|
@@ -2711,25 +3222,25 @@ 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
|
|
+ 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_prog_CC="${ac_tool_prefix}gcc"
|
|
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
break 2
|
|
fi
|
|
done
|
|
-done
|
|
+ done
|
|
IFS=$as_save_IFS
|
|
|
|
fi
|
|
fi
|
|
CC=$ac_cv_prog_CC
|
|
if test -n "$CC"; then
|
|
- { echo "$as_me:$LINENO: result: $CC" >&5
|
|
-echo "${ECHO_T}$CC" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
|
|
+$as_echo "$CC" >&6; }
|
|
else
|
|
- { echo "$as_me:$LINENO: result: no" >&5
|
|
-echo "${ECHO_T}no" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
+$as_echo "no" >&6; }
|
|
fi
|
|
|
|
|
|
@@ -2738,10 +3249,10 @@ if test -z "$ac_cv_prog_CC"; then
|
|
ac_ct_CC=$CC
|
|
# Extract the first word of "gcc", so it can be a program name with args.
|
|
set dummy gcc; 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_prog_ac_ct_CC+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
|
+$as_echo_n "checking for $ac_word... " >&6; }
|
|
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
if test -n "$ac_ct_CC"; then
|
|
ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
|
|
@@ -2751,25 +3262,25 @@ 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
|
|
+ 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_prog_ac_ct_CC="gcc"
|
|
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
break 2
|
|
fi
|
|
done
|
|
-done
|
|
+ done
|
|
IFS=$as_save_IFS
|
|
|
|
fi
|
|
fi
|
|
ac_ct_CC=$ac_cv_prog_ac_ct_CC
|
|
if test -n "$ac_ct_CC"; then
|
|
- { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
|
|
-echo "${ECHO_T}$ac_ct_CC" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
|
|
+$as_echo "$ac_ct_CC" >&6; }
|
|
else
|
|
- { echo "$as_me:$LINENO: result: no" >&5
|
|
-echo "${ECHO_T}no" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
+$as_echo "no" >&6; }
|
|
fi
|
|
|
|
if test "x$ac_ct_CC" = x; then
|
|
@@ -2777,12 +3288,8 @@ fi
|
|
else
|
|
case $cross_compiling:$ac_tool_warned in
|
|
yes:)
|
|
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
|
|
-whose name does not start with the host triplet. If you think this
|
|
-configuration is useful to you, please write to autoconf@gnu.org." >&5
|
|
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
|
|
-whose name does not start with the host triplet. If you think this
|
|
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
|
|
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
|
|
ac_tool_warned=yes ;;
|
|
esac
|
|
CC=$ac_ct_CC
|
|
@@ -2795,10 +3302,10 @@ if test -z "$CC"; then
|
|
if test -n "$ac_tool_prefix"; then
|
|
# Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
|
|
set dummy ${ac_tool_prefix}cc; 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_prog_CC+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
|
+$as_echo_n "checking for $ac_word... " >&6; }
|
|
+if test "${ac_cv_prog_CC+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
if test -n "$CC"; then
|
|
ac_cv_prog_CC="$CC" # Let the user override the test.
|
|
@@ -2808,25 +3315,25 @@ 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
|
|
+ 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_prog_CC="${ac_tool_prefix}cc"
|
|
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
break 2
|
|
fi
|
|
done
|
|
-done
|
|
+ done
|
|
IFS=$as_save_IFS
|
|
|
|
fi
|
|
fi
|
|
CC=$ac_cv_prog_CC
|
|
if test -n "$CC"; then
|
|
- { echo "$as_me:$LINENO: result: $CC" >&5
|
|
-echo "${ECHO_T}$CC" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
|
|
+$as_echo "$CC" >&6; }
|
|
else
|
|
- { echo "$as_me:$LINENO: result: no" >&5
|
|
-echo "${ECHO_T}no" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
+$as_echo "no" >&6; }
|
|
fi
|
|
|
|
|
|
@@ -2835,10 +3342,10 @@ fi
|
|
if test -z "$CC"; then
|
|
# Extract the first word of "cc", so it can be a program name with args.
|
|
set dummy cc; 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_prog_CC+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
|
+$as_echo_n "checking for $ac_word... " >&6; }
|
|
+if test "${ac_cv_prog_CC+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
if test -n "$CC"; then
|
|
ac_cv_prog_CC="$CC" # Let the user override the test.
|
|
@@ -2849,18 +3356,18 @@ 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
|
|
+ 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
|
|
if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
|
|
ac_prog_rejected=yes
|
|
continue
|
|
fi
|
|
ac_cv_prog_CC="cc"
|
|
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
break 2
|
|
fi
|
|
done
|
|
-done
|
|
+ done
|
|
IFS=$as_save_IFS
|
|
|
|
if test $ac_prog_rejected = yes; then
|
|
@@ -2879,11 +3386,11 @@ fi
|
|
fi
|
|
CC=$ac_cv_prog_CC
|
|
if test -n "$CC"; then
|
|
- { echo "$as_me:$LINENO: result: $CC" >&5
|
|
-echo "${ECHO_T}$CC" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
|
|
+$as_echo "$CC" >&6; }
|
|
else
|
|
- { echo "$as_me:$LINENO: result: no" >&5
|
|
-echo "${ECHO_T}no" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
+$as_echo "no" >&6; }
|
|
fi
|
|
|
|
|
|
@@ -2894,10 +3401,10 @@ if test -z "$CC"; then
|
|
do
|
|
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
|
|
set dummy $ac_tool_prefix$ac_prog; 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_prog_CC+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
|
+$as_echo_n "checking for $ac_word... " >&6; }
|
|
+if test "${ac_cv_prog_CC+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
if test -n "$CC"; then
|
|
ac_cv_prog_CC="$CC" # Let the user override the test.
|
|
@@ -2907,25 +3414,25 @@ 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
|
|
+ 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_prog_CC="$ac_tool_prefix$ac_prog"
|
|
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
break 2
|
|
fi
|
|
done
|
|
-done
|
|
+ done
|
|
IFS=$as_save_IFS
|
|
|
|
fi
|
|
fi
|
|
CC=$ac_cv_prog_CC
|
|
if test -n "$CC"; then
|
|
- { echo "$as_me:$LINENO: result: $CC" >&5
|
|
-echo "${ECHO_T}$CC" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
|
|
+$as_echo "$CC" >&6; }
|
|
else
|
|
- { echo "$as_me:$LINENO: result: no" >&5
|
|
-echo "${ECHO_T}no" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
+$as_echo "no" >&6; }
|
|
fi
|
|
|
|
|
|
@@ -2938,10 +3445,10 @@ if test -z "$CC"; then
|
|
do
|
|
# Extract the first word of "$ac_prog", so it can be a program name with args.
|
|
set dummy $ac_prog; 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_prog_ac_ct_CC+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
|
+$as_echo_n "checking for $ac_word... " >&6; }
|
|
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
if test -n "$ac_ct_CC"; then
|
|
ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
|
|
@@ -2951,25 +3458,25 @@ 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
|
|
+ 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_prog_ac_ct_CC="$ac_prog"
|
|
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
break 2
|
|
fi
|
|
done
|
|
-done
|
|
+ done
|
|
IFS=$as_save_IFS
|
|
|
|
fi
|
|
fi
|
|
ac_ct_CC=$ac_cv_prog_ac_ct_CC
|
|
if test -n "$ac_ct_CC"; then
|
|
- { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
|
|
-echo "${ECHO_T}$ac_ct_CC" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
|
|
+$as_echo "$ac_ct_CC" >&6; }
|
|
else
|
|
- { echo "$as_me:$LINENO: result: no" >&5
|
|
-echo "${ECHO_T}no" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
+$as_echo "no" >&6; }
|
|
fi
|
|
|
|
|
|
@@ -2981,12 +3488,8 @@ done
|
|
else
|
|
case $cross_compiling:$ac_tool_warned in
|
|
yes:)
|
|
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
|
|
-whose name does not start with the host triplet. If you think this
|
|
-configuration is useful to you, please write to autoconf@gnu.org." >&5
|
|
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
|
|
-whose name does not start with the host triplet. If you think this
|
|
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
|
|
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
|
|
ac_tool_warned=yes ;;
|
|
esac
|
|
CC=$ac_ct_CC
|
|
@@ -2996,98 +3499,82 @@ fi
|
|
fi
|
|
|
|
|
|
-test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
|
|
-See \`config.log' for more details." >&5
|
|
-echo "$as_me: error: no acceptable C compiler found in \$PATH
|
|
-See \`config.log' for more details." >&2;}
|
|
- { (exit 1); exit 1; }; }
|
|
+test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
|
|
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
|
|
+as_fn_error "no acceptable C compiler found in \$PATH
|
|
+See \`config.log' for more details." "$LINENO" 5; }
|
|
|
|
# Provide some information about the compiler.
|
|
-echo "$as_me:$LINENO: checking for C compiler version" >&5
|
|
-ac_compiler=`set X $ac_compile; echo $2`
|
|
-{ (ac_try="$ac_compiler --version >&5"
|
|
-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_compiler --version >&5") 2>&5
|
|
- ac_status=$?
|
|
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
- (exit $ac_status); }
|
|
-{ (ac_try="$ac_compiler -v >&5"
|
|
-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_compiler -v >&5") 2>&5
|
|
- ac_status=$?
|
|
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
- (exit $ac_status); }
|
|
-{ (ac_try="$ac_compiler -V >&5"
|
|
+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
|
|
+set X $ac_compile
|
|
+ac_compiler=$2
|
|
+for ac_option in --version -v -V -qversion; do
|
|
+ { { ac_try="$ac_compiler $ac_option >&5"
|
|
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_compiler -V >&5") 2>&5
|
|
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
|
|
+$as_echo "$ac_try_echo"; } >&5
|
|
+ (eval "$ac_compiler $ac_option >&5") 2>conftest.err
|
|
ac_status=$?
|
|
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
- (exit $ac_status); }
|
|
+ if test -s conftest.err; then
|
|
+ sed '10a\
|
|
+... rest of stderr output deleted ...
|
|
+ 10q' conftest.err >conftest.er1
|
|
+ cat conftest.er1 >&5
|
|
+ rm -f conftest.er1 conftest.err
|
|
+ fi
|
|
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
|
+ test $ac_status = 0; }
|
|
+done
|
|
|
|
-cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
/* end confdefs.h. */
|
|
-
|
|
+#include <stdio.h>
|
|
int
|
|
main ()
|
|
{
|
|
+FILE *f = fopen ("conftest.out", "w");
|
|
+ return ferror (f) || fclose (f) != 0;
|
|
|
|
;
|
|
return 0;
|
|
}
|
|
_ACEOF
|
|
ac_clean_files_save=$ac_clean_files
|
|
-ac_clean_files="$ac_clean_files a.out a.exe b.out"
|
|
+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out conftest.out"
|
|
# Try to create an executable without -o first, disregard a.out.
|
|
# It will help us diagnose broken compilers, and finding out an intuition
|
|
# of exeext.
|
|
-{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
|
|
-echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; }
|
|
-ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
|
|
-#
|
|
-# List of possible output files, starting from the most likely.
|
|
-# The algorithm is not robust to junk in `.', hence go to wildcards (a.*)
|
|
-# only as a last resort. b.out is created by i960 compilers.
|
|
-ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out'
|
|
-#
|
|
-# The IRIX 6 linker writes into existing files which may not be
|
|
-# executable, retaining their permissions. Remove them first so a
|
|
-# subsequent execution test works.
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
|
|
+$as_echo_n "checking for C compiler default output file name... " >&6; }
|
|
+ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
|
|
+
|
|
+# The possible output files:
|
|
+ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
|
|
+
|
|
ac_rmfiles=
|
|
for ac_file in $ac_files
|
|
do
|
|
case $ac_file in
|
|
- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
|
|
+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
|
|
* ) ac_rmfiles="$ac_rmfiles $ac_file";;
|
|
esac
|
|
done
|
|
rm -f $ac_rmfiles
|
|
|
|
-if { (ac_try="$ac_link_default"
|
|
+if { { ac_try="$ac_link_default"
|
|
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_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
|
|
+$as_echo "$ac_try_echo"; } >&5
|
|
(eval "$ac_link_default") 2>&5
|
|
ac_status=$?
|
|
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
- (exit $ac_status); }; then
|
|
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
|
+ test $ac_status = 0; }; then :
|
|
# Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
|
|
# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
|
|
# in a Makefile. We should not override ac_cv_exeext if it was cached,
|
|
@@ -3097,14 +3584,14 @@ for ac_file in $ac_files ''
|
|
do
|
|
test -f "$ac_file" || continue
|
|
case $ac_file in
|
|
- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj )
|
|
+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
|
|
;;
|
|
[ab].out )
|
|
# We found the default executable, but exeext='' is most
|
|
# certainly right.
|
|
break;;
|
|
*.* )
|
|
- if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
|
|
+ if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
|
|
then :; else
|
|
ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
|
|
fi
|
|
@@ -3123,78 +3610,75 @@ test "$ac_cv_exeext" = no && ac_cv_exeex
|
|
else
|
|
ac_file=''
|
|
fi
|
|
-
|
|
-{ echo "$as_me:$LINENO: result: $ac_file" >&5
|
|
-echo "${ECHO_T}$ac_file" >&6; }
|
|
-if test -z "$ac_file"; then
|
|
- echo "$as_me: failed program was:" >&5
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
|
|
+$as_echo "$ac_file" >&6; }
|
|
+if test -z "$ac_file"; then :
|
|
+ $as_echo "$as_me: failed program was:" >&5
|
|
sed 's/^/| /' conftest.$ac_ext >&5
|
|
|
|
-{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
|
|
-See \`config.log' for more details." >&5
|
|
-echo "$as_me: error: C compiler cannot create executables
|
|
-See \`config.log' for more details." >&2;}
|
|
- { (exit 77); exit 77; }; }
|
|
+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
|
|
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
|
|
+{ as_fn_set_status 77
|
|
+as_fn_error "C compiler cannot create executables
|
|
+See \`config.log' for more details." "$LINENO" 5; }; }
|
|
fi
|
|
-
|
|
ac_exeext=$ac_cv_exeext
|
|
|
|
# Check that the compiler produces executables we can run. If not, either
|
|
# the compiler is broken, or we cross compile.
|
|
-{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5
|
|
-echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; }
|
|
-# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
|
|
+$as_echo_n "checking whether the C compiler works... " >&6; }
|
|
# If not cross compiling, check that we can run a simple program.
|
|
if test "$cross_compiling" != yes; then
|
|
if { ac_try='./$ac_file'
|
|
- { (case "(($ac_try" in
|
|
+ { { 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_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
|
|
+$as_echo "$ac_try_echo"; } >&5
|
|
(eval "$ac_try") 2>&5
|
|
ac_status=$?
|
|
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
- (exit $ac_status); }; }; then
|
|
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
|
+ test $ac_status = 0; }; }; then
|
|
cross_compiling=no
|
|
else
|
|
if test "$cross_compiling" = maybe; then
|
|
cross_compiling=yes
|
|
else
|
|
- { { echo "$as_me:$LINENO: error: cannot run C compiled programs.
|
|
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
|
|
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
|
|
+as_fn_error "cannot run C compiled programs.
|
|
If you meant to cross compile, use \`--host'.
|
|
-See \`config.log' for more details." >&5
|
|
-echo "$as_me: error: cannot run C compiled programs.
|
|
-If you meant to cross compile, use \`--host'.
|
|
-See \`config.log' for more details." >&2;}
|
|
- { (exit 1); exit 1; }; }
|
|
+See \`config.log' for more details." "$LINENO" 5; }
|
|
fi
|
|
fi
|
|
fi
|
|
-{ echo "$as_me:$LINENO: result: yes" >&5
|
|
-echo "${ECHO_T}yes" >&6; }
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
|
+$as_echo "yes" >&6; }
|
|
|
|
-rm -f a.out a.exe conftest$ac_cv_exeext b.out
|
|
+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out conftest.out
|
|
ac_clean_files=$ac_clean_files_save
|
|
# Check that the compiler produces executables we can run. If not, either
|
|
# the compiler is broken, or we cross compile.
|
|
-{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
|
|
-echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; }
|
|
-{ echo "$as_me:$LINENO: result: $cross_compiling" >&5
|
|
-echo "${ECHO_T}$cross_compiling" >&6; }
|
|
-
|
|
-{ echo "$as_me:$LINENO: checking for suffix of executables" >&5
|
|
-echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; }
|
|
-if { (ac_try="$ac_link"
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
|
|
+$as_echo_n "checking whether we are cross compiling... " >&6; }
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
|
|
+$as_echo "$cross_compiling" >&6; }
|
|
+
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
|
|
+$as_echo_n "checking for suffix of executables... " >&6; }
|
|
+if { { ac_try="$ac_link"
|
|
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_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
|
|
+$as_echo "$ac_try_echo"; } >&5
|
|
(eval "$ac_link") 2>&5
|
|
ac_status=$?
|
|
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
- (exit $ac_status); }; then
|
|
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
|
+ test $ac_status = 0; }; then :
|
|
# If both `conftest.exe' and `conftest' are `present' (well, observable)
|
|
# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will
|
|
# work properly (i.e., refer to `conftest.exe'), while it won't with
|
|
@@ -3202,37 +3686,31 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
|
|
for ac_file in conftest.exe conftest conftest.*; do
|
|
test -f "$ac_file" || continue
|
|
case $ac_file in
|
|
- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
|
|
+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
|
|
*.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
|
|
break;;
|
|
* ) break;;
|
|
esac
|
|
done
|
|
else
|
|
- { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
|
|
-See \`config.log' for more details." >&5
|
|
-echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
|
|
-See \`config.log' for more details." >&2;}
|
|
- { (exit 1); exit 1; }; }
|
|
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
|
|
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
|
|
+as_fn_error "cannot compute suffix of executables: cannot compile and link
|
|
+See \`config.log' for more details." "$LINENO" 5; }
|
|
fi
|
|
-
|
|
rm -f conftest$ac_cv_exeext
|
|
-{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
|
|
-echo "${ECHO_T}$ac_cv_exeext" >&6; }
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
|
|
+$as_echo "$ac_cv_exeext" >&6; }
|
|
|
|
rm -f conftest.$ac_ext
|
|
EXEEXT=$ac_cv_exeext
|
|
ac_exeext=$EXEEXT
|
|
-{ echo "$as_me:$LINENO: checking for suffix of object files" >&5
|
|
-echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; }
|
|
-if test "${ac_cv_objext+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
|
|
+$as_echo_n "checking for suffix of object files... " >&6; }
|
|
+if test "${ac_cv_objext+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
- cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
/* end confdefs.h. */
|
|
|
|
int
|
|
@@ -3244,51 +3722,46 @@ main ()
|
|
}
|
|
_ACEOF
|
|
rm -f conftest.o conftest.obj
|
|
-if { (ac_try="$ac_compile"
|
|
+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_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
|
|
+$as_echo "$ac_try_echo"; } >&5
|
|
(eval "$ac_compile") 2>&5
|
|
ac_status=$?
|
|
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
- (exit $ac_status); }; then
|
|
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
|
+ test $ac_status = 0; }; then :
|
|
for ac_file in conftest.o conftest.obj conftest.*; do
|
|
test -f "$ac_file" || continue;
|
|
case $ac_file in
|
|
- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;;
|
|
+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
|
|
*) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
|
|
break;;
|
|
esac
|
|
done
|
|
else
|
|
- echo "$as_me: failed program was:" >&5
|
|
+ $as_echo "$as_me: failed program was:" >&5
|
|
sed 's/^/| /' conftest.$ac_ext >&5
|
|
|
|
-{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
|
|
-See \`config.log' for more details." >&5
|
|
-echo "$as_me: error: cannot compute suffix of object files: cannot compile
|
|
-See \`config.log' for more details." >&2;}
|
|
- { (exit 1); exit 1; }; }
|
|
+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
|
|
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
|
|
+as_fn_error "cannot compute suffix of object files: cannot compile
|
|
+See \`config.log' for more details." "$LINENO" 5; }
|
|
fi
|
|
-
|
|
rm -f conftest.$ac_cv_objext conftest.$ac_ext
|
|
fi
|
|
-{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
|
|
-echo "${ECHO_T}$ac_cv_objext" >&6; }
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
|
|
+$as_echo "$ac_cv_objext" >&6; }
|
|
OBJEXT=$ac_cv_objext
|
|
ac_objext=$OBJEXT
|
|
-{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
|
|
-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
|
|
-if test "${ac_cv_c_compiler_gnu+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
|
|
+$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
|
|
+if test "${ac_cv_c_compiler_gnu+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
- cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
/* end confdefs.h. */
|
|
|
|
int
|
|
@@ -3302,54 +3775,34 @@ 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
|
|
+if ac_fn_c_try_compile "$LINENO"; then :
|
|
ac_compiler_gnu=yes
|
|
else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
- ac_compiler_gnu=no
|
|
+ ac_compiler_gnu=no
|
|
fi
|
|
-
|
|
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
ac_cv_c_compiler_gnu=$ac_compiler_gnu
|
|
|
|
fi
|
|
-{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
|
|
-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
|
|
-GCC=`test $ac_compiler_gnu = yes && echo yes`
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
|
|
+$as_echo "$ac_cv_c_compiler_gnu" >&6; }
|
|
+if test $ac_compiler_gnu = yes; then
|
|
+ GCC=yes
|
|
+else
|
|
+ GCC=
|
|
+fi
|
|
ac_test_CFLAGS=${CFLAGS+set}
|
|
ac_save_CFLAGS=$CFLAGS
|
|
-{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
|
|
-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
|
|
-if test "${ac_cv_prog_cc_g+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
|
|
+$as_echo_n "checking whether $CC accepts -g... " >&6; }
|
|
+if test "${ac_cv_prog_cc_g+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
ac_save_c_werror_flag=$ac_c_werror_flag
|
|
ac_c_werror_flag=yes
|
|
ac_cv_prog_cc_g=no
|
|
CFLAGS="-g"
|
|
- cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
/* end confdefs.h. */
|
|
|
|
int
|
|
@@ -3360,34 +3813,11 @@ 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
|
|
+if ac_fn_c_try_compile "$LINENO"; then :
|
|
ac_cv_prog_cc_g=yes
|
|
else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
- CFLAGS=""
|
|
- cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
+ CFLAGS=""
|
|
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
/* end confdefs.h. */
|
|
|
|
int
|
|
@@ -3398,35 +3828,12 @@ 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
|
|
- :
|
|
-else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
+if ac_fn_c_try_compile "$LINENO"; then :
|
|
|
|
- ac_c_werror_flag=$ac_save_c_werror_flag
|
|
+else
|
|
+ ac_c_werror_flag=$ac_save_c_werror_flag
|
|
CFLAGS="-g"
|
|
- cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
/* end confdefs.h. */
|
|
|
|
int
|
|
@@ -3437,42 +3844,18 @@ 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
|
|
+if ac_fn_c_try_compile "$LINENO"; then :
|
|
ac_cv_prog_cc_g=yes
|
|
-else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
-
|
|
fi
|
|
-
|
|
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
fi
|
|
-
|
|
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
fi
|
|
-
|
|
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
ac_c_werror_flag=$ac_save_c_werror_flag
|
|
fi
|
|
-{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
|
|
-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
|
|
+$as_echo "$ac_cv_prog_cc_g" >&6; }
|
|
if test "$ac_test_CFLAGS" = set; then
|
|
CFLAGS=$ac_save_CFLAGS
|
|
elif test $ac_cv_prog_cc_g = yes; then
|
|
@@ -3488,18 +3871,14 @@ else
|
|
CFLAGS=
|
|
fi
|
|
fi
|
|
-{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
|
|
-echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
|
|
-if test "${ac_cv_prog_cc_c89+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
|
|
+$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
|
|
+if test "${ac_cv_prog_cc_c89+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
ac_cv_prog_cc_c89=no
|
|
ac_save_CC=$CC
|
|
-cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
/* end confdefs.h. */
|
|
#include <stdarg.h>
|
|
#include <stdio.h>
|
|
@@ -3556,31 +3935,9 @@ for ac_arg in '' -qlanglvl=extc89 -qlang
|
|
-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
|
|
do
|
|
CC="$ac_save_CC $ac_arg"
|
|
- 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
|
|
+ if ac_fn_c_try_compile "$LINENO"; then :
|
|
ac_cv_prog_cc_c89=$ac_arg
|
|
-else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
-
|
|
fi
|
|
-
|
|
rm -f core conftest.err conftest.$ac_objext
|
|
test "x$ac_cv_prog_cc_c89" != "xno" && break
|
|
done
|
|
@@ -3591,17 +3948,19 @@ fi
|
|
# AC_CACHE_VAL
|
|
case "x$ac_cv_prog_cc_c89" in
|
|
x)
|
|
- { echo "$as_me:$LINENO: result: none needed" >&5
|
|
-echo "${ECHO_T}none needed" >&6; } ;;
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
|
|
+$as_echo "none needed" >&6; } ;;
|
|
xno)
|
|
- { echo "$as_me:$LINENO: result: unsupported" >&5
|
|
-echo "${ECHO_T}unsupported" >&6; } ;;
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
|
|
+$as_echo "unsupported" >&6; } ;;
|
|
*)
|
|
CC="$CC $ac_cv_prog_cc_c89"
|
|
- { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
|
|
-echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
|
|
+$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
|
|
esac
|
|
+if test "x$ac_cv_prog_cc_c89" != xno; then :
|
|
|
|
+fi
|
|
|
|
ac_ext=c
|
|
ac_cpp='$CPP $CPPFLAGS'
|
|
@@ -3611,10 +3970,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
|
|
|
|
depcc="$CC" am_compiler_list=
|
|
|
|
-{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
|
|
-echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }
|
|
-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
|
|
+$as_echo_n "checking dependency style of $depcc... " >&6; }
|
|
+if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
|
|
# We make a subdir and do the tests there. Otherwise we can end up
|
|
@@ -3639,6 +3998,11 @@ else
|
|
if test "$am_compiler_list" = ""; then
|
|
am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
|
|
fi
|
|
+ am__universal=false
|
|
+ case " $depcc " in #(
|
|
+ *\ -arch\ *\ -arch\ *) am__universal=true ;;
|
|
+ esac
|
|
+
|
|
for depmode in $am_compiler_list; do
|
|
# Setup a source with many dependencies, because some compilers
|
|
# like to wrap large dependency lists on column 80 (with \), and
|
|
@@ -3656,7 +4020,17 @@ else
|
|
done
|
|
echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
|
|
|
|
+ # We check with `-c' and `-o' for the sake of the "dashmstdout"
|
|
+ # mode. It turns out that the SunPro C++ compiler does not properly
|
|
+ # handle `-M -o', and we need to detect this. Also, some Intel
|
|
+ # versions had trouble with output in subdirs
|
|
+ am__obj=sub/conftest.${OBJEXT-o}
|
|
+ am__minus_obj="-o $am__obj"
|
|
case $depmode in
|
|
+ gcc)
|
|
+ # This depmode causes a compiler race in universal mode.
|
|
+ test "$am__universal" = false || continue
|
|
+ ;;
|
|
nosideeffect)
|
|
# after this tag, mechanisms are not by side-effect, so they'll
|
|
# only be used when explicitly requested
|
|
@@ -3666,19 +4040,23 @@ else
|
|
break
|
|
fi
|
|
;;
|
|
+ msvisualcpp | msvcmsys)
|
|
+ # This compiler won't grok `-c -o', but also, the minuso test has
|
|
+ # not run yet. These depmodes are late enough in the game, and
|
|
+ # so weak that their functioning should not be impacted.
|
|
+ am__obj=conftest.${OBJEXT-o}
|
|
+ am__minus_obj=
|
|
+ ;;
|
|
none) break ;;
|
|
esac
|
|
- # We check with `-c' and `-o' for the sake of the "dashmstdout"
|
|
- # mode. It turns out that the SunPro C++ compiler does not properly
|
|
- # handle `-M -o', and we need to detect this.
|
|
if depmode=$depmode \
|
|
- source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
|
|
+ source=sub/conftest.c object=$am__obj \
|
|
depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
|
|
- $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
|
|
+ $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
|
|
>/dev/null 2>conftest.err &&
|
|
grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
|
|
grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
|
|
- grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
|
|
+ grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
|
|
${MAKE-make} -s -f confmf > /dev/null 2>&1; then
|
|
# icc doesn't choke on unknown options, it will just issue warnings
|
|
# or remarks (even with -Werror). So we grep stderr for any message
|
|
@@ -3702,8 +4080,8 @@ else
|
|
fi
|
|
|
|
fi
|
|
-{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
|
|
-echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
|
|
+$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
|
|
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
|
|
|
|
if
|
|
@@ -3718,17 +4096,13 @@ fi
|
|
|
|
|
|
|
|
-{ echo "$as_me:$LINENO: checking for library containing strerror" >&5
|
|
-echo $ECHO_N "checking for library containing strerror... $ECHO_C" >&6; }
|
|
-if test "${ac_cv_search_strerror+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing strerror" >&5
|
|
+$as_echo_n "checking for library containing strerror... " >&6; }
|
|
+if test "${ac_cv_search_strerror+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
ac_func_search_save_LIBS=$LIBS
|
|
-cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
/* end confdefs.h. */
|
|
|
|
/* Override any GCC internal prototype to avoid an error.
|
|
@@ -3753,50 +4127,27 @@ for ac_lib in '' cposix; do
|
|
ac_res=-l$ac_lib
|
|
LIBS="-l$ac_lib $ac_func_search_save_LIBS"
|
|
fi
|
|
- rm -f conftest.$ac_objext conftest$ac_exeext
|
|
-if { (ac_try="$ac_link"
|
|
-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_link") 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_exeext &&
|
|
- $as_test_x conftest$ac_exeext; then
|
|
+ if ac_fn_c_try_link "$LINENO"; then :
|
|
ac_cv_search_strerror=$ac_res
|
|
-else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
-
|
|
fi
|
|
-
|
|
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
- conftest$ac_exeext
|
|
- if test "${ac_cv_search_strerror+set}" = set; then
|
|
+rm -f core conftest.err conftest.$ac_objext \
|
|
+ conftest$ac_exeext
|
|
+ if test "${ac_cv_search_strerror+set}" = set; then :
|
|
break
|
|
fi
|
|
done
|
|
-if test "${ac_cv_search_strerror+set}" = set; then
|
|
- :
|
|
+if test "${ac_cv_search_strerror+set}" = set; then :
|
|
+
|
|
else
|
|
ac_cv_search_strerror=no
|
|
fi
|
|
rm conftest.$ac_ext
|
|
LIBS=$ac_func_search_save_LIBS
|
|
fi
|
|
-{ echo "$as_me:$LINENO: result: $ac_cv_search_strerror" >&5
|
|
-echo "${ECHO_T}$ac_cv_search_strerror" >&6; }
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_strerror" >&5
|
|
+$as_echo "$ac_cv_search_strerror" >&6; }
|
|
ac_res=$ac_cv_search_strerror
|
|
-if test "$ac_res" != no; then
|
|
+if test "$ac_res" != no; then :
|
|
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
|
|
|
|
fi
|
|
@@ -3809,10 +4160,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
|
|
if test -n "$ac_tool_prefix"; then
|
|
# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
|
|
set dummy ${ac_tool_prefix}gcc; 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_prog_CC+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
|
+$as_echo_n "checking for $ac_word... " >&6; }
|
|
+if test "${ac_cv_prog_CC+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
if test -n "$CC"; then
|
|
ac_cv_prog_CC="$CC" # Let the user override the test.
|
|
@@ -3822,25 +4173,25 @@ 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
|
|
+ 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_prog_CC="${ac_tool_prefix}gcc"
|
|
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
break 2
|
|
fi
|
|
done
|
|
-done
|
|
+ done
|
|
IFS=$as_save_IFS
|
|
|
|
fi
|
|
fi
|
|
CC=$ac_cv_prog_CC
|
|
if test -n "$CC"; then
|
|
- { echo "$as_me:$LINENO: result: $CC" >&5
|
|
-echo "${ECHO_T}$CC" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
|
|
+$as_echo "$CC" >&6; }
|
|
else
|
|
- { echo "$as_me:$LINENO: result: no" >&5
|
|
-echo "${ECHO_T}no" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
+$as_echo "no" >&6; }
|
|
fi
|
|
|
|
|
|
@@ -3849,10 +4200,10 @@ if test -z "$ac_cv_prog_CC"; then
|
|
ac_ct_CC=$CC
|
|
# Extract the first word of "gcc", so it can be a program name with args.
|
|
set dummy gcc; 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_prog_ac_ct_CC+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
|
+$as_echo_n "checking for $ac_word... " >&6; }
|
|
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
if test -n "$ac_ct_CC"; then
|
|
ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
|
|
@@ -3862,25 +4213,25 @@ 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
|
|
+ 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_prog_ac_ct_CC="gcc"
|
|
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
break 2
|
|
fi
|
|
done
|
|
-done
|
|
+ done
|
|
IFS=$as_save_IFS
|
|
|
|
fi
|
|
fi
|
|
ac_ct_CC=$ac_cv_prog_ac_ct_CC
|
|
if test -n "$ac_ct_CC"; then
|
|
- { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
|
|
-echo "${ECHO_T}$ac_ct_CC" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
|
|
+$as_echo "$ac_ct_CC" >&6; }
|
|
else
|
|
- { echo "$as_me:$LINENO: result: no" >&5
|
|
-echo "${ECHO_T}no" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
+$as_echo "no" >&6; }
|
|
fi
|
|
|
|
if test "x$ac_ct_CC" = x; then
|
|
@@ -3888,12 +4239,8 @@ fi
|
|
else
|
|
case $cross_compiling:$ac_tool_warned in
|
|
yes:)
|
|
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
|
|
-whose name does not start with the host triplet. If you think this
|
|
-configuration is useful to you, please write to autoconf@gnu.org." >&5
|
|
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
|
|
-whose name does not start with the host triplet. If you think this
|
|
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
|
|
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
|
|
ac_tool_warned=yes ;;
|
|
esac
|
|
CC=$ac_ct_CC
|
|
@@ -3906,10 +4253,10 @@ if test -z "$CC"; then
|
|
if test -n "$ac_tool_prefix"; then
|
|
# Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
|
|
set dummy ${ac_tool_prefix}cc; 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_prog_CC+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
|
+$as_echo_n "checking for $ac_word... " >&6; }
|
|
+if test "${ac_cv_prog_CC+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
if test -n "$CC"; then
|
|
ac_cv_prog_CC="$CC" # Let the user override the test.
|
|
@@ -3919,25 +4266,25 @@ 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
|
|
+ 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_prog_CC="${ac_tool_prefix}cc"
|
|
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
break 2
|
|
fi
|
|
done
|
|
-done
|
|
+ done
|
|
IFS=$as_save_IFS
|
|
|
|
fi
|
|
fi
|
|
CC=$ac_cv_prog_CC
|
|
if test -n "$CC"; then
|
|
- { echo "$as_me:$LINENO: result: $CC" >&5
|
|
-echo "${ECHO_T}$CC" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
|
|
+$as_echo "$CC" >&6; }
|
|
else
|
|
- { echo "$as_me:$LINENO: result: no" >&5
|
|
-echo "${ECHO_T}no" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
+$as_echo "no" >&6; }
|
|
fi
|
|
|
|
|
|
@@ -3946,10 +4293,10 @@ fi
|
|
if test -z "$CC"; then
|
|
# Extract the first word of "cc", so it can be a program name with args.
|
|
set dummy cc; 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_prog_CC+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
|
+$as_echo_n "checking for $ac_word... " >&6; }
|
|
+if test "${ac_cv_prog_CC+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
if test -n "$CC"; then
|
|
ac_cv_prog_CC="$CC" # Let the user override the test.
|
|
@@ -3960,18 +4307,18 @@ 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
|
|
+ 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
|
|
if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
|
|
ac_prog_rejected=yes
|
|
continue
|
|
fi
|
|
ac_cv_prog_CC="cc"
|
|
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
break 2
|
|
fi
|
|
done
|
|
-done
|
|
+ done
|
|
IFS=$as_save_IFS
|
|
|
|
if test $ac_prog_rejected = yes; then
|
|
@@ -3990,11 +4337,11 @@ fi
|
|
fi
|
|
CC=$ac_cv_prog_CC
|
|
if test -n "$CC"; then
|
|
- { echo "$as_me:$LINENO: result: $CC" >&5
|
|
-echo "${ECHO_T}$CC" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
|
|
+$as_echo "$CC" >&6; }
|
|
else
|
|
- { echo "$as_me:$LINENO: result: no" >&5
|
|
-echo "${ECHO_T}no" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
+$as_echo "no" >&6; }
|
|
fi
|
|
|
|
|
|
@@ -4005,10 +4352,10 @@ if test -z "$CC"; then
|
|
do
|
|
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
|
|
set dummy $ac_tool_prefix$ac_prog; 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_prog_CC+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
|
+$as_echo_n "checking for $ac_word... " >&6; }
|
|
+if test "${ac_cv_prog_CC+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
if test -n "$CC"; then
|
|
ac_cv_prog_CC="$CC" # Let the user override the test.
|
|
@@ -4018,25 +4365,25 @@ 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
|
|
+ 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_prog_CC="$ac_tool_prefix$ac_prog"
|
|
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
break 2
|
|
fi
|
|
done
|
|
-done
|
|
+ done
|
|
IFS=$as_save_IFS
|
|
|
|
fi
|
|
fi
|
|
CC=$ac_cv_prog_CC
|
|
if test -n "$CC"; then
|
|
- { echo "$as_me:$LINENO: result: $CC" >&5
|
|
-echo "${ECHO_T}$CC" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
|
|
+$as_echo "$CC" >&6; }
|
|
else
|
|
- { echo "$as_me:$LINENO: result: no" >&5
|
|
-echo "${ECHO_T}no" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
+$as_echo "no" >&6; }
|
|
fi
|
|
|
|
|
|
@@ -4049,10 +4396,10 @@ if test -z "$CC"; then
|
|
do
|
|
# Extract the first word of "$ac_prog", so it can be a program name with args.
|
|
set dummy $ac_prog; 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_prog_ac_ct_CC+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
|
+$as_echo_n "checking for $ac_word... " >&6; }
|
|
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
if test -n "$ac_ct_CC"; then
|
|
ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
|
|
@@ -4062,25 +4409,25 @@ 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
|
|
+ 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_prog_ac_ct_CC="$ac_prog"
|
|
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
break 2
|
|
fi
|
|
done
|
|
-done
|
|
+ done
|
|
IFS=$as_save_IFS
|
|
|
|
fi
|
|
fi
|
|
ac_ct_CC=$ac_cv_prog_ac_ct_CC
|
|
if test -n "$ac_ct_CC"; then
|
|
- { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
|
|
-echo "${ECHO_T}$ac_ct_CC" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
|
|
+$as_echo "$ac_ct_CC" >&6; }
|
|
else
|
|
- { echo "$as_me:$LINENO: result: no" >&5
|
|
-echo "${ECHO_T}no" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
+$as_echo "no" >&6; }
|
|
fi
|
|
|
|
|
|
@@ -4092,12 +4439,8 @@ done
|
|
else
|
|
case $cross_compiling:$ac_tool_warned in
|
|
yes:)
|
|
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
|
|
-whose name does not start with the host triplet. If you think this
|
|
-configuration is useful to you, please write to autoconf@gnu.org." >&5
|
|
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
|
|
-whose name does not start with the host triplet. If you think this
|
|
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
|
|
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
|
|
ac_tool_warned=yes ;;
|
|
esac
|
|
CC=$ac_ct_CC
|
|
@@ -4107,56 +4450,42 @@ fi
|
|
fi
|
|
|
|
|
|
-test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
|
|
-See \`config.log' for more details." >&5
|
|
-echo "$as_me: error: no acceptable C compiler found in \$PATH
|
|
-See \`config.log' for more details." >&2;}
|
|
- { (exit 1); exit 1; }; }
|
|
+test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
|
|
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
|
|
+as_fn_error "no acceptable C compiler found in \$PATH
|
|
+See \`config.log' for more details." "$LINENO" 5; }
|
|
|
|
# Provide some information about the compiler.
|
|
-echo "$as_me:$LINENO: checking for C compiler version" >&5
|
|
-ac_compiler=`set X $ac_compile; echo $2`
|
|
-{ (ac_try="$ac_compiler --version >&5"
|
|
-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_compiler --version >&5") 2>&5
|
|
- ac_status=$?
|
|
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
- (exit $ac_status); }
|
|
-{ (ac_try="$ac_compiler -v >&5"
|
|
-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_compiler -v >&5") 2>&5
|
|
- ac_status=$?
|
|
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
- (exit $ac_status); }
|
|
-{ (ac_try="$ac_compiler -V >&5"
|
|
+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
|
|
+set X $ac_compile
|
|
+ac_compiler=$2
|
|
+for ac_option in --version -v -V -qversion; do
|
|
+ { { ac_try="$ac_compiler $ac_option >&5"
|
|
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_compiler -V >&5") 2>&5
|
|
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
|
|
+$as_echo "$ac_try_echo"; } >&5
|
|
+ (eval "$ac_compiler $ac_option >&5") 2>conftest.err
|
|
ac_status=$?
|
|
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
- (exit $ac_status); }
|
|
+ if test -s conftest.err; then
|
|
+ sed '10a\
|
|
+... rest of stderr output deleted ...
|
|
+ 10q' conftest.err >conftest.er1
|
|
+ cat conftest.er1 >&5
|
|
+ rm -f conftest.er1 conftest.err
|
|
+ fi
|
|
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
|
+ test $ac_status = 0; }
|
|
+done
|
|
|
|
-{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
|
|
-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
|
|
-if test "${ac_cv_c_compiler_gnu+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
|
|
+$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
|
|
+if test "${ac_cv_c_compiler_gnu+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
- cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
/* end confdefs.h. */
|
|
|
|
int
|
|
@@ -4170,54 +4499,34 @@ 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
|
|
+if ac_fn_c_try_compile "$LINENO"; then :
|
|
ac_compiler_gnu=yes
|
|
else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
- ac_compiler_gnu=no
|
|
+ ac_compiler_gnu=no
|
|
fi
|
|
-
|
|
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
ac_cv_c_compiler_gnu=$ac_compiler_gnu
|
|
|
|
fi
|
|
-{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
|
|
-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
|
|
-GCC=`test $ac_compiler_gnu = yes && echo yes`
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
|
|
+$as_echo "$ac_cv_c_compiler_gnu" >&6; }
|
|
+if test $ac_compiler_gnu = yes; then
|
|
+ GCC=yes
|
|
+else
|
|
+ GCC=
|
|
+fi
|
|
ac_test_CFLAGS=${CFLAGS+set}
|
|
ac_save_CFLAGS=$CFLAGS
|
|
-{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
|
|
-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
|
|
-if test "${ac_cv_prog_cc_g+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
|
|
+$as_echo_n "checking whether $CC accepts -g... " >&6; }
|
|
+if test "${ac_cv_prog_cc_g+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
ac_save_c_werror_flag=$ac_c_werror_flag
|
|
ac_c_werror_flag=yes
|
|
ac_cv_prog_cc_g=no
|
|
CFLAGS="-g"
|
|
- cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
/* end confdefs.h. */
|
|
|
|
int
|
|
@@ -4228,34 +4537,11 @@ 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
|
|
+if ac_fn_c_try_compile "$LINENO"; then :
|
|
ac_cv_prog_cc_g=yes
|
|
else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
- CFLAGS=""
|
|
- cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
+ CFLAGS=""
|
|
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
/* end confdefs.h. */
|
|
|
|
int
|
|
@@ -4266,35 +4552,12 @@ 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
|
|
- :
|
|
-else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
+if ac_fn_c_try_compile "$LINENO"; then :
|
|
|
|
- ac_c_werror_flag=$ac_save_c_werror_flag
|
|
+else
|
|
+ ac_c_werror_flag=$ac_save_c_werror_flag
|
|
CFLAGS="-g"
|
|
- cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
/* end confdefs.h. */
|
|
|
|
int
|
|
@@ -4305,42 +4568,18 @@ 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
|
|
+if ac_fn_c_try_compile "$LINENO"; then :
|
|
ac_cv_prog_cc_g=yes
|
|
-else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
-
|
|
fi
|
|
-
|
|
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
fi
|
|
-
|
|
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
fi
|
|
-
|
|
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
ac_c_werror_flag=$ac_save_c_werror_flag
|
|
fi
|
|
-{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
|
|
-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
|
|
+$as_echo "$ac_cv_prog_cc_g" >&6; }
|
|
if test "$ac_test_CFLAGS" = set; then
|
|
CFLAGS=$ac_save_CFLAGS
|
|
elif test $ac_cv_prog_cc_g = yes; then
|
|
@@ -4356,18 +4595,14 @@ else
|
|
CFLAGS=
|
|
fi
|
|
fi
|
|
-{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
|
|
-echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
|
|
-if test "${ac_cv_prog_cc_c89+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
|
|
+$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
|
|
+if test "${ac_cv_prog_cc_c89+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
ac_cv_prog_cc_c89=no
|
|
ac_save_CC=$CC
|
|
-cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
/* end confdefs.h. */
|
|
#include <stdarg.h>
|
|
#include <stdio.h>
|
|
@@ -4424,31 +4659,9 @@ for ac_arg in '' -qlanglvl=extc89 -qlang
|
|
-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
|
|
do
|
|
CC="$ac_save_CC $ac_arg"
|
|
- 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
|
|
+ if ac_fn_c_try_compile "$LINENO"; then :
|
|
ac_cv_prog_cc_c89=$ac_arg
|
|
-else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
-
|
|
fi
|
|
-
|
|
rm -f core conftest.err conftest.$ac_objext
|
|
test "x$ac_cv_prog_cc_c89" != "xno" && break
|
|
done
|
|
@@ -4459,17 +4672,19 @@ fi
|
|
# AC_CACHE_VAL
|
|
case "x$ac_cv_prog_cc_c89" in
|
|
x)
|
|
- { echo "$as_me:$LINENO: result: none needed" >&5
|
|
-echo "${ECHO_T}none needed" >&6; } ;;
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
|
|
+$as_echo "none needed" >&6; } ;;
|
|
xno)
|
|
- { echo "$as_me:$LINENO: result: unsupported" >&5
|
|
-echo "${ECHO_T}unsupported" >&6; } ;;
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
|
|
+$as_echo "unsupported" >&6; } ;;
|
|
*)
|
|
CC="$CC $ac_cv_prog_cc_c89"
|
|
- { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
|
|
-echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
|
|
+$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
|
|
esac
|
|
+if test "x$ac_cv_prog_cc_c89" != xno; then :
|
|
|
|
+fi
|
|
|
|
ac_ext=c
|
|
ac_cpp='$CPP $CPPFLAGS'
|
|
@@ -4479,10 +4694,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
|
|
|
|
depcc="$CC" am_compiler_list=
|
|
|
|
-{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
|
|
-echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }
|
|
-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
|
|
+$as_echo_n "checking dependency style of $depcc... " >&6; }
|
|
+if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
|
|
# We make a subdir and do the tests there. Otherwise we can end up
|
|
@@ -4507,6 +4722,11 @@ else
|
|
if test "$am_compiler_list" = ""; then
|
|
am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
|
|
fi
|
|
+ am__universal=false
|
|
+ case " $depcc " in #(
|
|
+ *\ -arch\ *\ -arch\ *) am__universal=true ;;
|
|
+ esac
|
|
+
|
|
for depmode in $am_compiler_list; do
|
|
# Setup a source with many dependencies, because some compilers
|
|
# like to wrap large dependency lists on column 80 (with \), and
|
|
@@ -4524,7 +4744,17 @@ else
|
|
done
|
|
echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
|
|
|
|
+ # We check with `-c' and `-o' for the sake of the "dashmstdout"
|
|
+ # mode. It turns out that the SunPro C++ compiler does not properly
|
|
+ # handle `-M -o', and we need to detect this. Also, some Intel
|
|
+ # versions had trouble with output in subdirs
|
|
+ am__obj=sub/conftest.${OBJEXT-o}
|
|
+ am__minus_obj="-o $am__obj"
|
|
case $depmode in
|
|
+ gcc)
|
|
+ # This depmode causes a compiler race in universal mode.
|
|
+ test "$am__universal" = false || continue
|
|
+ ;;
|
|
nosideeffect)
|
|
# after this tag, mechanisms are not by side-effect, so they'll
|
|
# only be used when explicitly requested
|
|
@@ -4534,19 +4764,23 @@ else
|
|
break
|
|
fi
|
|
;;
|
|
+ msvisualcpp | msvcmsys)
|
|
+ # This compiler won't grok `-c -o', but also, the minuso test has
|
|
+ # not run yet. These depmodes are late enough in the game, and
|
|
+ # so weak that their functioning should not be impacted.
|
|
+ am__obj=conftest.${OBJEXT-o}
|
|
+ am__minus_obj=
|
|
+ ;;
|
|
none) break ;;
|
|
esac
|
|
- # We check with `-c' and `-o' for the sake of the "dashmstdout"
|
|
- # mode. It turns out that the SunPro C++ compiler does not properly
|
|
- # handle `-M -o', and we need to detect this.
|
|
if depmode=$depmode \
|
|
- source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
|
|
+ source=sub/conftest.c object=$am__obj \
|
|
depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
|
|
- $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
|
|
+ $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
|
|
>/dev/null 2>conftest.err &&
|
|
grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
|
|
grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
|
|
- grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
|
|
+ grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
|
|
${MAKE-make} -s -f confmf > /dev/null 2>&1; then
|
|
# icc doesn't choke on unknown options, it will just issue warnings
|
|
# or remarks (even with -Werror). So we grep stderr for any message
|
|
@@ -4570,8 +4804,8 @@ else
|
|
fi
|
|
|
|
fi
|
|
-{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
|
|
-echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
|
|
+$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
|
|
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
|
|
|
|
if
|
|
@@ -4590,15 +4824,15 @@ ac_cpp='$CPP $CPPFLAGS'
|
|
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
|
|
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
|
|
ac_compiler_gnu=$ac_cv_c_compiler_gnu
|
|
-{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
|
|
-echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; }
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
|
|
+$as_echo_n "checking how to run the C preprocessor... " >&6; }
|
|
# On Suns, sometimes $CPP names a directory.
|
|
if test -n "$CPP" && test -d "$CPP"; then
|
|
CPP=
|
|
fi
|
|
if test -z "$CPP"; then
|
|
- if test "${ac_cv_prog_CPP+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+ if test "${ac_cv_prog_CPP+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
# Double quotes because CPP needs to be expanded
|
|
for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
|
|
@@ -4612,11 +4846,7 @@ do
|
|
# <limits.h> exists even on freestanding compilers.
|
|
# On the NeXT, cc -E runs the code through the compiler's parser,
|
|
# not just through cpp. "Syntax error" is here to catch this case.
|
|
- cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
/* end confdefs.h. */
|
|
#ifdef __STDC__
|
|
# include <limits.h>
|
|
@@ -4625,76 +4855,34 @@ cat >>conftest.$ac_ext <<_ACEOF
|
|
#endif
|
|
Syntax error
|
|
_ACEOF
|
|
-if { (ac_try="$ac_cpp conftest.$ac_ext"
|
|
-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_cpp conftest.$ac_ext") 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); } >/dev/null && {
|
|
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
|
|
- test ! -s conftest.err
|
|
- }; then
|
|
- :
|
|
-else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
+if ac_fn_c_try_cpp "$LINENO"; then :
|
|
|
|
+else
|
|
# Broken: fails on valid input.
|
|
continue
|
|
fi
|
|
-
|
|
rm -f conftest.err conftest.$ac_ext
|
|
|
|
# OK, works on sane cases. Now check whether nonexistent headers
|
|
# can be detected and how.
|
|
- cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
/* end confdefs.h. */
|
|
#include <ac_nonexistent.h>
|
|
_ACEOF
|
|
-if { (ac_try="$ac_cpp conftest.$ac_ext"
|
|
-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_cpp conftest.$ac_ext") 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); } >/dev/null && {
|
|
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
|
|
- test ! -s conftest.err
|
|
- }; then
|
|
+if ac_fn_c_try_cpp "$LINENO"; then :
|
|
# Broken: success on invalid input.
|
|
continue
|
|
else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
# Passes both tests.
|
|
ac_preproc_ok=:
|
|
break
|
|
fi
|
|
-
|
|
rm -f conftest.err conftest.$ac_ext
|
|
|
|
done
|
|
# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
|
|
rm -f conftest.err conftest.$ac_ext
|
|
-if $ac_preproc_ok; then
|
|
+if $ac_preproc_ok; then :
|
|
break
|
|
fi
|
|
|
|
@@ -4706,8 +4894,8 @@ fi
|
|
else
|
|
ac_cv_prog_CPP=$CPP
|
|
fi
|
|
-{ echo "$as_me:$LINENO: result: $CPP" >&5
|
|
-echo "${ECHO_T}$CPP" >&6; }
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
|
|
+$as_echo "$CPP" >&6; }
|
|
ac_preproc_ok=false
|
|
for ac_c_preproc_warn_flag in '' yes
|
|
do
|
|
@@ -4717,11 +4905,7 @@ do
|
|
# <limits.h> exists even on freestanding compilers.
|
|
# On the NeXT, cc -E runs the code through the compiler's parser,
|
|
# not just through cpp. "Syntax error" is here to catch this case.
|
|
- cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
/* end confdefs.h. */
|
|
#ifdef __STDC__
|
|
# include <limits.h>
|
|
@@ -4730,83 +4914,40 @@ cat >>conftest.$ac_ext <<_ACEOF
|
|
#endif
|
|
Syntax error
|
|
_ACEOF
|
|
-if { (ac_try="$ac_cpp conftest.$ac_ext"
|
|
-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_cpp conftest.$ac_ext") 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); } >/dev/null && {
|
|
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
|
|
- test ! -s conftest.err
|
|
- }; then
|
|
- :
|
|
-else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
+if ac_fn_c_try_cpp "$LINENO"; then :
|
|
|
|
+else
|
|
# Broken: fails on valid input.
|
|
continue
|
|
fi
|
|
-
|
|
rm -f conftest.err conftest.$ac_ext
|
|
|
|
# OK, works on sane cases. Now check whether nonexistent headers
|
|
# can be detected and how.
|
|
- cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
/* end confdefs.h. */
|
|
#include <ac_nonexistent.h>
|
|
_ACEOF
|
|
-if { (ac_try="$ac_cpp conftest.$ac_ext"
|
|
-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_cpp conftest.$ac_ext") 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); } >/dev/null && {
|
|
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
|
|
- test ! -s conftest.err
|
|
- }; then
|
|
+if ac_fn_c_try_cpp "$LINENO"; then :
|
|
# Broken: success on invalid input.
|
|
continue
|
|
else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
# Passes both tests.
|
|
ac_preproc_ok=:
|
|
break
|
|
fi
|
|
-
|
|
rm -f conftest.err conftest.$ac_ext
|
|
|
|
done
|
|
# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
|
|
rm -f conftest.err conftest.$ac_ext
|
|
-if $ac_preproc_ok; then
|
|
- :
|
|
+if $ac_preproc_ok; then :
|
|
+
|
|
else
|
|
- { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
|
|
-See \`config.log' for more details." >&5
|
|
-echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
|
|
-See \`config.log' for more details." >&2;}
|
|
- { (exit 1); exit 1; }; }
|
|
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
|
|
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
|
|
+as_fn_error "C preprocessor \"$CPP\" fails sanity check
|
|
+See \`config.log' for more details." "$LINENO" 5; }
|
|
fi
|
|
|
|
ac_ext=c
|
|
@@ -4816,45 +4957,40 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
|
|
ac_compiler_gnu=$ac_cv_c_compiler_gnu
|
|
|
|
|
|
-{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
|
|
-echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; }
|
|
-if test "${ac_cv_path_GREP+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
-else
|
|
- # Extract the first word of "grep ggrep" to use in msg output
|
|
-if test -z "$GREP"; then
|
|
-set dummy grep ggrep; ac_prog_name=$2
|
|
-if test "${ac_cv_path_GREP+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
|
|
+$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
|
|
+if test "${ac_cv_path_GREP+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
+ if test -z "$GREP"; then
|
|
ac_path_GREP_found=false
|
|
-# Loop through the user's path and test for each of PROGNAME-LIST
|
|
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
|
+ # Loop through the user's path and test for each of PROGNAME-LIST
|
|
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
|
for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
|
|
do
|
|
IFS=$as_save_IFS
|
|
test -z "$as_dir" && as_dir=.
|
|
- for ac_prog in grep ggrep; do
|
|
- for ac_exec_ext in '' $ac_executable_extensions; do
|
|
- ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
|
|
- { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
|
|
- # Check for GNU ac_path_GREP and select it if it is found.
|
|
+ for ac_prog in grep ggrep; do
|
|
+ for ac_exec_ext in '' $ac_executable_extensions; do
|
|
+ ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
|
|
+ { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
|
|
+# Check for GNU ac_path_GREP and select it if it is found.
|
|
# Check for GNU $ac_path_GREP
|
|
case `"$ac_path_GREP" --version 2>&1` in
|
|
*GNU*)
|
|
ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
|
|
*)
|
|
ac_count=0
|
|
- echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
|
|
+ $as_echo_n 0123456789 >"conftest.in"
|
|
while :
|
|
do
|
|
cat "conftest.in" "conftest.in" >"conftest.tmp"
|
|
mv "conftest.tmp" "conftest.in"
|
|
cp "conftest.in" "conftest.nl"
|
|
- echo 'GREP' >> "conftest.nl"
|
|
+ $as_echo 'GREP' >> "conftest.nl"
|
|
"$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
|
|
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
|
|
- ac_count=`expr $ac_count + 1`
|
|
+ as_fn_arith $ac_count + 1 && ac_count=$as_val
|
|
if test $ac_count -gt ${ac_path_GREP_max-0}; then
|
|
# Best one so far, save it but keep looking for a better one
|
|
ac_cv_path_GREP="$ac_path_GREP"
|
|
@@ -4866,77 +5002,61 @@ case `"$ac_path_GREP" --version 2>&1` in
|
|
rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
|
|
esac
|
|
|
|
-
|
|
- $ac_path_GREP_found && break 3
|
|
+ $ac_path_GREP_found && break 3
|
|
+ done
|
|
+ done
|
|
done
|
|
-done
|
|
-
|
|
-done
|
|
IFS=$as_save_IFS
|
|
-
|
|
-
|
|
-fi
|
|
-
|
|
-GREP="$ac_cv_path_GREP"
|
|
-if test -z "$GREP"; then
|
|
- { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
|
|
-echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
|
|
- { (exit 1); exit 1; }; }
|
|
-fi
|
|
-
|
|
+ if test -z "$ac_cv_path_GREP"; then
|
|
+ as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
|
|
+ fi
|
|
else
|
|
ac_cv_path_GREP=$GREP
|
|
fi
|
|
|
|
-
|
|
fi
|
|
-{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
|
|
-echo "${ECHO_T}$ac_cv_path_GREP" >&6; }
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
|
|
+$as_echo "$ac_cv_path_GREP" >&6; }
|
|
GREP="$ac_cv_path_GREP"
|
|
|
|
|
|
-{ echo "$as_me:$LINENO: checking for egrep" >&5
|
|
-echo $ECHO_N "checking for egrep... $ECHO_C" >&6; }
|
|
-if test "${ac_cv_path_EGREP+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
|
|
+$as_echo_n "checking for egrep... " >&6; }
|
|
+if test "${ac_cv_path_EGREP+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
|
|
then ac_cv_path_EGREP="$GREP -E"
|
|
else
|
|
- # Extract the first word of "egrep" to use in msg output
|
|
-if test -z "$EGREP"; then
|
|
-set dummy egrep; ac_prog_name=$2
|
|
-if test "${ac_cv_path_EGREP+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
-else
|
|
+ if test -z "$EGREP"; then
|
|
ac_path_EGREP_found=false
|
|
-# Loop through the user's path and test for each of PROGNAME-LIST
|
|
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
|
+ # Loop through the user's path and test for each of PROGNAME-LIST
|
|
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
|
for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
|
|
do
|
|
IFS=$as_save_IFS
|
|
test -z "$as_dir" && as_dir=.
|
|
- for ac_prog in egrep; do
|
|
- for ac_exec_ext in '' $ac_executable_extensions; do
|
|
- ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
|
|
- { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
|
|
- # Check for GNU ac_path_EGREP and select it if it is found.
|
|
+ for ac_prog in egrep; do
|
|
+ for ac_exec_ext in '' $ac_executable_extensions; do
|
|
+ ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
|
|
+ { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
|
|
+# Check for GNU ac_path_EGREP and select it if it is found.
|
|
# Check for GNU $ac_path_EGREP
|
|
case `"$ac_path_EGREP" --version 2>&1` in
|
|
*GNU*)
|
|
ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
|
|
*)
|
|
ac_count=0
|
|
- echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
|
|
+ $as_echo_n 0123456789 >"conftest.in"
|
|
while :
|
|
do
|
|
cat "conftest.in" "conftest.in" >"conftest.tmp"
|
|
mv "conftest.tmp" "conftest.in"
|
|
cp "conftest.in" "conftest.nl"
|
|
- echo 'EGREP' >> "conftest.nl"
|
|
+ $as_echo 'EGREP' >> "conftest.nl"
|
|
"$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
|
|
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
|
|
- ac_count=`expr $ac_count + 1`
|
|
+ as_fn_arith $ac_count + 1 && ac_count=$as_val
|
|
if test $ac_count -gt ${ac_path_EGREP_max-0}; then
|
|
# Best one so far, save it but keep looking for a better one
|
|
ac_cv_path_EGREP="$ac_path_EGREP"
|
|
@@ -4948,46 +5068,31 @@ case `"$ac_path_EGREP" --version 2>&1` i
|
|
rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
|
|
esac
|
|
|
|
-
|
|
- $ac_path_EGREP_found && break 3
|
|
+ $ac_path_EGREP_found && break 3
|
|
+ done
|
|
+ done
|
|
done
|
|
-done
|
|
-
|
|
-done
|
|
IFS=$as_save_IFS
|
|
-
|
|
-
|
|
-fi
|
|
-
|
|
-EGREP="$ac_cv_path_EGREP"
|
|
-if test -z "$EGREP"; then
|
|
- { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
|
|
-echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
|
|
- { (exit 1); exit 1; }; }
|
|
-fi
|
|
-
|
|
+ if test -z "$ac_cv_path_EGREP"; then
|
|
+ as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
|
|
+ fi
|
|
else
|
|
ac_cv_path_EGREP=$EGREP
|
|
fi
|
|
|
|
-
|
|
fi
|
|
fi
|
|
-{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
|
|
-echo "${ECHO_T}$ac_cv_path_EGREP" >&6; }
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
|
|
+$as_echo "$ac_cv_path_EGREP" >&6; }
|
|
EGREP="$ac_cv_path_EGREP"
|
|
|
|
|
|
-{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
|
|
-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
|
|
-if test "${ac_cv_header_stdc+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
|
|
+$as_echo_n "checking for ANSI C header files... " >&6; }
|
|
+if test "${ac_cv_header_stdc+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
- cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
/* end confdefs.h. */
|
|
#include <stdlib.h>
|
|
#include <stdarg.h>
|
|
@@ -5002,47 +5107,23 @@ 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
|
|
+if ac_fn_c_try_compile "$LINENO"; then :
|
|
ac_cv_header_stdc=yes
|
|
else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
- ac_cv_header_stdc=no
|
|
+ ac_cv_header_stdc=no
|
|
fi
|
|
-
|
|
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
|
|
if test $ac_cv_header_stdc = yes; then
|
|
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
|
|
- cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
/* end confdefs.h. */
|
|
#include <string.h>
|
|
|
|
_ACEOF
|
|
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
|
|
- $EGREP "memchr" >/dev/null 2>&1; then
|
|
- :
|
|
+ $EGREP "memchr" >/dev/null 2>&1; then :
|
|
+
|
|
else
|
|
ac_cv_header_stdc=no
|
|
fi
|
|
@@ -5052,18 +5133,14 @@ fi
|
|
|
|
if test $ac_cv_header_stdc = yes; then
|
|
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
|
|
- cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
/* end confdefs.h. */
|
|
#include <stdlib.h>
|
|
|
|
_ACEOF
|
|
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
|
|
- $EGREP "free" >/dev/null 2>&1; then
|
|
- :
|
|
+ $EGREP "free" >/dev/null 2>&1; then :
|
|
+
|
|
else
|
|
ac_cv_header_stdc=no
|
|
fi
|
|
@@ -5073,14 +5150,10 @@ fi
|
|
|
|
if test $ac_cv_header_stdc = yes; then
|
|
# /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
|
|
- if test "$cross_compiling" = yes; then
|
|
+ if test "$cross_compiling" = yes; then :
|
|
:
|
|
else
|
|
- cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
/* end confdefs.h. */
|
|
#include <ctype.h>
|
|
#include <stdlib.h>
|
|
@@ -5107,48 +5180,22 @@ main ()
|
|
return 0;
|
|
}
|
|
_ACEOF
|
|
-rm -f conftest$ac_exeext
|
|
-if { (ac_try="$ac_link"
|
|
-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_link") 2>&5
|
|
- ac_status=$?
|
|
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
|
|
- { (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_try") 2>&5
|
|
- ac_status=$?
|
|
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
- (exit $ac_status); }; }; then
|
|
- :
|
|
-else
|
|
- echo "$as_me: program exited with status $ac_status" >&5
|
|
-echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
+if ac_fn_c_try_run "$LINENO"; then :
|
|
|
|
-( exit $ac_status )
|
|
-ac_cv_header_stdc=no
|
|
+else
|
|
+ ac_cv_header_stdc=no
|
|
fi
|
|
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
|
|
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
|
|
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
|
|
fi
|
|
|
|
-
|
|
fi
|
|
fi
|
|
-{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
|
|
-echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
|
|
+$as_echo "$ac_cv_header_stdc" >&6; }
|
|
if test $ac_cv_header_stdc = yes; then
|
|
|
|
-cat >>confdefs.h <<\_ACEOF
|
|
-#define STDC_HEADERS 1
|
|
-_ACEOF
|
|
+$as_echo "#define STDC_HEADERS 1" >>confdefs.h
|
|
|
|
fi
|
|
|
|
@@ -5160,10 +5207,10 @@ for ac_prog in gawk awk
|
|
do
|
|
# Extract the first word of "$ac_prog", so it can be a program name with args.
|
|
set dummy $ac_prog; 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_prog_AWK+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
|
+$as_echo_n "checking for $ac_word... " >&6; }
|
|
+if test "${ac_cv_prog_AWK+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
if test -n "$AWK"; then
|
|
ac_cv_prog_AWK="$AWK" # Let the user override the test.
|
|
@@ -5173,43 +5220,41 @@ 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
|
|
+ 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_prog_AWK="$ac_prog"
|
|
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
break 2
|
|
fi
|
|
done
|
|
-done
|
|
+ done
|
|
IFS=$as_save_IFS
|
|
|
|
fi
|
|
fi
|
|
AWK=$ac_cv_prog_AWK
|
|
if test -n "$AWK"; then
|
|
- { echo "$as_me:$LINENO: result: $AWK" >&5
|
|
-echo "${ECHO_T}$AWK" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
|
|
+$as_echo "$AWK" >&6; }
|
|
else
|
|
- { echo "$as_me:$LINENO: result: no" >&5
|
|
-echo "${ECHO_T}no" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
+$as_echo "no" >&6; }
|
|
fi
|
|
|
|
|
|
test -n "$AWK" && break
|
|
done
|
|
|
|
-test -z "$AWK" && { { echo "$as_me:$LINENO: error: Sorry, you need a working awk interpreter." >&5
|
|
-echo "$as_me: error: Sorry, you need a working awk interpreter." >&2;}
|
|
- { (exit 1); exit 1; }; }
|
|
+test -z "$AWK" && as_fn_error "Sorry, you need a working awk interpreter." "$LINENO" 5
|
|
|
|
for ac_prog in perl5 perl
|
|
do
|
|
# Extract the first word of "$ac_prog", so it can be a program name with args.
|
|
set dummy $ac_prog; 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_prog_PERL+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
|
+$as_echo_n "checking for $ac_word... " >&6; }
|
|
+if test "${ac_cv_prog_PERL+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
if test -n "$PERL"; then
|
|
ac_cv_prog_PERL="$PERL" # Let the user override the test.
|
|
@@ -5219,42 +5264,40 @@ 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
|
|
+ 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_prog_PERL="$ac_prog"
|
|
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
break 2
|
|
fi
|
|
done
|
|
-done
|
|
+ done
|
|
IFS=$as_save_IFS
|
|
|
|
fi
|
|
fi
|
|
PERL=$ac_cv_prog_PERL
|
|
if test -n "$PERL"; then
|
|
- { echo "$as_me:$LINENO: result: $PERL" >&5
|
|
-echo "${ECHO_T}$PERL" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PERL" >&5
|
|
+$as_echo "$PERL" >&6; }
|
|
else
|
|
- { echo "$as_me:$LINENO: result: no" >&5
|
|
-echo "${ECHO_T}no" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
+$as_echo "no" >&6; }
|
|
fi
|
|
|
|
|
|
test -n "$PERL" && break
|
|
done
|
|
|
|
-test -z "$PERL" && { { echo "$as_me:$LINENO: error: You need to have a working perl interpreter." >&5
|
|
-echo "$as_me: error: You need to have a working perl interpreter." >&2;}
|
|
- { (exit 1); exit 1; }; }
|
|
+test -z "$PERL" && as_fn_error "You need to have a working perl interpreter." "$LINENO" 5
|
|
|
|
if test -n "$ac_tool_prefix"; then
|
|
# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
|
|
set dummy ${ac_tool_prefix}gcc; 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_prog_CC+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
|
+$as_echo_n "checking for $ac_word... " >&6; }
|
|
+if test "${ac_cv_prog_CC+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
if test -n "$CC"; then
|
|
ac_cv_prog_CC="$CC" # Let the user override the test.
|
|
@@ -5264,25 +5307,25 @@ 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
|
|
+ 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_prog_CC="${ac_tool_prefix}gcc"
|
|
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
break 2
|
|
fi
|
|
done
|
|
-done
|
|
+ done
|
|
IFS=$as_save_IFS
|
|
|
|
fi
|
|
fi
|
|
CC=$ac_cv_prog_CC
|
|
if test -n "$CC"; then
|
|
- { echo "$as_me:$LINENO: result: $CC" >&5
|
|
-echo "${ECHO_T}$CC" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
|
|
+$as_echo "$CC" >&6; }
|
|
else
|
|
- { echo "$as_me:$LINENO: result: no" >&5
|
|
-echo "${ECHO_T}no" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
+$as_echo "no" >&6; }
|
|
fi
|
|
|
|
|
|
@@ -5291,10 +5334,10 @@ if test -z "$ac_cv_prog_CC"; then
|
|
ac_ct_CC=$CC
|
|
# Extract the first word of "gcc", so it can be a program name with args.
|
|
set dummy gcc; 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_prog_ac_ct_CC+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
|
+$as_echo_n "checking for $ac_word... " >&6; }
|
|
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
if test -n "$ac_ct_CC"; then
|
|
ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
|
|
@@ -5304,25 +5347,25 @@ 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
|
|
+ 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_prog_ac_ct_CC="gcc"
|
|
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
break 2
|
|
fi
|
|
done
|
|
-done
|
|
+ done
|
|
IFS=$as_save_IFS
|
|
|
|
fi
|
|
fi
|
|
ac_ct_CC=$ac_cv_prog_ac_ct_CC
|
|
if test -n "$ac_ct_CC"; then
|
|
- { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
|
|
-echo "${ECHO_T}$ac_ct_CC" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
|
|
+$as_echo "$ac_ct_CC" >&6; }
|
|
else
|
|
- { echo "$as_me:$LINENO: result: no" >&5
|
|
-echo "${ECHO_T}no" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
+$as_echo "no" >&6; }
|
|
fi
|
|
|
|
if test "x$ac_ct_CC" = x; then
|
|
@@ -5330,12 +5373,8 @@ fi
|
|
else
|
|
case $cross_compiling:$ac_tool_warned in
|
|
yes:)
|
|
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
|
|
-whose name does not start with the host triplet. If you think this
|
|
-configuration is useful to you, please write to autoconf@gnu.org." >&5
|
|
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
|
|
-whose name does not start with the host triplet. If you think this
|
|
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
|
|
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
|
|
ac_tool_warned=yes ;;
|
|
esac
|
|
CC=$ac_ct_CC
|
|
@@ -5347,10 +5386,10 @@ fi
|
|
if test -n "$ac_tool_prefix"; then
|
|
# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
|
|
set dummy ${ac_tool_prefix}ranlib; 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_prog_RANLIB+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
|
+$as_echo_n "checking for $ac_word... " >&6; }
|
|
+if test "${ac_cv_prog_RANLIB+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
if test -n "$RANLIB"; then
|
|
ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
|
|
@@ -5360,25 +5399,25 @@ 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
|
|
+ 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_prog_RANLIB="${ac_tool_prefix}ranlib"
|
|
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
break 2
|
|
fi
|
|
done
|
|
-done
|
|
+ done
|
|
IFS=$as_save_IFS
|
|
|
|
fi
|
|
fi
|
|
RANLIB=$ac_cv_prog_RANLIB
|
|
if test -n "$RANLIB"; then
|
|
- { echo "$as_me:$LINENO: result: $RANLIB" >&5
|
|
-echo "${ECHO_T}$RANLIB" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
|
|
+$as_echo "$RANLIB" >&6; }
|
|
else
|
|
- { echo "$as_me:$LINENO: result: no" >&5
|
|
-echo "${ECHO_T}no" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
+$as_echo "no" >&6; }
|
|
fi
|
|
|
|
|
|
@@ -5387,10 +5426,10 @@ if test -z "$ac_cv_prog_RANLIB"; then
|
|
ac_ct_RANLIB=$RANLIB
|
|
# Extract the first word of "ranlib", so it can be a program name with args.
|
|
set dummy ranlib; 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_prog_ac_ct_RANLIB+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
|
+$as_echo_n "checking for $ac_word... " >&6; }
|
|
+if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
if test -n "$ac_ct_RANLIB"; then
|
|
ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
|
|
@@ -5400,25 +5439,25 @@ 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
|
|
+ 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_prog_ac_ct_RANLIB="ranlib"
|
|
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
break 2
|
|
fi
|
|
done
|
|
-done
|
|
+ done
|
|
IFS=$as_save_IFS
|
|
|
|
fi
|
|
fi
|
|
ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
|
|
if test -n "$ac_ct_RANLIB"; then
|
|
- { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
|
|
-echo "${ECHO_T}$ac_ct_RANLIB" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
|
|
+$as_echo "$ac_ct_RANLIB" >&6; }
|
|
else
|
|
- { echo "$as_me:$LINENO: result: no" >&5
|
|
-echo "${ECHO_T}no" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
+$as_echo "no" >&6; }
|
|
fi
|
|
|
|
if test "x$ac_ct_RANLIB" = x; then
|
|
@@ -5426,12 +5465,8 @@ fi
|
|
else
|
|
case $cross_compiling:$ac_tool_warned in
|
|
yes:)
|
|
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
|
|
-whose name does not start with the host triplet. If you think this
|
|
-configuration is useful to you, please write to autoconf@gnu.org." >&5
|
|
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
|
|
-whose name does not start with the host triplet. If you think this
|
|
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
|
|
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
|
|
ac_tool_warned=yes ;;
|
|
esac
|
|
RANLIB=$ac_ct_RANLIB
|
|
@@ -5443,10 +5478,10 @@ fi
|
|
if test -n "$ac_tool_prefix"; then
|
|
# Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
|
|
set dummy ${ac_tool_prefix}as; 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_prog_AS+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
|
+$as_echo_n "checking for $ac_word... " >&6; }
|
|
+if test "${ac_cv_prog_AS+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
if test -n "$AS"; then
|
|
ac_cv_prog_AS="$AS" # Let the user override the test.
|
|
@@ -5456,25 +5491,25 @@ 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
|
|
+ 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_prog_AS="${ac_tool_prefix}as"
|
|
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
break 2
|
|
fi
|
|
done
|
|
-done
|
|
+ done
|
|
IFS=$as_save_IFS
|
|
|
|
fi
|
|
fi
|
|
AS=$ac_cv_prog_AS
|
|
if test -n "$AS"; then
|
|
- { echo "$as_me:$LINENO: result: $AS" >&5
|
|
-echo "${ECHO_T}$AS" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AS" >&5
|
|
+$as_echo "$AS" >&6; }
|
|
else
|
|
- { echo "$as_me:$LINENO: result: no" >&5
|
|
-echo "${ECHO_T}no" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
+$as_echo "no" >&6; }
|
|
fi
|
|
|
|
|
|
@@ -5483,10 +5518,10 @@ if test -z "$ac_cv_prog_AS"; then
|
|
ac_ct_AS=$AS
|
|
# Extract the first word of "as", so it can be a program name with args.
|
|
set dummy as; 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_prog_ac_ct_AS+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
|
+$as_echo_n "checking for $ac_word... " >&6; }
|
|
+if test "${ac_cv_prog_ac_ct_AS+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
if test -n "$ac_ct_AS"; then
|
|
ac_cv_prog_ac_ct_AS="$ac_ct_AS" # Let the user override the test.
|
|
@@ -5496,25 +5531,25 @@ 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
|
|
+ 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_prog_ac_ct_AS="as"
|
|
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
break 2
|
|
fi
|
|
done
|
|
-done
|
|
+ done
|
|
IFS=$as_save_IFS
|
|
|
|
fi
|
|
fi
|
|
ac_ct_AS=$ac_cv_prog_ac_ct_AS
|
|
if test -n "$ac_ct_AS"; then
|
|
- { echo "$as_me:$LINENO: result: $ac_ct_AS" >&5
|
|
-echo "${ECHO_T}$ac_ct_AS" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AS" >&5
|
|
+$as_echo "$ac_ct_AS" >&6; }
|
|
else
|
|
- { echo "$as_me:$LINENO: result: no" >&5
|
|
-echo "${ECHO_T}no" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
+$as_echo "no" >&6; }
|
|
fi
|
|
|
|
if test "x$ac_ct_AS" = x; then
|
|
@@ -5522,12 +5557,8 @@ fi
|
|
else
|
|
case $cross_compiling:$ac_tool_warned in
|
|
yes:)
|
|
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
|
|
-whose name does not start with the host triplet. If you think this
|
|
-configuration is useful to you, please write to autoconf@gnu.org." >&5
|
|
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
|
|
-whose name does not start with the host triplet. If you think this
|
|
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
|
|
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
|
|
ac_tool_warned=yes ;;
|
|
esac
|
|
AS=$ac_ct_AS
|
|
@@ -5539,10 +5570,10 @@ fi
|
|
if test -n "$ac_tool_prefix"; then
|
|
# Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
|
|
set dummy ${ac_tool_prefix}ar; 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_prog_AR+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
|
+$as_echo_n "checking for $ac_word... " >&6; }
|
|
+if test "${ac_cv_prog_AR+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
if test -n "$AR"; then
|
|
ac_cv_prog_AR="$AR" # Let the user override the test.
|
|
@@ -5552,25 +5583,25 @@ 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
|
|
+ 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_prog_AR="${ac_tool_prefix}ar"
|
|
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
break 2
|
|
fi
|
|
done
|
|
-done
|
|
+ done
|
|
IFS=$as_save_IFS
|
|
|
|
fi
|
|
fi
|
|
AR=$ac_cv_prog_AR
|
|
if test -n "$AR"; then
|
|
- { echo "$as_me:$LINENO: result: $AR" >&5
|
|
-echo "${ECHO_T}$AR" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
|
|
+$as_echo "$AR" >&6; }
|
|
else
|
|
- { echo "$as_me:$LINENO: result: no" >&5
|
|
-echo "${ECHO_T}no" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
+$as_echo "no" >&6; }
|
|
fi
|
|
|
|
|
|
@@ -5579,10 +5610,10 @@ if test -z "$ac_cv_prog_AR"; then
|
|
ac_ct_AR=$AR
|
|
# Extract the first word of "ar", so it can be a program name with args.
|
|
set dummy ar; 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_prog_ac_ct_AR+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
|
+$as_echo_n "checking for $ac_word... " >&6; }
|
|
+if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
if test -n "$ac_ct_AR"; then
|
|
ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
|
|
@@ -5592,25 +5623,25 @@ 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
|
|
+ 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_prog_ac_ct_AR="ar"
|
|
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
break 2
|
|
fi
|
|
done
|
|
-done
|
|
+ done
|
|
IFS=$as_save_IFS
|
|
|
|
fi
|
|
fi
|
|
ac_ct_AR=$ac_cv_prog_ac_ct_AR
|
|
if test -n "$ac_ct_AR"; then
|
|
- { echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
|
|
-echo "${ECHO_T}$ac_ct_AR" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
|
|
+$as_echo "$ac_ct_AR" >&6; }
|
|
else
|
|
- { echo "$as_me:$LINENO: result: no" >&5
|
|
-echo "${ECHO_T}no" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
+$as_echo "no" >&6; }
|
|
fi
|
|
|
|
if test "x$ac_ct_AR" = x; then
|
|
@@ -5618,12 +5649,8 @@ fi
|
|
else
|
|
case $cross_compiling:$ac_tool_warned in
|
|
yes:)
|
|
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
|
|
-whose name does not start with the host triplet. If you think this
|
|
-configuration is useful to you, please write to autoconf@gnu.org." >&5
|
|
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
|
|
-whose name does not start with the host triplet. If you think this
|
|
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
|
|
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
|
|
ac_tool_warned=yes ;;
|
|
esac
|
|
AR=$ac_ct_AR
|
|
@@ -5635,102 +5662,24 @@ fi
|
|
|
|
export CC CXX RANLIB LD AS AR
|
|
|
|
-# Find a good install program. We prefer a C program (faster),
|
|
-# so one script is as good as another. But avoid the broken or
|
|
-# incompatible versions:
|
|
-# SysV /etc/install, /usr/sbin/install
|
|
-# SunOS /usr/etc/install
|
|
-# IRIX /sbin/install
|
|
-# AIX /bin/install
|
|
-# AmigaOS /C/install, which installs bootblocks on floppy discs
|
|
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
|
|
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
|
|
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
|
|
-# OS/2's system install, which has a completely different semantic
|
|
-# ./install, which can be erroneously created by make from ./install.sh.
|
|
-{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
|
|
-echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
|
|
-if test -z "$INSTALL"; then
|
|
-if test "${ac_cv_path_install+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
-else
|
|
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
|
-for as_dir in $PATH
|
|
-do
|
|
- IFS=$as_save_IFS
|
|
- test -z "$as_dir" && as_dir=.
|
|
- # Account for people who put trailing slashes in PATH elements.
|
|
-case $as_dir/ in
|
|
- ./ | .// | /cC/* | \
|
|
- /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
|
|
- ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
|
|
- /usr/ucb/* ) ;;
|
|
- *)
|
|
- # OSF1 and SCO ODT 3.0 have their own names for install.
|
|
- # Don't use installbsd from OSF since it installs stuff as root
|
|
- # by default.
|
|
- for ac_prog in ginstall scoinst install; do
|
|
- for ac_exec_ext in '' $ac_executable_extensions; do
|
|
- if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
|
|
- if test $ac_prog = install &&
|
|
- grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
|
|
- # AIX install. It has an incompatible calling convention.
|
|
- :
|
|
- elif test $ac_prog = install &&
|
|
- grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
|
|
- # program-specific install script used by HP pwplus--don't use.
|
|
- :
|
|
- else
|
|
- ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
|
|
- break 3
|
|
- fi
|
|
- fi
|
|
- done
|
|
- done
|
|
- ;;
|
|
-esac
|
|
-done
|
|
-IFS=$as_save_IFS
|
|
-
|
|
-
|
|
-fi
|
|
- if test "${ac_cv_path_install+set}" = set; then
|
|
- INSTALL=$ac_cv_path_install
|
|
- else
|
|
- # As a last resort, use the slow shell script. Don't cache a
|
|
- # value for INSTALL within a source directory, because that will
|
|
- # break other packages using the cache if that directory is
|
|
- # removed, or if the value is a relative name.
|
|
- INSTALL=$ac_install_sh
|
|
- fi
|
|
-fi
|
|
-{ echo "$as_me:$LINENO: result: $INSTALL" >&5
|
|
-echo "${ECHO_T}$INSTALL" >&6; }
|
|
-
|
|
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
|
|
-# It thinks the first close brace ends the variable substitution.
|
|
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
|
|
-
|
|
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
|
|
-
|
|
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
|
|
|
|
-{ echo "$as_me:$LINENO: checking whether ln -s works" >&5
|
|
-echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; }
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
|
|
+$as_echo_n "checking whether ln -s works... " >&6; }
|
|
LN_S=$as_ln_s
|
|
if test "$LN_S" = "ln -s"; then
|
|
- { echo "$as_me:$LINENO: result: yes" >&5
|
|
-echo "${ECHO_T}yes" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
|
+$as_echo "yes" >&6; }
|
|
else
|
|
- { echo "$as_me:$LINENO: result: no, using $LN_S" >&5
|
|
-echo "${ECHO_T}no, using $LN_S" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
|
|
+$as_echo "no, using $LN_S" >&6; }
|
|
fi
|
|
|
|
-{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
|
|
-echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
|
|
-set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
|
|
-if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
|
|
+$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
|
|
+set x ${MAKE-make}
|
|
+ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
|
|
+if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
cat >conftest.make <<\_ACEOF
|
|
SHELL = /bin/sh
|
|
@@ -5747,12 +5696,12 @@ esac
|
|
rm -f conftest.make
|
|
fi
|
|
if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
|
|
- { echo "$as_me:$LINENO: result: yes" >&5
|
|
-echo "${ECHO_T}yes" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
|
+$as_echo "yes" >&6; }
|
|
SET_MAKE=
|
|
else
|
|
- { echo "$as_me:$LINENO: result: no" >&5
|
|
-echo "${ECHO_T}no" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
+$as_echo "no" >&6; }
|
|
SET_MAKE="MAKE=${MAKE-make}"
|
|
fi
|
|
|
|
@@ -5761,8 +5710,8 @@ export cross_compiling
|
|
|
|
case `pwd` in
|
|
*\ * | *\ *)
|
|
- { echo "$as_me:$LINENO: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
|
|
-echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
|
|
+$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
|
|
esac
|
|
|
|
|
|
@@ -5784,51 +5733,46 @@ macro_revision='1.3012'
|
|
|
|
ltmain="$ac_aux_dir/ltmain.sh"
|
|
|
|
-{ echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
|
|
-echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6; }
|
|
-if test "${ac_cv_path_SED+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
|
|
+$as_echo_n "checking for a sed that does not truncate output... " >&6; }
|
|
+if test "${ac_cv_path_SED+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
|
|
for ac_i in 1 2 3 4 5 6 7; do
|
|
ac_script="$ac_script$as_nl$ac_script"
|
|
done
|
|
- echo "$ac_script" | sed 99q >conftest.sed
|
|
- $as_unset ac_script || ac_script=
|
|
- # Extract the first word of "sed gsed" to use in msg output
|
|
-if test -z "$SED"; then
|
|
-set dummy sed gsed; ac_prog_name=$2
|
|
-if test "${ac_cv_path_SED+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
-else
|
|
+ echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
|
|
+ { ac_script=; unset ac_script;}
|
|
+ if test -z "$SED"; then
|
|
ac_path_SED_found=false
|
|
-# Loop through the user's path and test for each of PROGNAME-LIST
|
|
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
|
+ # Loop through the user's path and test for each of PROGNAME-LIST
|
|
+ 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_prog in sed gsed; do
|
|
- for ac_exec_ext in '' $ac_executable_extensions; do
|
|
- ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
|
|
- { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
|
|
- # Check for GNU ac_path_SED and select it if it is found.
|
|
+ for ac_prog in sed gsed; do
|
|
+ for ac_exec_ext in '' $ac_executable_extensions; do
|
|
+ ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
|
|
+ { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
|
|
+# Check for GNU ac_path_SED and select it if it is found.
|
|
# Check for GNU $ac_path_SED
|
|
case `"$ac_path_SED" --version 2>&1` in
|
|
*GNU*)
|
|
ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;
|
|
*)
|
|
ac_count=0
|
|
- echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
|
|
+ $as_echo_n 0123456789 >"conftest.in"
|
|
while :
|
|
do
|
|
cat "conftest.in" "conftest.in" >"conftest.tmp"
|
|
mv "conftest.tmp" "conftest.in"
|
|
cp "conftest.in" "conftest.nl"
|
|
- echo '' >> "conftest.nl"
|
|
+ $as_echo '' >> "conftest.nl"
|
|
"$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
|
|
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
|
|
- ac_count=`expr $ac_count + 1`
|
|
+ as_fn_arith $ac_count + 1 && ac_count=$as_val
|
|
if test $ac_count -gt ${ac_path_SED_max-0}; then
|
|
# Best one so far, save it but keep looking for a better one
|
|
ac_cv_path_SED="$ac_path_SED"
|
|
@@ -5840,31 +5784,21 @@ case `"$ac_path_SED" --version 2>&1` in
|
|
rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
|
|
esac
|
|
|
|
-
|
|
- $ac_path_SED_found && break 3
|
|
+ $ac_path_SED_found && break 3
|
|
+ done
|
|
+ done
|
|
done
|
|
-done
|
|
-
|
|
-done
|
|
IFS=$as_save_IFS
|
|
-
|
|
-
|
|
-fi
|
|
-
|
|
-SED="$ac_cv_path_SED"
|
|
-if test -z "$SED"; then
|
|
- { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in \$PATH" >&5
|
|
-echo "$as_me: error: no acceptable $ac_prog_name could be found in \$PATH" >&2;}
|
|
- { (exit 1); exit 1; }; }
|
|
-fi
|
|
-
|
|
+ if test -z "$ac_cv_path_SED"; then
|
|
+ as_fn_error "no acceptable sed could be found in \$PATH" "$LINENO" 5
|
|
+ fi
|
|
else
|
|
ac_cv_path_SED=$SED
|
|
fi
|
|
|
|
fi
|
|
-{ echo "$as_me:$LINENO: result: $ac_cv_path_SED" >&5
|
|
-echo "${ECHO_T}$ac_cv_path_SED" >&6; }
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
|
|
+$as_echo "$ac_cv_path_SED" >&6; }
|
|
SED="$ac_cv_path_SED"
|
|
rm -f conftest.sed
|
|
|
|
@@ -5881,48 +5815,43 @@ Xsed="$SED -e 1s/^X//"
|
|
|
|
|
|
|
|
-{ echo "$as_me:$LINENO: checking for fgrep" >&5
|
|
-echo $ECHO_N "checking for fgrep... $ECHO_C" >&6; }
|
|
-if test "${ac_cv_path_FGREP+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
|
|
+$as_echo_n "checking for fgrep... " >&6; }
|
|
+if test "${ac_cv_path_FGREP+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
|
|
then ac_cv_path_FGREP="$GREP -F"
|
|
else
|
|
- # Extract the first word of "fgrep" to use in msg output
|
|
-if test -z "$FGREP"; then
|
|
-set dummy fgrep; ac_prog_name=$2
|
|
-if test "${ac_cv_path_FGREP+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
-else
|
|
+ if test -z "$FGREP"; then
|
|
ac_path_FGREP_found=false
|
|
-# Loop through the user's path and test for each of PROGNAME-LIST
|
|
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
|
+ # Loop through the user's path and test for each of PROGNAME-LIST
|
|
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
|
for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
|
|
do
|
|
IFS=$as_save_IFS
|
|
test -z "$as_dir" && as_dir=.
|
|
- for ac_prog in fgrep; do
|
|
- for ac_exec_ext in '' $ac_executable_extensions; do
|
|
- ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
|
|
- { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue
|
|
- # Check for GNU ac_path_FGREP and select it if it is found.
|
|
+ for ac_prog in fgrep; do
|
|
+ for ac_exec_ext in '' $ac_executable_extensions; do
|
|
+ ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
|
|
+ { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue
|
|
+# Check for GNU ac_path_FGREP and select it if it is found.
|
|
# Check for GNU $ac_path_FGREP
|
|
case `"$ac_path_FGREP" --version 2>&1` in
|
|
*GNU*)
|
|
ac_cv_path_FGREP="$ac_path_FGREP" ac_path_FGREP_found=:;;
|
|
*)
|
|
ac_count=0
|
|
- echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
|
|
+ $as_echo_n 0123456789 >"conftest.in"
|
|
while :
|
|
do
|
|
cat "conftest.in" "conftest.in" >"conftest.tmp"
|
|
mv "conftest.tmp" "conftest.in"
|
|
cp "conftest.in" "conftest.nl"
|
|
- echo 'FGREP' >> "conftest.nl"
|
|
+ $as_echo 'FGREP' >> "conftest.nl"
|
|
"$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break
|
|
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
|
|
- ac_count=`expr $ac_count + 1`
|
|
+ as_fn_arith $ac_count + 1 && ac_count=$as_val
|
|
if test $ac_count -gt ${ac_path_FGREP_max-0}; then
|
|
# Best one so far, save it but keep looking for a better one
|
|
ac_cv_path_FGREP="$ac_path_FGREP"
|
|
@@ -5934,33 +5863,22 @@ case `"$ac_path_FGREP" --version 2>&1` i
|
|
rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
|
|
esac
|
|
|
|
-
|
|
- $ac_path_FGREP_found && break 3
|
|
+ $ac_path_FGREP_found && break 3
|
|
+ done
|
|
+ done
|
|
done
|
|
-done
|
|
-
|
|
-done
|
|
IFS=$as_save_IFS
|
|
-
|
|
-
|
|
-fi
|
|
-
|
|
-FGREP="$ac_cv_path_FGREP"
|
|
-if test -z "$FGREP"; then
|
|
- { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
|
|
-echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
|
|
- { (exit 1); exit 1; }; }
|
|
-fi
|
|
-
|
|
+ if test -z "$ac_cv_path_FGREP"; then
|
|
+ as_fn_error "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
|
|
+ fi
|
|
else
|
|
ac_cv_path_FGREP=$FGREP
|
|
fi
|
|
|
|
-
|
|
fi
|
|
fi
|
|
-{ echo "$as_me:$LINENO: result: $ac_cv_path_FGREP" >&5
|
|
-echo "${ECHO_T}$ac_cv_path_FGREP" >&6; }
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5
|
|
+$as_echo "$ac_cv_path_FGREP" >&6; }
|
|
FGREP="$ac_cv_path_FGREP"
|
|
|
|
|
|
@@ -5985,7 +5903,7 @@ test -z "$GREP" && GREP=grep
|
|
|
|
|
|
# Check whether --with-gnu-ld was given.
|
|
-if test "${with_gnu_ld+set}" = set; then
|
|
+if test "${with_gnu_ld+set}" = set; then :
|
|
withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
|
|
else
|
|
with_gnu_ld=no
|
|
@@ -5994,8 +5912,8 @@ fi
|
|
ac_prog=ld
|
|
if test "$GCC" = yes; then
|
|
# Check if gcc -print-prog-name=ld gives a path.
|
|
- { echo "$as_me:$LINENO: checking for ld used by $CC" >&5
|
|
-echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
|
|
+$as_echo_n "checking for ld used by $CC... " >&6; }
|
|
case $host in
|
|
*-*-mingw*)
|
|
# gcc leaves a trailing carriage return which upsets mingw
|
|
@@ -6024,14 +5942,14 @@ echo $ECHO_N "checking for ld used by $C
|
|
;;
|
|
esac
|
|
elif test "$with_gnu_ld" = yes; then
|
|
- { echo "$as_me:$LINENO: checking for GNU ld" >&5
|
|
-echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
|
|
+$as_echo_n "checking for GNU ld... " >&6; }
|
|
else
|
|
- { echo "$as_me:$LINENO: checking for non-GNU ld" >&5
|
|
-echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
|
|
+$as_echo_n "checking for non-GNU ld... " >&6; }
|
|
fi
|
|
-if test "${lt_cv_path_LD+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+if test "${lt_cv_path_LD+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
if test -z "$LD"; then
|
|
lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
|
|
@@ -6061,19 +5979,17 @@ fi
|
|
|
|
LD="$lt_cv_path_LD"
|
|
if test -n "$LD"; then
|
|
- { echo "$as_me:$LINENO: result: $LD" >&5
|
|
-echo "${ECHO_T}$LD" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
|
|
+$as_echo "$LD" >&6; }
|
|
else
|
|
- { echo "$as_me:$LINENO: result: no" >&5
|
|
-echo "${ECHO_T}no" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
+$as_echo "no" >&6; }
|
|
fi
|
|
-test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
|
|
-echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
|
|
- { (exit 1); exit 1; }; }
|
|
-{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
|
|
-echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; }
|
|
-if test "${lt_cv_prog_gnu_ld+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
|
|
+$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
|
|
+if test "${lt_cv_prog_gnu_ld+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
# I'd rather use --version here, but apparently some GNU lds only accept -v.
|
|
case `$LD -v 2>&1 </dev/null` in
|
|
@@ -6085,8 +6001,8 @@ case `$LD -v 2>&1 </dev/null` in
|
|
;;
|
|
esac
|
|
fi
|
|
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
|
|
-echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; }
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5
|
|
+$as_echo "$lt_cv_prog_gnu_ld" >&6; }
|
|
with_gnu_ld=$lt_cv_prog_gnu_ld
|
|
|
|
|
|
@@ -6097,10 +6013,10 @@ with_gnu_ld=$lt_cv_prog_gnu_ld
|
|
|
|
|
|
|
|
-{ echo "$as_me:$LINENO: checking for BSD- or MS-compatible name lister (nm)" >&5
|
|
-echo $ECHO_N "checking for BSD- or MS-compatible name lister (nm)... $ECHO_C" >&6; }
|
|
-if test "${lt_cv_path_NM+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5
|
|
+$as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; }
|
|
+if test "${lt_cv_path_NM+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
if test -n "$NM"; then
|
|
# Let the user override the test.
|
|
@@ -6146,8 +6062,8 @@ else
|
|
: ${lt_cv_path_NM=no}
|
|
fi
|
|
fi
|
|
-{ echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
|
|
-echo "${ECHO_T}$lt_cv_path_NM" >&6; }
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5
|
|
+$as_echo "$lt_cv_path_NM" >&6; }
|
|
if test "$lt_cv_path_NM" != "no"; then
|
|
NM="$lt_cv_path_NM"
|
|
else
|
|
@@ -6157,10 +6073,10 @@ else
|
|
do
|
|
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
|
|
set dummy $ac_tool_prefix$ac_prog; 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_prog_DUMPBIN+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
|
+$as_echo_n "checking for $ac_word... " >&6; }
|
|
+if test "${ac_cv_prog_DUMPBIN+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
if test -n "$DUMPBIN"; then
|
|
ac_cv_prog_DUMPBIN="$DUMPBIN" # Let the user override the test.
|
|
@@ -6170,25 +6086,25 @@ 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
|
|
+ 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_prog_DUMPBIN="$ac_tool_prefix$ac_prog"
|
|
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
break 2
|
|
fi
|
|
done
|
|
-done
|
|
+ done
|
|
IFS=$as_save_IFS
|
|
|
|
fi
|
|
fi
|
|
DUMPBIN=$ac_cv_prog_DUMPBIN
|
|
if test -n "$DUMPBIN"; then
|
|
- { echo "$as_me:$LINENO: result: $DUMPBIN" >&5
|
|
-echo "${ECHO_T}$DUMPBIN" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5
|
|
+$as_echo "$DUMPBIN" >&6; }
|
|
else
|
|
- { echo "$as_me:$LINENO: result: no" >&5
|
|
-echo "${ECHO_T}no" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
+$as_echo "no" >&6; }
|
|
fi
|
|
|
|
|
|
@@ -6201,10 +6117,10 @@ if test -z "$DUMPBIN"; then
|
|
do
|
|
# Extract the first word of "$ac_prog", so it can be a program name with args.
|
|
set dummy $ac_prog; 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_prog_ac_ct_DUMPBIN+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
|
+$as_echo_n "checking for $ac_word... " >&6; }
|
|
+if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
if test -n "$ac_ct_DUMPBIN"; then
|
|
ac_cv_prog_ac_ct_DUMPBIN="$ac_ct_DUMPBIN" # Let the user override the test.
|
|
@@ -6214,25 +6130,25 @@ 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
|
|
+ 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_prog_ac_ct_DUMPBIN="$ac_prog"
|
|
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
break 2
|
|
fi
|
|
done
|
|
-done
|
|
+ done
|
|
IFS=$as_save_IFS
|
|
|
|
fi
|
|
fi
|
|
ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN
|
|
if test -n "$ac_ct_DUMPBIN"; then
|
|
- { echo "$as_me:$LINENO: result: $ac_ct_DUMPBIN" >&5
|
|
-echo "${ECHO_T}$ac_ct_DUMPBIN" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5
|
|
+$as_echo "$ac_ct_DUMPBIN" >&6; }
|
|
else
|
|
- { echo "$as_me:$LINENO: result: no" >&5
|
|
-echo "${ECHO_T}no" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
+$as_echo "no" >&6; }
|
|
fi
|
|
|
|
|
|
@@ -6244,12 +6160,8 @@ done
|
|
else
|
|
case $cross_compiling:$ac_tool_warned in
|
|
yes:)
|
|
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
|
|
-whose name does not start with the host triplet. If you think this
|
|
-configuration is useful to you, please write to autoconf@gnu.org." >&5
|
|
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
|
|
-whose name does not start with the host triplet. If you think this
|
|
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
|
|
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
|
|
ac_tool_warned=yes ;;
|
|
esac
|
|
DUMPBIN=$ac_ct_DUMPBIN
|
|
@@ -6268,34 +6180,34 @@ test -z "$NM" && NM=nm
|
|
|
|
|
|
|
|
-{ echo "$as_me:$LINENO: checking the name lister ($NM) interface" >&5
|
|
-echo $ECHO_N "checking the name lister ($NM) interface... $ECHO_C" >&6; }
|
|
-if test "${lt_cv_nm_interface+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5
|
|
+$as_echo_n "checking the name lister ($NM) interface... " >&6; }
|
|
+if test "${lt_cv_nm_interface+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
lt_cv_nm_interface="BSD nm"
|
|
echo "int some_variable = 0;" > conftest.$ac_ext
|
|
- (eval echo "\"\$as_me:6278: $ac_compile\"" >&5)
|
|
+ (eval echo "\"\$as_me:6190: $ac_compile\"" >&5)
|
|
(eval "$ac_compile" 2>conftest.err)
|
|
cat conftest.err >&5
|
|
- (eval echo "\"\$as_me:6281: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
|
|
+ (eval echo "\"\$as_me:6193: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
|
|
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
|
|
cat conftest.err >&5
|
|
- (eval echo "\"\$as_me:6284: output\"" >&5)
|
|
+ (eval echo "\"\$as_me:6196: output\"" >&5)
|
|
cat conftest.out >&5
|
|
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
|
|
lt_cv_nm_interface="MS dumpbin"
|
|
fi
|
|
rm -f conftest*
|
|
fi
|
|
-{ echo "$as_me:$LINENO: result: $lt_cv_nm_interface" >&5
|
|
-echo "${ECHO_T}$lt_cv_nm_interface" >&6; }
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5
|
|
+$as_echo "$lt_cv_nm_interface" >&6; }
|
|
|
|
# find the maximum length of command line arguments
|
|
-{ echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
|
|
-echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6; }
|
|
-if test "${lt_cv_sys_max_cmd_len+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5
|
|
+$as_echo_n "checking the maximum length of command line arguments... " >&6; }
|
|
+if test "${lt_cv_sys_max_cmd_len+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
i=0
|
|
teststring="ABCD"
|
|
@@ -6412,11 +6324,11 @@ else
|
|
fi
|
|
|
|
if test -n $lt_cv_sys_max_cmd_len ; then
|
|
- { echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5
|
|
-echo "${ECHO_T}$lt_cv_sys_max_cmd_len" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5
|
|
+$as_echo "$lt_cv_sys_max_cmd_len" >&6; }
|
|
else
|
|
- { echo "$as_me:$LINENO: result: none" >&5
|
|
-echo "${ECHO_T}none" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5
|
|
+$as_echo "none" >&6; }
|
|
fi
|
|
max_cmd_len=$lt_cv_sys_max_cmd_len
|
|
|
|
@@ -6429,8 +6341,8 @@ max_cmd_len=$lt_cv_sys_max_cmd_len
|
|
: ${MV="mv -f"}
|
|
: ${RM="rm -f"}
|
|
|
|
-{ echo "$as_me:$LINENO: checking whether the shell understands some XSI constructs" >&5
|
|
-echo $ECHO_N "checking whether the shell understands some XSI constructs... $ECHO_C" >&6; }
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands some XSI constructs" >&5
|
|
+$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; }
|
|
# Try some XSI features
|
|
xsi_shell=no
|
|
( _lt_dummy="a/b/c"
|
|
@@ -6439,18 +6351,18 @@ xsi_shell=no
|
|
&& eval 'test $(( 1 + 1 )) -eq 2 \
|
|
&& test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
|
|
&& xsi_shell=yes
|
|
-{ echo "$as_me:$LINENO: result: $xsi_shell" >&5
|
|
-echo "${ECHO_T}$xsi_shell" >&6; }
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xsi_shell" >&5
|
|
+$as_echo "$xsi_shell" >&6; }
|
|
|
|
|
|
-{ echo "$as_me:$LINENO: checking whether the shell understands \"+=\"" >&5
|
|
-echo $ECHO_N "checking whether the shell understands \"+=\"... $ECHO_C" >&6; }
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands \"+=\"" >&5
|
|
+$as_echo_n "checking whether the shell understands \"+=\"... " >&6; }
|
|
lt_shell_append=no
|
|
( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \
|
|
>/dev/null 2>&1 \
|
|
&& lt_shell_append=yes
|
|
-{ echo "$as_me:$LINENO: result: $lt_shell_append" >&5
|
|
-echo "${ECHO_T}$lt_shell_append" >&6; }
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_shell_append" >&5
|
|
+$as_echo "$lt_shell_append" >&6; }
|
|
|
|
|
|
if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
|
|
@@ -6484,15 +6396,15 @@ esac
|
|
|
|
|
|
|
|
-{ echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5
|
|
-echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6; }
|
|
-if test "${lt_cv_ld_reload_flag+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
|
|
+$as_echo_n "checking for $LD option to reload object files... " >&6; }
|
|
+if test "${lt_cv_ld_reload_flag+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
lt_cv_ld_reload_flag='-r'
|
|
fi
|
|
-{ echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5
|
|
-echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6; }
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5
|
|
+$as_echo "$lt_cv_ld_reload_flag" >&6; }
|
|
reload_flag=$lt_cv_ld_reload_flag
|
|
case $reload_flag in
|
|
"" | " "*) ;;
|
|
@@ -6520,10 +6432,10 @@ esac
|
|
if test -n "$ac_tool_prefix"; then
|
|
# Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
|
|
set dummy ${ac_tool_prefix}objdump; 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_prog_OBJDUMP+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
|
+$as_echo_n "checking for $ac_word... " >&6; }
|
|
+if test "${ac_cv_prog_OBJDUMP+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
if test -n "$OBJDUMP"; then
|
|
ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
|
|
@@ -6533,25 +6445,25 @@ 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
|
|
+ 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_prog_OBJDUMP="${ac_tool_prefix}objdump"
|
|
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
break 2
|
|
fi
|
|
done
|
|
-done
|
|
+ done
|
|
IFS=$as_save_IFS
|
|
|
|
fi
|
|
fi
|
|
OBJDUMP=$ac_cv_prog_OBJDUMP
|
|
if test -n "$OBJDUMP"; then
|
|
- { echo "$as_me:$LINENO: result: $OBJDUMP" >&5
|
|
-echo "${ECHO_T}$OBJDUMP" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
|
|
+$as_echo "$OBJDUMP" >&6; }
|
|
else
|
|
- { echo "$as_me:$LINENO: result: no" >&5
|
|
-echo "${ECHO_T}no" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
+$as_echo "no" >&6; }
|
|
fi
|
|
|
|
|
|
@@ -6560,10 +6472,10 @@ if test -z "$ac_cv_prog_OBJDUMP"; then
|
|
ac_ct_OBJDUMP=$OBJDUMP
|
|
# Extract the first word of "objdump", so it can be a program name with args.
|
|
set dummy objdump; 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_prog_ac_ct_OBJDUMP+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
|
+$as_echo_n "checking for $ac_word... " >&6; }
|
|
+if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
if test -n "$ac_ct_OBJDUMP"; then
|
|
ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test.
|
|
@@ -6573,25 +6485,25 @@ 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
|
|
+ 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_prog_ac_ct_OBJDUMP="objdump"
|
|
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
break 2
|
|
fi
|
|
done
|
|
-done
|
|
+ done
|
|
IFS=$as_save_IFS
|
|
|
|
fi
|
|
fi
|
|
ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
|
|
if test -n "$ac_ct_OBJDUMP"; then
|
|
- { echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5
|
|
-echo "${ECHO_T}$ac_ct_OBJDUMP" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
|
|
+$as_echo "$ac_ct_OBJDUMP" >&6; }
|
|
else
|
|
- { echo "$as_me:$LINENO: result: no" >&5
|
|
-echo "${ECHO_T}no" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
+$as_echo "no" >&6; }
|
|
fi
|
|
|
|
if test "x$ac_ct_OBJDUMP" = x; then
|
|
@@ -6599,12 +6511,8 @@ fi
|
|
else
|
|
case $cross_compiling:$ac_tool_warned in
|
|
yes:)
|
|
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
|
|
-whose name does not start with the host triplet. If you think this
|
|
-configuration is useful to you, please write to autoconf@gnu.org." >&5
|
|
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
|
|
-whose name does not start with the host triplet. If you think this
|
|
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
|
|
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
|
|
ac_tool_warned=yes ;;
|
|
esac
|
|
OBJDUMP=$ac_ct_OBJDUMP
|
|
@@ -6623,10 +6531,10 @@ test -z "$OBJDUMP" && OBJDUMP=objdump
|
|
|
|
|
|
|
|
-{ echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5
|
|
-echo $ECHO_N "checking how to recognize dependent libraries... $ECHO_C" >&6; }
|
|
-if test "${lt_cv_deplibs_check_method+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5
|
|
+$as_echo_n "checking how to recognize dependent libraries... " >&6; }
|
|
+if test "${lt_cv_deplibs_check_method+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
lt_cv_file_magic_cmd='$MAGIC_CMD'
|
|
lt_cv_file_magic_test_file=
|
|
@@ -6819,8 +6727,8 @@ tpf*)
|
|
esac
|
|
|
|
fi
|
|
-{ echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5
|
|
-echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6; }
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
|
|
+$as_echo "$lt_cv_deplibs_check_method" >&6; }
|
|
file_magic_cmd=$lt_cv_file_magic_cmd
|
|
deplibs_check_method=$lt_cv_deplibs_check_method
|
|
test -z "$deplibs_check_method" && deplibs_check_method=unknown
|
|
@@ -6839,10 +6747,10 @@ test -z "$deplibs_check_method" && depli
|
|
if test -n "$ac_tool_prefix"; then
|
|
# Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
|
|
set dummy ${ac_tool_prefix}ar; 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_prog_AR+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
|
+$as_echo_n "checking for $ac_word... " >&6; }
|
|
+if test "${ac_cv_prog_AR+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
if test -n "$AR"; then
|
|
ac_cv_prog_AR="$AR" # Let the user override the test.
|
|
@@ -6852,25 +6760,25 @@ 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
|
|
+ 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_prog_AR="${ac_tool_prefix}ar"
|
|
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
break 2
|
|
fi
|
|
done
|
|
-done
|
|
+ done
|
|
IFS=$as_save_IFS
|
|
|
|
fi
|
|
fi
|
|
AR=$ac_cv_prog_AR
|
|
if test -n "$AR"; then
|
|
- { echo "$as_me:$LINENO: result: $AR" >&5
|
|
-echo "${ECHO_T}$AR" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
|
|
+$as_echo "$AR" >&6; }
|
|
else
|
|
- { echo "$as_me:$LINENO: result: no" >&5
|
|
-echo "${ECHO_T}no" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
+$as_echo "no" >&6; }
|
|
fi
|
|
|
|
|
|
@@ -6879,10 +6787,10 @@ if test -z "$ac_cv_prog_AR"; then
|
|
ac_ct_AR=$AR
|
|
# Extract the first word of "ar", so it can be a program name with args.
|
|
set dummy ar; 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_prog_ac_ct_AR+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
|
+$as_echo_n "checking for $ac_word... " >&6; }
|
|
+if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
if test -n "$ac_ct_AR"; then
|
|
ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
|
|
@@ -6892,25 +6800,25 @@ 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
|
|
+ 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_prog_ac_ct_AR="ar"
|
|
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
break 2
|
|
fi
|
|
done
|
|
-done
|
|
+ done
|
|
IFS=$as_save_IFS
|
|
|
|
fi
|
|
fi
|
|
ac_ct_AR=$ac_cv_prog_ac_ct_AR
|
|
if test -n "$ac_ct_AR"; then
|
|
- { echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
|
|
-echo "${ECHO_T}$ac_ct_AR" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
|
|
+$as_echo "$ac_ct_AR" >&6; }
|
|
else
|
|
- { echo "$as_me:$LINENO: result: no" >&5
|
|
-echo "${ECHO_T}no" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
+$as_echo "no" >&6; }
|
|
fi
|
|
|
|
if test "x$ac_ct_AR" = x; then
|
|
@@ -6918,12 +6826,8 @@ fi
|
|
else
|
|
case $cross_compiling:$ac_tool_warned in
|
|
yes:)
|
|
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
|
|
-whose name does not start with the host triplet. If you think this
|
|
-configuration is useful to you, please write to autoconf@gnu.org." >&5
|
|
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
|
|
-whose name does not start with the host triplet. If you think this
|
|
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
|
|
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
|
|
ac_tool_warned=yes ;;
|
|
esac
|
|
AR=$ac_ct_AR
|
|
@@ -6948,10 +6852,10 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
|
|
if test -n "$ac_tool_prefix"; then
|
|
# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
|
|
set dummy ${ac_tool_prefix}strip; 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_prog_STRIP+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
|
+$as_echo_n "checking for $ac_word... " >&6; }
|
|
+if test "${ac_cv_prog_STRIP+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
if test -n "$STRIP"; then
|
|
ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
|
|
@@ -6961,25 +6865,25 @@ 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
|
|
+ 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_prog_STRIP="${ac_tool_prefix}strip"
|
|
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
break 2
|
|
fi
|
|
done
|
|
-done
|
|
+ done
|
|
IFS=$as_save_IFS
|
|
|
|
fi
|
|
fi
|
|
STRIP=$ac_cv_prog_STRIP
|
|
if test -n "$STRIP"; then
|
|
- { echo "$as_me:$LINENO: result: $STRIP" >&5
|
|
-echo "${ECHO_T}$STRIP" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
|
|
+$as_echo "$STRIP" >&6; }
|
|
else
|
|
- { echo "$as_me:$LINENO: result: no" >&5
|
|
-echo "${ECHO_T}no" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
+$as_echo "no" >&6; }
|
|
fi
|
|
|
|
|
|
@@ -6988,10 +6892,10 @@ if test -z "$ac_cv_prog_STRIP"; then
|
|
ac_ct_STRIP=$STRIP
|
|
# Extract the first word of "strip", so it can be a program name with args.
|
|
set dummy strip; 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_prog_ac_ct_STRIP+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
|
+$as_echo_n "checking for $ac_word... " >&6; }
|
|
+if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
if test -n "$ac_ct_STRIP"; then
|
|
ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
|
|
@@ -7001,25 +6905,25 @@ 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
|
|
+ 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_prog_ac_ct_STRIP="strip"
|
|
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
break 2
|
|
fi
|
|
done
|
|
-done
|
|
+ done
|
|
IFS=$as_save_IFS
|
|
|
|
fi
|
|
fi
|
|
ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
|
|
if test -n "$ac_ct_STRIP"; then
|
|
- { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
|
|
-echo "${ECHO_T}$ac_ct_STRIP" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
|
|
+$as_echo "$ac_ct_STRIP" >&6; }
|
|
else
|
|
- { echo "$as_me:$LINENO: result: no" >&5
|
|
-echo "${ECHO_T}no" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
+$as_echo "no" >&6; }
|
|
fi
|
|
|
|
if test "x$ac_ct_STRIP" = x; then
|
|
@@ -7027,12 +6931,8 @@ fi
|
|
else
|
|
case $cross_compiling:$ac_tool_warned in
|
|
yes:)
|
|
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
|
|
-whose name does not start with the host triplet. If you think this
|
|
-configuration is useful to you, please write to autoconf@gnu.org." >&5
|
|
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
|
|
-whose name does not start with the host triplet. If you think this
|
|
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
|
|
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
|
|
ac_tool_warned=yes ;;
|
|
esac
|
|
STRIP=$ac_ct_STRIP
|
|
@@ -7051,10 +6951,10 @@ test -z "$STRIP" && STRIP=:
|
|
if test -n "$ac_tool_prefix"; then
|
|
# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
|
|
set dummy ${ac_tool_prefix}ranlib; 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_prog_RANLIB+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
|
+$as_echo_n "checking for $ac_word... " >&6; }
|
|
+if test "${ac_cv_prog_RANLIB+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
if test -n "$RANLIB"; then
|
|
ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
|
|
@@ -7064,25 +6964,25 @@ 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
|
|
+ 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_prog_RANLIB="${ac_tool_prefix}ranlib"
|
|
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
break 2
|
|
fi
|
|
done
|
|
-done
|
|
+ done
|
|
IFS=$as_save_IFS
|
|
|
|
fi
|
|
fi
|
|
RANLIB=$ac_cv_prog_RANLIB
|
|
if test -n "$RANLIB"; then
|
|
- { echo "$as_me:$LINENO: result: $RANLIB" >&5
|
|
-echo "${ECHO_T}$RANLIB" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
|
|
+$as_echo "$RANLIB" >&6; }
|
|
else
|
|
- { echo "$as_me:$LINENO: result: no" >&5
|
|
-echo "${ECHO_T}no" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
+$as_echo "no" >&6; }
|
|
fi
|
|
|
|
|
|
@@ -7091,10 +6991,10 @@ if test -z "$ac_cv_prog_RANLIB"; then
|
|
ac_ct_RANLIB=$RANLIB
|
|
# Extract the first word of "ranlib", so it can be a program name with args.
|
|
set dummy ranlib; 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_prog_ac_ct_RANLIB+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
|
+$as_echo_n "checking for $ac_word... " >&6; }
|
|
+if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
if test -n "$ac_ct_RANLIB"; then
|
|
ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
|
|
@@ -7104,25 +7004,25 @@ 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
|
|
+ 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_prog_ac_ct_RANLIB="ranlib"
|
|
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
break 2
|
|
fi
|
|
done
|
|
-done
|
|
+ done
|
|
IFS=$as_save_IFS
|
|
|
|
fi
|
|
fi
|
|
ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
|
|
if test -n "$ac_ct_RANLIB"; then
|
|
- { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
|
|
-echo "${ECHO_T}$ac_ct_RANLIB" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
|
|
+$as_echo "$ac_ct_RANLIB" >&6; }
|
|
else
|
|
- { echo "$as_me:$LINENO: result: no" >&5
|
|
-echo "${ECHO_T}no" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
+$as_echo "no" >&6; }
|
|
fi
|
|
|
|
if test "x$ac_ct_RANLIB" = x; then
|
|
@@ -7130,12 +7030,8 @@ fi
|
|
else
|
|
case $cross_compiling:$ac_tool_warned in
|
|
yes:)
|
|
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
|
|
-whose name does not start with the host triplet. If you think this
|
|
-configuration is useful to you, please write to autoconf@gnu.org." >&5
|
|
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
|
|
-whose name does not start with the host triplet. If you think this
|
|
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
|
|
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
|
|
ac_tool_warned=yes ;;
|
|
esac
|
|
RANLIB=$ac_ct_RANLIB
|
|
@@ -7212,10 +7108,10 @@ compiler=$CC
|
|
|
|
|
|
# Check for command to grab the raw symbol name followed by C symbol from nm.
|
|
-{ echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
|
|
-echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6; }
|
|
-if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5
|
|
+$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; }
|
|
+if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
|
|
# These are sane defaults that work on at least a few old systems.
|
|
@@ -7330,18 +7226,18 @@ void nm_test_func(void){}
|
|
int main(){nm_test_var='a';nm_test_func();return(0);}
|
|
_LT_EOF
|
|
|
|
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
|
|
(eval $ac_compile) 2>&5
|
|
ac_status=$?
|
|
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
- (exit $ac_status); }; then
|
|
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
|
+ test $ac_status = 0; }; then
|
|
# Now try to grab the symbols.
|
|
nlist=conftest.nm
|
|
- if { (eval echo "$as_me:$LINENO: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5
|
|
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\""; } >&5
|
|
(eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5
|
|
ac_status=$?
|
|
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
- (exit $ac_status); } && test -s "$nlist"; then
|
|
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
|
+ test $ac_status = 0; } && test -s "$nlist"; then
|
|
# Try sorting and uniquifying the output.
|
|
if sort "$nlist" | uniq > "$nlist"T; then
|
|
mv -f "$nlist"T "$nlist"
|
|
@@ -7394,11 +7290,11 @@ _LT_EOF
|
|
lt_save_CFLAGS="$CFLAGS"
|
|
LIBS="conftstm.$ac_objext"
|
|
CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
|
|
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
|
|
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
|
|
(eval $ac_link) 2>&5
|
|
ac_status=$?
|
|
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
- (exit $ac_status); } && test -s conftest${ac_exeext}; then
|
|
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
|
+ test $ac_status = 0; } && test -s conftest${ac_exeext}; then
|
|
pipe_works=yes
|
|
fi
|
|
LIBS="$lt_save_LIBS"
|
|
@@ -7432,11 +7328,11 @@ if test -z "$lt_cv_sys_global_symbol_pip
|
|
lt_cv_sys_global_symbol_to_cdecl=
|
|
fi
|
|
if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
|
|
- { echo "$as_me:$LINENO: result: failed" >&5
|
|
-echo "${ECHO_T}failed" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5
|
|
+$as_echo "failed" >&6; }
|
|
else
|
|
- { echo "$as_me:$LINENO: result: ok" >&5
|
|
-echo "${ECHO_T}ok" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
|
|
+$as_echo "ok" >&6; }
|
|
fi
|
|
|
|
|
|
@@ -7461,7 +7357,7 @@ fi
|
|
|
|
|
|
# Check whether --enable-libtool-lock was given.
|
|
-if test "${enable_libtool_lock+set}" = set; then
|
|
+if test "${enable_libtool_lock+set}" = set; then :
|
|
enableval=$enable_libtool_lock;
|
|
fi
|
|
|
|
@@ -7473,11 +7369,11 @@ case $host in
|
|
ia64-*-hpux*)
|
|
# Find out which ABI we are using.
|
|
echo 'int i;' > conftest.$ac_ext
|
|
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
|
|
(eval $ac_compile) 2>&5
|
|
ac_status=$?
|
|
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
- (exit $ac_status); }; then
|
|
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
|
+ test $ac_status = 0; }; then
|
|
case `/usr/bin/file conftest.$ac_objext` in
|
|
*ELF-32*)
|
|
HPUX_IA64_MODE="32"
|
|
@@ -7491,12 +7387,12 @@ ia64-*-hpux*)
|
|
;;
|
|
*-*-irix6*)
|
|
# Find out which ABI we are using.
|
|
- echo '#line 7494 "configure"' > conftest.$ac_ext
|
|
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|
+ echo '#line 7390 "configure"' > conftest.$ac_ext
|
|
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
|
|
(eval $ac_compile) 2>&5
|
|
ac_status=$?
|
|
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
- (exit $ac_status); }; then
|
|
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
|
+ test $ac_status = 0; }; then
|
|
if test "$lt_cv_prog_gnu_ld" = yes; then
|
|
case `/usr/bin/file conftest.$ac_objext` in
|
|
*32-bit*)
|
|
@@ -7530,11 +7426,11 @@ x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc
|
|
s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
|
|
# Find out which ABI we are using.
|
|
echo 'int i;' > conftest.$ac_ext
|
|
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
|
|
(eval $ac_compile) 2>&5
|
|
ac_status=$?
|
|
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
- (exit $ac_status); }; then
|
|
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
|
+ test $ac_status = 0; }; then
|
|
case `/usr/bin/file conftest.o` in
|
|
*32-bit*)
|
|
case $host in
|
|
@@ -7583,10 +7479,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*
|
|
# On SCO OpenServer 5, we need -belf to get full-featured binaries.
|
|
SAVE_CFLAGS="$CFLAGS"
|
|
CFLAGS="$CFLAGS -belf"
|
|
- { echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5
|
|
-echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6; }
|
|
-if test "${lt_cv_cc_needs_belf+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5
|
|
+$as_echo_n "checking whether the C compiler needs -belf... " >&6; }
|
|
+if test "${lt_cv_cc_needs_belf+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
ac_ext=c
|
|
ac_cpp='$CPP $CPPFLAGS'
|
|
@@ -7594,11 +7490,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS con
|
|
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
|
|
ac_compiler_gnu=$ac_cv_c_compiler_gnu
|
|
|
|
- cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
/* end confdefs.h. */
|
|
|
|
int
|
|
@@ -7609,34 +7501,13 @@ main ()
|
|
return 0;
|
|
}
|
|
_ACEOF
|
|
-rm -f conftest.$ac_objext conftest$ac_exeext
|
|
-if { (ac_try="$ac_link"
|
|
-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_link") 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_exeext &&
|
|
- $as_test_x conftest$ac_exeext; then
|
|
+if ac_fn_c_try_link "$LINENO"; then :
|
|
lt_cv_cc_needs_belf=yes
|
|
else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
- lt_cv_cc_needs_belf=no
|
|
+ lt_cv_cc_needs_belf=no
|
|
fi
|
|
-
|
|
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
- conftest$ac_exeext conftest.$ac_ext
|
|
+rm -f core conftest.err conftest.$ac_objext \
|
|
+ conftest$ac_exeext conftest.$ac_ext
|
|
ac_ext=c
|
|
ac_cpp='$CPP $CPPFLAGS'
|
|
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
|
|
@@ -7644,8 +7515,8 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
|
|
ac_compiler_gnu=$ac_cv_c_compiler_gnu
|
|
|
|
fi
|
|
-{ echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5
|
|
-echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6; }
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5
|
|
+$as_echo "$lt_cv_cc_needs_belf" >&6; }
|
|
if test x"$lt_cv_cc_needs_belf" != x"yes"; then
|
|
# this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
|
|
CFLAGS="$SAVE_CFLAGS"
|
|
@@ -7654,11 +7525,11 @@ echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6
|
|
sparc*-*solaris*)
|
|
# Find out which ABI we are using.
|
|
echo 'int i;' > conftest.$ac_ext
|
|
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
|
|
(eval $ac_compile) 2>&5
|
|
ac_status=$?
|
|
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
- (exit $ac_status); }; then
|
|
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
|
+ test $ac_status = 0; }; then
|
|
case `/usr/bin/file conftest.o` in
|
|
*64-bit*)
|
|
case $lt_cv_prog_gnu_ld in
|
|
@@ -7684,10 +7555,10 @@ need_locks="$enable_libtool_lock"
|
|
if test -n "$ac_tool_prefix"; then
|
|
# Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
|
|
set dummy ${ac_tool_prefix}dsymutil; 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_prog_DSYMUTIL+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
|
+$as_echo_n "checking for $ac_word... " >&6; }
|
|
+if test "${ac_cv_prog_DSYMUTIL+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
if test -n "$DSYMUTIL"; then
|
|
ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test.
|
|
@@ -7697,25 +7568,25 @@ 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
|
|
+ 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_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
|
|
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
break 2
|
|
fi
|
|
done
|
|
-done
|
|
+ done
|
|
IFS=$as_save_IFS
|
|
|
|
fi
|
|
fi
|
|
DSYMUTIL=$ac_cv_prog_DSYMUTIL
|
|
if test -n "$DSYMUTIL"; then
|
|
- { echo "$as_me:$LINENO: result: $DSYMUTIL" >&5
|
|
-echo "${ECHO_T}$DSYMUTIL" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5
|
|
+$as_echo "$DSYMUTIL" >&6; }
|
|
else
|
|
- { echo "$as_me:$LINENO: result: no" >&5
|
|
-echo "${ECHO_T}no" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
+$as_echo "no" >&6; }
|
|
fi
|
|
|
|
|
|
@@ -7724,10 +7595,10 @@ if test -z "$ac_cv_prog_DSYMUTIL"; then
|
|
ac_ct_DSYMUTIL=$DSYMUTIL
|
|
# Extract the first word of "dsymutil", so it can be a program name with args.
|
|
set dummy dsymutil; 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_prog_ac_ct_DSYMUTIL+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
|
+$as_echo_n "checking for $ac_word... " >&6; }
|
|
+if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
if test -n "$ac_ct_DSYMUTIL"; then
|
|
ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test.
|
|
@@ -7737,25 +7608,25 @@ 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
|
|
+ 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_prog_ac_ct_DSYMUTIL="dsymutil"
|
|
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
break 2
|
|
fi
|
|
done
|
|
-done
|
|
+ done
|
|
IFS=$as_save_IFS
|
|
|
|
fi
|
|
fi
|
|
ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
|
|
if test -n "$ac_ct_DSYMUTIL"; then
|
|
- { echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5
|
|
-echo "${ECHO_T}$ac_ct_DSYMUTIL" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5
|
|
+$as_echo "$ac_ct_DSYMUTIL" >&6; }
|
|
else
|
|
- { echo "$as_me:$LINENO: result: no" >&5
|
|
-echo "${ECHO_T}no" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
+$as_echo "no" >&6; }
|
|
fi
|
|
|
|
if test "x$ac_ct_DSYMUTIL" = x; then
|
|
@@ -7763,12 +7634,8 @@ fi
|
|
else
|
|
case $cross_compiling:$ac_tool_warned in
|
|
yes:)
|
|
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
|
|
-whose name does not start with the host triplet. If you think this
|
|
-configuration is useful to you, please write to autoconf@gnu.org." >&5
|
|
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
|
|
-whose name does not start with the host triplet. If you think this
|
|
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
|
|
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
|
|
ac_tool_warned=yes ;;
|
|
esac
|
|
DSYMUTIL=$ac_ct_DSYMUTIL
|
|
@@ -7780,10 +7647,10 @@ fi
|
|
if test -n "$ac_tool_prefix"; then
|
|
# Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
|
|
set dummy ${ac_tool_prefix}nmedit; 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_prog_NMEDIT+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
|
+$as_echo_n "checking for $ac_word... " >&6; }
|
|
+if test "${ac_cv_prog_NMEDIT+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
if test -n "$NMEDIT"; then
|
|
ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test.
|
|
@@ -7793,25 +7660,25 @@ 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
|
|
+ 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_prog_NMEDIT="${ac_tool_prefix}nmedit"
|
|
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
break 2
|
|
fi
|
|
done
|
|
-done
|
|
+ done
|
|
IFS=$as_save_IFS
|
|
|
|
fi
|
|
fi
|
|
NMEDIT=$ac_cv_prog_NMEDIT
|
|
if test -n "$NMEDIT"; then
|
|
- { echo "$as_me:$LINENO: result: $NMEDIT" >&5
|
|
-echo "${ECHO_T}$NMEDIT" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5
|
|
+$as_echo "$NMEDIT" >&6; }
|
|
else
|
|
- { echo "$as_me:$LINENO: result: no" >&5
|
|
-echo "${ECHO_T}no" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
+$as_echo "no" >&6; }
|
|
fi
|
|
|
|
|
|
@@ -7820,10 +7687,10 @@ if test -z "$ac_cv_prog_NMEDIT"; then
|
|
ac_ct_NMEDIT=$NMEDIT
|
|
# Extract the first word of "nmedit", so it can be a program name with args.
|
|
set dummy nmedit; 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_prog_ac_ct_NMEDIT+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
|
+$as_echo_n "checking for $ac_word... " >&6; }
|
|
+if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
if test -n "$ac_ct_NMEDIT"; then
|
|
ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test.
|
|
@@ -7833,25 +7700,25 @@ 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
|
|
+ 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_prog_ac_ct_NMEDIT="nmedit"
|
|
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
break 2
|
|
fi
|
|
done
|
|
-done
|
|
+ done
|
|
IFS=$as_save_IFS
|
|
|
|
fi
|
|
fi
|
|
ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
|
|
if test -n "$ac_ct_NMEDIT"; then
|
|
- { echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5
|
|
-echo "${ECHO_T}$ac_ct_NMEDIT" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5
|
|
+$as_echo "$ac_ct_NMEDIT" >&6; }
|
|
else
|
|
- { echo "$as_me:$LINENO: result: no" >&5
|
|
-echo "${ECHO_T}no" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
+$as_echo "no" >&6; }
|
|
fi
|
|
|
|
if test "x$ac_ct_NMEDIT" = x; then
|
|
@@ -7859,12 +7726,8 @@ fi
|
|
else
|
|
case $cross_compiling:$ac_tool_warned in
|
|
yes:)
|
|
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
|
|
-whose name does not start with the host triplet. If you think this
|
|
-configuration is useful to you, please write to autoconf@gnu.org." >&5
|
|
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
|
|
-whose name does not start with the host triplet. If you think this
|
|
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
|
|
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
|
|
ac_tool_warned=yes ;;
|
|
esac
|
|
NMEDIT=$ac_ct_NMEDIT
|
|
@@ -7876,10 +7739,10 @@ fi
|
|
if test -n "$ac_tool_prefix"; then
|
|
# Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args.
|
|
set dummy ${ac_tool_prefix}lipo; 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_prog_LIPO+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
|
+$as_echo_n "checking for $ac_word... " >&6; }
|
|
+if test "${ac_cv_prog_LIPO+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
if test -n "$LIPO"; then
|
|
ac_cv_prog_LIPO="$LIPO" # Let the user override the test.
|
|
@@ -7889,25 +7752,25 @@ 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
|
|
+ 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_prog_LIPO="${ac_tool_prefix}lipo"
|
|
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
break 2
|
|
fi
|
|
done
|
|
-done
|
|
+ done
|
|
IFS=$as_save_IFS
|
|
|
|
fi
|
|
fi
|
|
LIPO=$ac_cv_prog_LIPO
|
|
if test -n "$LIPO"; then
|
|
- { echo "$as_me:$LINENO: result: $LIPO" >&5
|
|
-echo "${ECHO_T}$LIPO" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5
|
|
+$as_echo "$LIPO" >&6; }
|
|
else
|
|
- { echo "$as_me:$LINENO: result: no" >&5
|
|
-echo "${ECHO_T}no" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
+$as_echo "no" >&6; }
|
|
fi
|
|
|
|
|
|
@@ -7916,10 +7779,10 @@ if test -z "$ac_cv_prog_LIPO"; then
|
|
ac_ct_LIPO=$LIPO
|
|
# Extract the first word of "lipo", so it can be a program name with args.
|
|
set dummy lipo; 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_prog_ac_ct_LIPO+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
|
+$as_echo_n "checking for $ac_word... " >&6; }
|
|
+if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
if test -n "$ac_ct_LIPO"; then
|
|
ac_cv_prog_ac_ct_LIPO="$ac_ct_LIPO" # Let the user override the test.
|
|
@@ -7929,25 +7792,25 @@ 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
|
|
+ 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_prog_ac_ct_LIPO="lipo"
|
|
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
break 2
|
|
fi
|
|
done
|
|
-done
|
|
+ done
|
|
IFS=$as_save_IFS
|
|
|
|
fi
|
|
fi
|
|
ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO
|
|
if test -n "$ac_ct_LIPO"; then
|
|
- { echo "$as_me:$LINENO: result: $ac_ct_LIPO" >&5
|
|
-echo "${ECHO_T}$ac_ct_LIPO" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5
|
|
+$as_echo "$ac_ct_LIPO" >&6; }
|
|
else
|
|
- { echo "$as_me:$LINENO: result: no" >&5
|
|
-echo "${ECHO_T}no" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
+$as_echo "no" >&6; }
|
|
fi
|
|
|
|
if test "x$ac_ct_LIPO" = x; then
|
|
@@ -7955,12 +7818,8 @@ fi
|
|
else
|
|
case $cross_compiling:$ac_tool_warned in
|
|
yes:)
|
|
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
|
|
-whose name does not start with the host triplet. If you think this
|
|
-configuration is useful to you, please write to autoconf@gnu.org." >&5
|
|
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
|
|
-whose name does not start with the host triplet. If you think this
|
|
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
|
|
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
|
|
ac_tool_warned=yes ;;
|
|
esac
|
|
LIPO=$ac_ct_LIPO
|
|
@@ -7972,10 +7831,10 @@ fi
|
|
if test -n "$ac_tool_prefix"; then
|
|
# Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args.
|
|
set dummy ${ac_tool_prefix}otool; 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_prog_OTOOL+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
|
+$as_echo_n "checking for $ac_word... " >&6; }
|
|
+if test "${ac_cv_prog_OTOOL+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
if test -n "$OTOOL"; then
|
|
ac_cv_prog_OTOOL="$OTOOL" # Let the user override the test.
|
|
@@ -7985,25 +7844,25 @@ 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
|
|
+ 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_prog_OTOOL="${ac_tool_prefix}otool"
|
|
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
break 2
|
|
fi
|
|
done
|
|
-done
|
|
+ done
|
|
IFS=$as_save_IFS
|
|
|
|
fi
|
|
fi
|
|
OTOOL=$ac_cv_prog_OTOOL
|
|
if test -n "$OTOOL"; then
|
|
- { echo "$as_me:$LINENO: result: $OTOOL" >&5
|
|
-echo "${ECHO_T}$OTOOL" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5
|
|
+$as_echo "$OTOOL" >&6; }
|
|
else
|
|
- { echo "$as_me:$LINENO: result: no" >&5
|
|
-echo "${ECHO_T}no" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
+$as_echo "no" >&6; }
|
|
fi
|
|
|
|
|
|
@@ -8012,10 +7871,10 @@ if test -z "$ac_cv_prog_OTOOL"; then
|
|
ac_ct_OTOOL=$OTOOL
|
|
# Extract the first word of "otool", so it can be a program name with args.
|
|
set dummy otool; 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_prog_ac_ct_OTOOL+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
|
+$as_echo_n "checking for $ac_word... " >&6; }
|
|
+if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
if test -n "$ac_ct_OTOOL"; then
|
|
ac_cv_prog_ac_ct_OTOOL="$ac_ct_OTOOL" # Let the user override the test.
|
|
@@ -8025,25 +7884,25 @@ 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
|
|
+ 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_prog_ac_ct_OTOOL="otool"
|
|
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
break 2
|
|
fi
|
|
done
|
|
-done
|
|
+ done
|
|
IFS=$as_save_IFS
|
|
|
|
fi
|
|
fi
|
|
ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL
|
|
if test -n "$ac_ct_OTOOL"; then
|
|
- { echo "$as_me:$LINENO: result: $ac_ct_OTOOL" >&5
|
|
-echo "${ECHO_T}$ac_ct_OTOOL" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5
|
|
+$as_echo "$ac_ct_OTOOL" >&6; }
|
|
else
|
|
- { echo "$as_me:$LINENO: result: no" >&5
|
|
-echo "${ECHO_T}no" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
+$as_echo "no" >&6; }
|
|
fi
|
|
|
|
if test "x$ac_ct_OTOOL" = x; then
|
|
@@ -8051,12 +7910,8 @@ fi
|
|
else
|
|
case $cross_compiling:$ac_tool_warned in
|
|
yes:)
|
|
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
|
|
-whose name does not start with the host triplet. If you think this
|
|
-configuration is useful to you, please write to autoconf@gnu.org." >&5
|
|
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
|
|
-whose name does not start with the host triplet. If you think this
|
|
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
|
|
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
|
|
ac_tool_warned=yes ;;
|
|
esac
|
|
OTOOL=$ac_ct_OTOOL
|
|
@@ -8068,10 +7923,10 @@ fi
|
|
if test -n "$ac_tool_prefix"; then
|
|
# Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args.
|
|
set dummy ${ac_tool_prefix}otool64; 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_prog_OTOOL64+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
|
+$as_echo_n "checking for $ac_word... " >&6; }
|
|
+if test "${ac_cv_prog_OTOOL64+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
if test -n "$OTOOL64"; then
|
|
ac_cv_prog_OTOOL64="$OTOOL64" # Let the user override the test.
|
|
@@ -8081,25 +7936,25 @@ 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
|
|
+ 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_prog_OTOOL64="${ac_tool_prefix}otool64"
|
|
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
break 2
|
|
fi
|
|
done
|
|
-done
|
|
+ done
|
|
IFS=$as_save_IFS
|
|
|
|
fi
|
|
fi
|
|
OTOOL64=$ac_cv_prog_OTOOL64
|
|
if test -n "$OTOOL64"; then
|
|
- { echo "$as_me:$LINENO: result: $OTOOL64" >&5
|
|
-echo "${ECHO_T}$OTOOL64" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5
|
|
+$as_echo "$OTOOL64" >&6; }
|
|
else
|
|
- { echo "$as_me:$LINENO: result: no" >&5
|
|
-echo "${ECHO_T}no" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
+$as_echo "no" >&6; }
|
|
fi
|
|
|
|
|
|
@@ -8108,10 +7963,10 @@ if test -z "$ac_cv_prog_OTOOL64"; then
|
|
ac_ct_OTOOL64=$OTOOL64
|
|
# Extract the first word of "otool64", so it can be a program name with args.
|
|
set dummy otool64; 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_prog_ac_ct_OTOOL64+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
|
+$as_echo_n "checking for $ac_word... " >&6; }
|
|
+if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
if test -n "$ac_ct_OTOOL64"; then
|
|
ac_cv_prog_ac_ct_OTOOL64="$ac_ct_OTOOL64" # Let the user override the test.
|
|
@@ -8121,25 +7976,25 @@ 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
|
|
+ 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_prog_ac_ct_OTOOL64="otool64"
|
|
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
break 2
|
|
fi
|
|
done
|
|
-done
|
|
+ done
|
|
IFS=$as_save_IFS
|
|
|
|
fi
|
|
fi
|
|
ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64
|
|
if test -n "$ac_ct_OTOOL64"; then
|
|
- { echo "$as_me:$LINENO: result: $ac_ct_OTOOL64" >&5
|
|
-echo "${ECHO_T}$ac_ct_OTOOL64" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5
|
|
+$as_echo "$ac_ct_OTOOL64" >&6; }
|
|
else
|
|
- { echo "$as_me:$LINENO: result: no" >&5
|
|
-echo "${ECHO_T}no" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
+$as_echo "no" >&6; }
|
|
fi
|
|
|
|
if test "x$ac_ct_OTOOL64" = x; then
|
|
@@ -8147,12 +8002,8 @@ fi
|
|
else
|
|
case $cross_compiling:$ac_tool_warned in
|
|
yes:)
|
|
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
|
|
-whose name does not start with the host triplet. If you think this
|
|
-configuration is useful to you, please write to autoconf@gnu.org." >&5
|
|
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
|
|
-whose name does not start with the host triplet. If you think this
|
|
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
|
|
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
|
|
ac_tool_warned=yes ;;
|
|
esac
|
|
OTOOL64=$ac_ct_OTOOL64
|
|
@@ -8187,10 +8038,10 @@ fi
|
|
|
|
|
|
|
|
- { echo "$as_me:$LINENO: checking for -single_module linker flag" >&5
|
|
-echo $ECHO_N "checking for -single_module linker flag... $ECHO_C" >&6; }
|
|
-if test "${lt_cv_apple_cc_single_mod+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5
|
|
+$as_echo_n "checking for -single_module linker flag... " >&6; }
|
|
+if test "${lt_cv_apple_cc_single_mod+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
lt_cv_apple_cc_single_mod=no
|
|
if test -z "${LT_MULTI_MODULE}"; then
|
|
@@ -8214,22 +8065,18 @@ else
|
|
rm -f conftest.*
|
|
fi
|
|
fi
|
|
-{ echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5
|
|
-echo "${ECHO_T}$lt_cv_apple_cc_single_mod" >&6; }
|
|
- { echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5
|
|
-echo $ECHO_N "checking for -exported_symbols_list linker flag... $ECHO_C" >&6; }
|
|
-if test "${lt_cv_ld_exported_symbols_list+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
|
|
+$as_echo "$lt_cv_apple_cc_single_mod" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
|
|
+$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
|
|
+if test "${lt_cv_ld_exported_symbols_list+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
lt_cv_ld_exported_symbols_list=no
|
|
save_LDFLAGS=$LDFLAGS
|
|
echo "_main" > conftest.sym
|
|
LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
|
|
- cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
/* end confdefs.h. */
|
|
|
|
int
|
|
@@ -8240,39 +8087,18 @@ main ()
|
|
return 0;
|
|
}
|
|
_ACEOF
|
|
-rm -f conftest.$ac_objext conftest$ac_exeext
|
|
-if { (ac_try="$ac_link"
|
|
-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_link") 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_exeext &&
|
|
- $as_test_x conftest$ac_exeext; then
|
|
+if ac_fn_c_try_link "$LINENO"; then :
|
|
lt_cv_ld_exported_symbols_list=yes
|
|
else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
- lt_cv_ld_exported_symbols_list=no
|
|
+ lt_cv_ld_exported_symbols_list=no
|
|
fi
|
|
-
|
|
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
- conftest$ac_exeext conftest.$ac_ext
|
|
+rm -f core conftest.err conftest.$ac_objext \
|
|
+ conftest$ac_exeext conftest.$ac_ext
|
|
LDFLAGS="$save_LDFLAGS"
|
|
|
|
fi
|
|
-{ echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5
|
|
-echo "${ECHO_T}$lt_cv_ld_exported_symbols_list" >&6; }
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
|
|
+$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
|
|
case $host_os in
|
|
rhapsody* | darwin1.[012])
|
|
_lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
|
|
@@ -8309,67 +8135,30 @@ echo "${ECHO_T}$lt_cv_ld_exported_symbol
|
|
esac
|
|
|
|
# On IRIX 5.3, sys/types and inttypes.h are conflicting.
|
|
-
|
|
-
|
|
-
|
|
-
|
|
-
|
|
-
|
|
-
|
|
-
|
|
-
|
|
for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
|
|
inttypes.h stdint.h unistd.h
|
|
-do
|
|
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
|
|
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
|
|
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
|
|
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
-else
|
|
- cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
-/* end confdefs.h. */
|
|
-$ac_includes_default
|
|
-
|
|
-#include <$ac_header>
|
|
+do :
|
|
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
|
|
+ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
|
|
+"
|
|
+eval as_val=\$$as_ac_Header
|
|
+ if test "x$as_val" = x""yes; then :
|
|
+ cat >>confdefs.h <<_ACEOF
|
|
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
|
|
_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
|
|
- eval "$as_ac_Header=yes"
|
|
-else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
|
|
- eval "$as_ac_Header=no"
|
|
fi
|
|
|
|
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
-fi
|
|
-ac_res=`eval echo '${'$as_ac_Header'}'`
|
|
- { echo "$as_me:$LINENO: result: $ac_res" >&5
|
|
-echo "${ECHO_T}$ac_res" >&6; }
|
|
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
|
|
+done
|
|
+
|
|
+
|
|
+for ac_header in dlfcn.h
|
|
+do :
|
|
+ ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default
|
|
+"
|
|
+if test "x$ac_cv_header_dlfcn_h" = x""yes; then :
|
|
cat >>confdefs.h <<_ACEOF
|
|
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
|
|
+#define HAVE_DLFCN_H 1
|
|
_ACEOF
|
|
|
|
fi
|
|
@@ -8378,66 +8167,7 @@ done
|
|
|
|
|
|
|
|
-for ac_header in dlfcn.h
|
|
-do
|
|
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
|
|
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
|
|
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
|
|
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
-else
|
|
- cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
-/* end confdefs.h. */
|
|
-$ac_includes_default
|
|
-
|
|
-#include <$ac_header>
|
|
-_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
|
|
- eval "$as_ac_Header=yes"
|
|
-else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
- eval "$as_ac_Header=no"
|
|
-fi
|
|
-
|
|
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
-fi
|
|
-ac_res=`eval echo '${'$as_ac_Header'}'`
|
|
- { echo "$as_me:$LINENO: result: $ac_res" >&5
|
|
-echo "${ECHO_T}$ac_res" >&6; }
|
|
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
|
|
- cat >>confdefs.h <<_ACEOF
|
|
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
|
|
-_ACEOF
|
|
-
|
|
-fi
|
|
-
|
|
-done
|
|
-
|
|
-
|
|
-
|
|
-# Set options
|
|
+# Set options
|
|
|
|
|
|
|
|
@@ -8448,7 +8178,7 @@ done
|
|
|
|
|
|
# Check whether --enable-shared was given.
|
|
-if test "${enable_shared+set}" = set; then
|
|
+if test "${enable_shared+set}" = set; then :
|
|
enableval=$enable_shared; p=${PACKAGE-default}
|
|
case $enableval in
|
|
yes) enable_shared=yes ;;
|
|
@@ -8479,7 +8209,7 @@ fi
|
|
|
|
|
|
# Check whether --enable-static was given.
|
|
-if test "${enable_static+set}" = set; then
|
|
+if test "${enable_static+set}" = set; then :
|
|
enableval=$enable_static; p=${PACKAGE-default}
|
|
case $enableval in
|
|
yes) enable_static=yes ;;
|
|
@@ -8511,7 +8241,7 @@ fi
|
|
|
|
|
|
# Check whether --with-pic was given.
|
|
-if test "${with_pic+set}" = set; then
|
|
+if test "${with_pic+set}" = set; then :
|
|
withval=$with_pic; pic_mode="$withval"
|
|
else
|
|
pic_mode=default
|
|
@@ -8527,7 +8257,7 @@ test -z "$pic_mode" && pic_mode=default
|
|
|
|
|
|
# Check whether --enable-fast-install was given.
|
|
-if test "${enable_fast_install+set}" = set; then
|
|
+if test "${enable_fast_install+set}" = set; then :
|
|
enableval=$enable_fast_install; p=${PACKAGE-default}
|
|
case $enableval in
|
|
yes) enable_fast_install=yes ;;
|
|
@@ -8608,10 +8338,10 @@ if test -n "${ZSH_VERSION+set}" ; then
|
|
setopt NO_GLOB_SUBST
|
|
fi
|
|
|
|
-{ echo "$as_me:$LINENO: checking for objdir" >&5
|
|
-echo $ECHO_N "checking for objdir... $ECHO_C" >&6; }
|
|
-if test "${lt_cv_objdir+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5
|
|
+$as_echo_n "checking for objdir... " >&6; }
|
|
+if test "${lt_cv_objdir+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
rm -f .libs 2>/dev/null
|
|
mkdir .libs 2>/dev/null
|
|
@@ -8623,8 +8353,8 @@ else
|
|
fi
|
|
rmdir .libs 2>/dev/null
|
|
fi
|
|
-{ echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5
|
|
-echo "${ECHO_T}$lt_cv_objdir" >&6; }
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5
|
|
+$as_echo "$lt_cv_objdir" >&6; }
|
|
objdir=$lt_cv_objdir
|
|
|
|
|
|
@@ -8716,10 +8446,10 @@ test -z "$MAGIC_CMD" && MAGIC_CMD=file
|
|
case $deplibs_check_method in
|
|
file_magic*)
|
|
if test "$file_magic_cmd" = '$MAGIC_CMD'; then
|
|
- { echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5
|
|
-echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6; }
|
|
-if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5
|
|
+$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; }
|
|
+if test "${lt_cv_path_MAGIC_CMD+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
case $MAGIC_CMD in
|
|
[\\/*] | ?:[\\/]*)
|
|
@@ -8769,11 +8499,11 @@ fi
|
|
|
|
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
|
|
if test -n "$MAGIC_CMD"; then
|
|
- { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
|
|
-echo "${ECHO_T}$MAGIC_CMD" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
|
|
+$as_echo "$MAGIC_CMD" >&6; }
|
|
else
|
|
- { echo "$as_me:$LINENO: result: no" >&5
|
|
-echo "${ECHO_T}no" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
+$as_echo "no" >&6; }
|
|
fi
|
|
|
|
|
|
@@ -8782,10 +8512,10 @@ fi
|
|
|
|
if test -z "$lt_cv_path_MAGIC_CMD"; then
|
|
if test -n "$ac_tool_prefix"; then
|
|
- { echo "$as_me:$LINENO: checking for file" >&5
|
|
-echo $ECHO_N "checking for file... $ECHO_C" >&6; }
|
|
-if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5
|
|
+$as_echo_n "checking for file... " >&6; }
|
|
+if test "${lt_cv_path_MAGIC_CMD+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
case $MAGIC_CMD in
|
|
[\\/*] | ?:[\\/]*)
|
|
@@ -8835,11 +8565,11 @@ fi
|
|
|
|
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
|
|
if test -n "$MAGIC_CMD"; then
|
|
- { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
|
|
-echo "${ECHO_T}$MAGIC_CMD" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
|
|
+$as_echo "$MAGIC_CMD" >&6; }
|
|
else
|
|
- { echo "$as_me:$LINENO: result: no" >&5
|
|
-echo "${ECHO_T}no" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
+$as_echo "no" >&6; }
|
|
fi
|
|
|
|
|
|
@@ -8915,10 +8645,10 @@ lt_prog_compiler_no_builtin_flag=
|
|
if test "$GCC" = yes; then
|
|
lt_prog_compiler_no_builtin_flag=' -fno-builtin'
|
|
|
|
- { echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
|
|
-echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; }
|
|
-if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
|
|
+$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
|
|
+if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
lt_cv_prog_compiler_rtti_exceptions=no
|
|
ac_outfile=conftest.$ac_objext
|
|
@@ -8933,11 +8663,11 @@ else
|
|
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
|
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
|
-e 's:$: $lt_compiler_flag:'`
|
|
- (eval echo "\"\$as_me:8936: $lt_compile\"" >&5)
|
|
+ (eval echo "\"\$as_me:8666: $lt_compile\"" >&5)
|
|
(eval "$lt_compile" 2>conftest.err)
|
|
ac_status=$?
|
|
cat conftest.err >&5
|
|
- echo "$as_me:8940: \$? = $ac_status" >&5
|
|
+ echo "$as_me:8670: \$? = $ac_status" >&5
|
|
if (exit $ac_status) && test -s "$ac_outfile"; then
|
|
# The compiler can only warn and ignore the option if not recognized
|
|
# So say no if there are warnings other than the usual output.
|
|
@@ -8950,8 +8680,8 @@ else
|
|
$RM conftest*
|
|
|
|
fi
|
|
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
|
|
-echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; }
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
|
|
+$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
|
|
|
|
if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
|
|
lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
|
|
@@ -8970,8 +8700,8 @@ fi
|
|
lt_prog_compiler_pic=
|
|
lt_prog_compiler_static=
|
|
|
|
-{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
|
|
-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
|
|
+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
|
|
|
|
if test "$GCC" = yes; then
|
|
lt_prog_compiler_wl='-Wl,'
|
|
@@ -9242,8 +8972,8 @@ case $host_os in
|
|
lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
|
|
;;
|
|
esac
|
|
-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5
|
|
-echo "${ECHO_T}$lt_prog_compiler_pic" >&6; }
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
|
|
+$as_echo "$lt_prog_compiler_pic" >&6; }
|
|
|
|
|
|
|
|
@@ -9254,10 +8984,10 @@ echo "${ECHO_T}$lt_prog_compiler_pic" >&
|
|
# Check to make sure the PIC flag actually works.
|
|
#
|
|
if test -n "$lt_prog_compiler_pic"; then
|
|
- { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
|
|
-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6; }
|
|
-if test "${lt_cv_prog_compiler_pic_works+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
|
|
+$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
|
|
+if test "${lt_cv_prog_compiler_pic_works+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
lt_cv_prog_compiler_pic_works=no
|
|
ac_outfile=conftest.$ac_objext
|
|
@@ -9272,11 +9002,11 @@ else
|
|
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
|
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
|
-e 's:$: $lt_compiler_flag:'`
|
|
- (eval echo "\"\$as_me:9275: $lt_compile\"" >&5)
|
|
+ (eval echo "\"\$as_me:9005: $lt_compile\"" >&5)
|
|
(eval "$lt_compile" 2>conftest.err)
|
|
ac_status=$?
|
|
cat conftest.err >&5
|
|
- echo "$as_me:9279: \$? = $ac_status" >&5
|
|
+ echo "$as_me:9009: \$? = $ac_status" >&5
|
|
if (exit $ac_status) && test -s "$ac_outfile"; then
|
|
# The compiler can only warn and ignore the option if not recognized
|
|
# So say no if there are warnings other than the usual output.
|
|
@@ -9289,8 +9019,8 @@ else
|
|
$RM conftest*
|
|
|
|
fi
|
|
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5
|
|
-echo "${ECHO_T}$lt_cv_prog_compiler_pic_works" >&6; }
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5
|
|
+$as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
|
|
|
|
if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
|
|
case $lt_prog_compiler_pic in
|
|
@@ -9313,10 +9043,10 @@ fi
|
|
# Check to make sure the static flag actually works.
|
|
#
|
|
wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
|
|
-{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
|
|
-echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
|
|
-if test "${lt_cv_prog_compiler_static_works+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
|
|
+$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
|
|
+if test "${lt_cv_prog_compiler_static_works+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
lt_cv_prog_compiler_static_works=no
|
|
save_LDFLAGS="$LDFLAGS"
|
|
@@ -9341,8 +9071,8 @@ else
|
|
LDFLAGS="$save_LDFLAGS"
|
|
|
|
fi
|
|
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5
|
|
-echo "${ECHO_T}$lt_cv_prog_compiler_static_works" >&6; }
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5
|
|
+$as_echo "$lt_cv_prog_compiler_static_works" >&6; }
|
|
|
|
if test x"$lt_cv_prog_compiler_static_works" = xyes; then
|
|
:
|
|
@@ -9356,10 +9086,10 @@ fi
|
|
|
|
|
|
|
|
- { echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
|
|
-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
|
|
-if test "${lt_cv_prog_compiler_c_o+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
|
|
+$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
|
|
+if test "${lt_cv_prog_compiler_c_o+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
lt_cv_prog_compiler_c_o=no
|
|
$RM -r conftest 2>/dev/null
|
|
@@ -9377,11 +9107,11 @@ else
|
|
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
|
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
|
-e 's:$: $lt_compiler_flag:'`
|
|
- (eval echo "\"\$as_me:9380: $lt_compile\"" >&5)
|
|
+ (eval echo "\"\$as_me:9110: $lt_compile\"" >&5)
|
|
(eval "$lt_compile" 2>out/conftest.err)
|
|
ac_status=$?
|
|
cat out/conftest.err >&5
|
|
- echo "$as_me:9384: \$? = $ac_status" >&5
|
|
+ echo "$as_me:9114: \$? = $ac_status" >&5
|
|
if (exit $ac_status) && test -s out/conftest2.$ac_objext
|
|
then
|
|
# The compiler can only warn and ignore the option if not recognized
|
|
@@ -9403,18 +9133,18 @@ else
|
|
$RM conftest*
|
|
|
|
fi
|
|
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
|
|
-echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6; }
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
|
|
+$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
|
|
|
|
|
|
|
|
|
|
|
|
|
|
- { echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
|
|
-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
|
|
-if test "${lt_cv_prog_compiler_c_o+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
|
|
+$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
|
|
+if test "${lt_cv_prog_compiler_c_o+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
lt_cv_prog_compiler_c_o=no
|
|
$RM -r conftest 2>/dev/null
|
|
@@ -9432,11 +9162,11 @@ else
|
|
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
|
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
|
-e 's:$: $lt_compiler_flag:'`
|
|
- (eval echo "\"\$as_me:9435: $lt_compile\"" >&5)
|
|
+ (eval echo "\"\$as_me:9165: $lt_compile\"" >&5)
|
|
(eval "$lt_compile" 2>out/conftest.err)
|
|
ac_status=$?
|
|
cat out/conftest.err >&5
|
|
- echo "$as_me:9439: \$? = $ac_status" >&5
|
|
+ echo "$as_me:9169: \$? = $ac_status" >&5
|
|
if (exit $ac_status) && test -s out/conftest2.$ac_objext
|
|
then
|
|
# The compiler can only warn and ignore the option if not recognized
|
|
@@ -9458,8 +9188,8 @@ else
|
|
$RM conftest*
|
|
|
|
fi
|
|
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
|
|
-echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6; }
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
|
|
+$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
|
|
|
|
|
|
|
|
@@ -9467,19 +9197,19 @@ echo "${ECHO_T}$lt_cv_prog_compiler_c_o"
|
|
hard_links="nottested"
|
|
if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
|
|
# do not overwrite the value of need_locks provided by the user
|
|
- { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
|
|
-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
|
|
+$as_echo_n "checking if we can lock with hard links... " >&6; }
|
|
hard_links=yes
|
|
$RM conftest*
|
|
ln conftest.a conftest.b 2>/dev/null && hard_links=no
|
|
touch conftest.a
|
|
ln conftest.a conftest.b 2>&5 || hard_links=no
|
|
ln conftest.a conftest.b 2>/dev/null && hard_links=no
|
|
- { echo "$as_me:$LINENO: result: $hard_links" >&5
|
|
-echo "${ECHO_T}$hard_links" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
|
|
+$as_echo "$hard_links" >&6; }
|
|
if test "$hard_links" = no; then
|
|
- { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
|
|
-echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
|
|
+$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
|
|
need_locks=warn
|
|
fi
|
|
else
|
|
@@ -9491,8 +9221,8 @@ fi
|
|
|
|
|
|
|
|
- { echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
|
|
-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
|
|
+$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
|
|
|
|
runpath_var=
|
|
allow_undefined_flag=
|
|
@@ -9937,11 +9667,7 @@ _LT_EOF
|
|
allow_undefined_flag='-berok'
|
|
# Determine the default libpath from the value encoded in an
|
|
# empty executable.
|
|
- cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
/* end confdefs.h. */
|
|
|
|
int
|
|
@@ -9952,24 +9678,7 @@ main ()
|
|
return 0;
|
|
}
|
|
_ACEOF
|
|
-rm -f conftest.$ac_objext conftest$ac_exeext
|
|
-if { (ac_try="$ac_link"
|
|
-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_link") 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_exeext &&
|
|
- $as_test_x conftest$ac_exeext; then
|
|
+if ac_fn_c_try_link "$LINENO"; then :
|
|
|
|
lt_aix_libpath_sed='
|
|
/Import File Strings/,/^$/ {
|
|
@@ -9983,15 +9692,9 @@ aix_libpath=`dump -H conftest$ac_exeext
|
|
if test -z "$aix_libpath"; then
|
|
aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
|
|
fi
|
|
-else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
-
|
|
fi
|
|
-
|
|
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
- conftest$ac_exeext conftest.$ac_ext
|
|
+rm -f core conftest.err conftest.$ac_objext \
|
|
+ conftest$ac_exeext conftest.$ac_ext
|
|
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
|
|
|
|
hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
|
|
@@ -10004,11 +9707,7 @@ if test -z "$aix_libpath"; then aix_libp
|
|
else
|
|
# Determine the default libpath from the value encoded in an
|
|
# empty executable.
|
|
- cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
/* end confdefs.h. */
|
|
|
|
int
|
|
@@ -10019,24 +9718,7 @@ main ()
|
|
return 0;
|
|
}
|
|
_ACEOF
|
|
-rm -f conftest.$ac_objext conftest$ac_exeext
|
|
-if { (ac_try="$ac_link"
|
|
-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_link") 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_exeext &&
|
|
- $as_test_x conftest$ac_exeext; then
|
|
+if ac_fn_c_try_link "$LINENO"; then :
|
|
|
|
lt_aix_libpath_sed='
|
|
/Import File Strings/,/^$/ {
|
|
@@ -10050,15 +9732,9 @@ aix_libpath=`dump -H conftest$ac_exeext
|
|
if test -z "$aix_libpath"; then
|
|
aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
|
|
fi
|
|
-else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
-
|
|
fi
|
|
-
|
|
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
- conftest$ac_exeext conftest.$ac_ext
|
|
+rm -f core conftest.err conftest.$ac_objext \
|
|
+ conftest$ac_exeext conftest.$ac_ext
|
|
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
|
|
|
|
hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
|
|
@@ -10270,38 +9946,16 @@ if test -z "$aix_libpath"; then aix_libp
|
|
# implicitly export all symbols.
|
|
save_LDFLAGS="$LDFLAGS"
|
|
LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
|
|
- cat >conftest.$ac_ext <<_ACEOF
|
|
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
+/* end confdefs.h. */
|
|
int foo(void) {}
|
|
_ACEOF
|
|
-rm -f conftest.$ac_objext conftest$ac_exeext
|
|
-if { (ac_try="$ac_link"
|
|
-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_link") 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_exeext &&
|
|
- $as_test_x conftest$ac_exeext; then
|
|
+if ac_fn_c_try_link "$LINENO"; then :
|
|
archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
|
|
|
|
-else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
-
|
|
fi
|
|
-
|
|
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
- conftest$ac_exeext conftest.$ac_ext
|
|
+rm -f core conftest.err conftest.$ac_objext \
|
|
+ conftest$ac_exeext conftest.$ac_ext
|
|
LDFLAGS="$save_LDFLAGS"
|
|
else
|
|
archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
|
|
@@ -10557,8 +10211,8 @@ rm -f core conftest.err conftest.$ac_obj
|
|
fi
|
|
fi
|
|
|
|
-{ echo "$as_me:$LINENO: result: $ld_shlibs" >&5
|
|
-echo "${ECHO_T}$ld_shlibs" >&6; }
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5
|
|
+$as_echo "$ld_shlibs" >&6; }
|
|
test "$ld_shlibs" = no && can_build_shared=no
|
|
|
|
with_gnu_ld=$with_gnu_ld
|
|
@@ -10594,16 +10248,16 @@ x|xyes)
|
|
# Test whether the compiler implicitly links with -lc since on some
|
|
# systems, -lgcc has to come before -lc. If gcc already passes -lc
|
|
# to ld, don't add -lc before -lgcc.
|
|
- { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
|
|
-echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
|
|
+$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
|
|
$RM conftest*
|
|
echo "$lt_simple_compile_test_code" > conftest.$ac_ext
|
|
|
|
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
|
|
(eval $ac_compile) 2>&5
|
|
ac_status=$?
|
|
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
- (exit $ac_status); } 2>conftest.err; then
|
|
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
|
+ test $ac_status = 0; } 2>conftest.err; then
|
|
soname=conftest
|
|
lib=conftest
|
|
libobjs=conftest.$ac_objext
|
|
@@ -10617,11 +10271,11 @@ echo $ECHO_N "checking whether -lc shoul
|
|
libname=conftest
|
|
lt_save_allow_undefined_flag=$allow_undefined_flag
|
|
allow_undefined_flag=
|
|
- if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\"") >&5
|
|
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
|
|
(eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
|
|
ac_status=$?
|
|
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
- (exit $ac_status); }
|
|
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
|
+ test $ac_status = 0; }
|
|
then
|
|
archive_cmds_need_lc=no
|
|
else
|
|
@@ -10632,8 +10286,8 @@ echo $ECHO_N "checking whether -lc shoul
|
|
cat conftest.err 1>&5
|
|
fi
|
|
$RM conftest*
|
|
- { echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5
|
|
-echo "${ECHO_T}$archive_cmds_need_lc" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc" >&5
|
|
+$as_echo "$archive_cmds_need_lc" >&6; }
|
|
;;
|
|
esac
|
|
fi
|
|
@@ -10796,8 +10450,8 @@ esac
|
|
|
|
|
|
|
|
- { echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
|
|
-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
|
|
+$as_echo_n "checking dynamic linker characteristics... " >&6; }
|
|
|
|
if test "$GCC" = yes; then
|
|
case $host_os in
|
|
@@ -11218,11 +10872,7 @@ linux* | k*bsd*-gnu)
|
|
save_libdir=$libdir
|
|
eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
|
|
LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
|
|
- cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
/* end confdefs.h. */
|
|
|
|
int
|
|
@@ -11233,37 +10883,13 @@ main ()
|
|
return 0;
|
|
}
|
|
_ACEOF
|
|
-rm -f conftest.$ac_objext conftest$ac_exeext
|
|
-if { (ac_try="$ac_link"
|
|
-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_link") 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_exeext &&
|
|
- $as_test_x conftest$ac_exeext; then
|
|
- if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then
|
|
+if ac_fn_c_try_link "$LINENO"; then :
|
|
+ if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
|
|
shlibpath_overrides_runpath=yes
|
|
fi
|
|
-
|
|
-else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
-
|
|
fi
|
|
-
|
|
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
- conftest$ac_exeext conftest.$ac_ext
|
|
+rm -f core conftest.err conftest.$ac_objext \
|
|
+ conftest$ac_exeext conftest.$ac_ext
|
|
LDFLAGS=$save_LDFLAGS
|
|
libdir=$save_libdir
|
|
|
|
@@ -11487,8 +11113,8 @@ uts4*)
|
|
dynamic_linker=no
|
|
;;
|
|
esac
|
|
-{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
|
|
-echo "${ECHO_T}$dynamic_linker" >&6; }
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
|
|
+$as_echo "$dynamic_linker" >&6; }
|
|
test "$dynamic_linker" = no && can_build_shared=no
|
|
|
|
variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
|
|
@@ -11589,8 +11215,8 @@ fi
|
|
|
|
|
|
|
|
- { echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
|
|
-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
|
|
+$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
|
|
hardcode_action=
|
|
if test -n "$hardcode_libdir_flag_spec" ||
|
|
test -n "$runpath_var" ||
|
|
@@ -11614,8 +11240,8 @@ else
|
|
# directories.
|
|
hardcode_action=unsupported
|
|
fi
|
|
-{ echo "$as_me:$LINENO: result: $hardcode_action" >&5
|
|
-echo "${ECHO_T}$hardcode_action" >&6; }
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5
|
|
+$as_echo "$hardcode_action" >&6; }
|
|
|
|
if test "$hardcode_action" = relink ||
|
|
test "$inherit_rpath" = yes; then
|
|
@@ -11659,18 +11285,14 @@ else
|
|
|
|
darwin*)
|
|
# if libdl is installed we need to link against it
|
|
- { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
|
|
-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
|
|
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
|
|
+$as_echo_n "checking for dlopen in -ldl... " >&6; }
|
|
+if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
ac_check_lib_save_LIBS=$LIBS
|
|
LIBS="-ldl $LIBS"
|
|
-cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
/* end confdefs.h. */
|
|
|
|
/* Override any GCC internal prototype to avoid an error.
|
|
@@ -11688,39 +11310,18 @@ return dlopen ();
|
|
return 0;
|
|
}
|
|
_ACEOF
|
|
-rm -f conftest.$ac_objext conftest$ac_exeext
|
|
-if { (ac_try="$ac_link"
|
|
-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_link") 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_exeext &&
|
|
- $as_test_x conftest$ac_exeext; then
|
|
+if ac_fn_c_try_link "$LINENO"; then :
|
|
ac_cv_lib_dl_dlopen=yes
|
|
else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
- ac_cv_lib_dl_dlopen=no
|
|
+ ac_cv_lib_dl_dlopen=no
|
|
fi
|
|
-
|
|
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
- conftest$ac_exeext conftest.$ac_ext
|
|
+rm -f core conftest.err conftest.$ac_objext \
|
|
+ conftest$ac_exeext conftest.$ac_ext
|
|
LIBS=$ac_check_lib_save_LIBS
|
|
fi
|
|
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
|
|
-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
|
|
-if test $ac_cv_lib_dl_dlopen = yes; then
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
|
|
+$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
|
|
+if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
|
|
lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
|
|
else
|
|
|
|
@@ -11733,102 +11334,18 @@ fi
|
|
;;
|
|
|
|
*)
|
|
- { echo "$as_me:$LINENO: checking for shl_load" >&5
|
|
-echo $ECHO_N "checking for shl_load... $ECHO_C" >&6; }
|
|
-if test "${ac_cv_func_shl_load+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
-else
|
|
- cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
-/* end confdefs.h. */
|
|
-/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load.
|
|
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
|
|
-#define shl_load innocuous_shl_load
|
|
-
|
|
-/* System header to define __stub macros and hopefully few prototypes,
|
|
- which can conflict with char shl_load (); below.
|
|
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
|
|
- <limits.h> exists even on freestanding compilers. */
|
|
-
|
|
-#ifdef __STDC__
|
|
-# include <limits.h>
|
|
-#else
|
|
-# include <assert.h>
|
|
-#endif
|
|
-
|
|
-#undef shl_load
|
|
-
|
|
-/* Override any GCC internal prototype to avoid an error.
|
|
- Use char because int might match the return type of a GCC
|
|
- builtin and then its argument prototype would still apply. */
|
|
-#ifdef __cplusplus
|
|
-extern "C"
|
|
-#endif
|
|
-char shl_load ();
|
|
-/* The GNU C library defines this for functions which it implements
|
|
- to always fail with ENOSYS. Some functions are actually named
|
|
- something starting with __ and the normal name is an alias. */
|
|
-#if defined __stub_shl_load || defined __stub___shl_load
|
|
-choke me
|
|
-#endif
|
|
-
|
|
-int
|
|
-main ()
|
|
-{
|
|
-return shl_load ();
|
|
- ;
|
|
- return 0;
|
|
-}
|
|
-_ACEOF
|
|
-rm -f conftest.$ac_objext conftest$ac_exeext
|
|
-if { (ac_try="$ac_link"
|
|
-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_link") 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_exeext &&
|
|
- $as_test_x conftest$ac_exeext; then
|
|
- ac_cv_func_shl_load=yes
|
|
-else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
- ac_cv_func_shl_load=no
|
|
-fi
|
|
-
|
|
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
- conftest$ac_exeext conftest.$ac_ext
|
|
-fi
|
|
-{ echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
|
|
-echo "${ECHO_T}$ac_cv_func_shl_load" >&6; }
|
|
-if test $ac_cv_func_shl_load = yes; then
|
|
+ ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"
|
|
+if test "x$ac_cv_func_shl_load" = x""yes; then :
|
|
lt_cv_dlopen="shl_load"
|
|
else
|
|
- { echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
|
|
-echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6; }
|
|
-if test "${ac_cv_lib_dld_shl_load+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
|
|
+$as_echo_n "checking for shl_load in -ldld... " >&6; }
|
|
+if test "${ac_cv_lib_dld_shl_load+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
ac_check_lib_save_LIBS=$LIBS
|
|
LIBS="-ldld $LIBS"
|
|
-cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
/* end confdefs.h. */
|
|
|
|
/* Override any GCC internal prototype to avoid an error.
|
|
@@ -11846,137 +11363,32 @@ return shl_load ();
|
|
return 0;
|
|
}
|
|
_ACEOF
|
|
-rm -f conftest.$ac_objext conftest$ac_exeext
|
|
-if { (ac_try="$ac_link"
|
|
-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_link") 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_exeext &&
|
|
- $as_test_x conftest$ac_exeext; then
|
|
+if ac_fn_c_try_link "$LINENO"; then :
|
|
ac_cv_lib_dld_shl_load=yes
|
|
else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
- ac_cv_lib_dld_shl_load=no
|
|
+ ac_cv_lib_dld_shl_load=no
|
|
fi
|
|
-
|
|
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
- conftest$ac_exeext conftest.$ac_ext
|
|
+rm -f core conftest.err conftest.$ac_objext \
|
|
+ conftest$ac_exeext conftest.$ac_ext
|
|
LIBS=$ac_check_lib_save_LIBS
|
|
fi
|
|
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
|
|
-echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; }
|
|
-if test $ac_cv_lib_dld_shl_load = yes; then
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
|
|
+$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
|
|
+if test "x$ac_cv_lib_dld_shl_load" = x""yes; then :
|
|
lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
|
|
else
|
|
- { echo "$as_me:$LINENO: checking for dlopen" >&5
|
|
-echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; }
|
|
-if test "${ac_cv_func_dlopen+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
-else
|
|
- cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
-/* end confdefs.h. */
|
|
-/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen.
|
|
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
|
|
-#define dlopen innocuous_dlopen
|
|
-
|
|
-/* System header to define __stub macros and hopefully few prototypes,
|
|
- which can conflict with char dlopen (); below.
|
|
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
|
|
- <limits.h> exists even on freestanding compilers. */
|
|
-
|
|
-#ifdef __STDC__
|
|
-# include <limits.h>
|
|
-#else
|
|
-# include <assert.h>
|
|
-#endif
|
|
-
|
|
-#undef dlopen
|
|
-
|
|
-/* Override any GCC internal prototype to avoid an error.
|
|
- Use char because int might match the return type of a GCC
|
|
- builtin and then its argument prototype would still apply. */
|
|
-#ifdef __cplusplus
|
|
-extern "C"
|
|
-#endif
|
|
-char dlopen ();
|
|
-/* The GNU C library defines this for functions which it implements
|
|
- to always fail with ENOSYS. Some functions are actually named
|
|
- something starting with __ and the normal name is an alias. */
|
|
-#if defined __stub_dlopen || defined __stub___dlopen
|
|
-choke me
|
|
-#endif
|
|
-
|
|
-int
|
|
-main ()
|
|
-{
|
|
-return dlopen ();
|
|
- ;
|
|
- return 0;
|
|
-}
|
|
-_ACEOF
|
|
-rm -f conftest.$ac_objext conftest$ac_exeext
|
|
-if { (ac_try="$ac_link"
|
|
-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_link") 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_exeext &&
|
|
- $as_test_x conftest$ac_exeext; then
|
|
- ac_cv_func_dlopen=yes
|
|
-else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
- ac_cv_func_dlopen=no
|
|
-fi
|
|
-
|
|
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
- conftest$ac_exeext conftest.$ac_ext
|
|
-fi
|
|
-{ echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
|
|
-echo "${ECHO_T}$ac_cv_func_dlopen" >&6; }
|
|
-if test $ac_cv_func_dlopen = yes; then
|
|
+ ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
|
|
+if test "x$ac_cv_func_dlopen" = x""yes; then :
|
|
lt_cv_dlopen="dlopen"
|
|
else
|
|
- { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
|
|
-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
|
|
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
|
|
+$as_echo_n "checking for dlopen in -ldl... " >&6; }
|
|
+if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
ac_check_lib_save_LIBS=$LIBS
|
|
LIBS="-ldl $LIBS"
|
|
-cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
/* end confdefs.h. */
|
|
|
|
/* Override any GCC internal prototype to avoid an error.
|
|
@@ -11994,53 +11406,28 @@ return dlopen ();
|
|
return 0;
|
|
}
|
|
_ACEOF
|
|
-rm -f conftest.$ac_objext conftest$ac_exeext
|
|
-if { (ac_try="$ac_link"
|
|
-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_link") 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_exeext &&
|
|
- $as_test_x conftest$ac_exeext; then
|
|
+if ac_fn_c_try_link "$LINENO"; then :
|
|
ac_cv_lib_dl_dlopen=yes
|
|
else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
- ac_cv_lib_dl_dlopen=no
|
|
+ ac_cv_lib_dl_dlopen=no
|
|
fi
|
|
-
|
|
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
- conftest$ac_exeext conftest.$ac_ext
|
|
+rm -f core conftest.err conftest.$ac_objext \
|
|
+ conftest$ac_exeext conftest.$ac_ext
|
|
LIBS=$ac_check_lib_save_LIBS
|
|
fi
|
|
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
|
|
-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
|
|
-if test $ac_cv_lib_dl_dlopen = yes; then
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
|
|
+$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
|
|
+if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
|
|
lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
|
|
else
|
|
- { echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
|
|
-echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6; }
|
|
-if test "${ac_cv_lib_svld_dlopen+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
|
|
+$as_echo_n "checking for dlopen in -lsvld... " >&6; }
|
|
+if test "${ac_cv_lib_svld_dlopen+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
ac_check_lib_save_LIBS=$LIBS
|
|
LIBS="-lsvld $LIBS"
|
|
-cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
/* end confdefs.h. */
|
|
|
|
/* Override any GCC internal prototype to avoid an error.
|
|
@@ -12058,53 +11445,28 @@ return dlopen ();
|
|
return 0;
|
|
}
|
|
_ACEOF
|
|
-rm -f conftest.$ac_objext conftest$ac_exeext
|
|
-if { (ac_try="$ac_link"
|
|
-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_link") 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_exeext &&
|
|
- $as_test_x conftest$ac_exeext; then
|
|
+if ac_fn_c_try_link "$LINENO"; then :
|
|
ac_cv_lib_svld_dlopen=yes
|
|
else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
- ac_cv_lib_svld_dlopen=no
|
|
+ ac_cv_lib_svld_dlopen=no
|
|
fi
|
|
-
|
|
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
- conftest$ac_exeext conftest.$ac_ext
|
|
+rm -f core conftest.err conftest.$ac_objext \
|
|
+ conftest$ac_exeext conftest.$ac_ext
|
|
LIBS=$ac_check_lib_save_LIBS
|
|
fi
|
|
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
|
|
-echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6; }
|
|
-if test $ac_cv_lib_svld_dlopen = yes; then
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
|
|
+$as_echo "$ac_cv_lib_svld_dlopen" >&6; }
|
|
+if test "x$ac_cv_lib_svld_dlopen" = x""yes; then :
|
|
lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
|
|
else
|
|
- { echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
|
|
-echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6; }
|
|
-if test "${ac_cv_lib_dld_dld_link+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
|
|
+$as_echo_n "checking for dld_link in -ldld... " >&6; }
|
|
+if test "${ac_cv_lib_dld_dld_link+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
ac_check_lib_save_LIBS=$LIBS
|
|
LIBS="-ldld $LIBS"
|
|
-cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
/* end confdefs.h. */
|
|
|
|
/* Override any GCC internal prototype to avoid an error.
|
|
@@ -12122,39 +11484,18 @@ return dld_link ();
|
|
return 0;
|
|
}
|
|
_ACEOF
|
|
-rm -f conftest.$ac_objext conftest$ac_exeext
|
|
-if { (ac_try="$ac_link"
|
|
-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_link") 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_exeext &&
|
|
- $as_test_x conftest$ac_exeext; then
|
|
+if ac_fn_c_try_link "$LINENO"; then :
|
|
ac_cv_lib_dld_dld_link=yes
|
|
else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
- ac_cv_lib_dld_dld_link=no
|
|
+ ac_cv_lib_dld_dld_link=no
|
|
fi
|
|
-
|
|
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
- conftest$ac_exeext conftest.$ac_ext
|
|
+rm -f core conftest.err conftest.$ac_objext \
|
|
+ conftest$ac_exeext conftest.$ac_ext
|
|
LIBS=$ac_check_lib_save_LIBS
|
|
fi
|
|
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
|
|
-echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; }
|
|
-if test $ac_cv_lib_dld_dld_link = yes; then
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5
|
|
+$as_echo "$ac_cv_lib_dld_dld_link" >&6; }
|
|
+if test "x$ac_cv_lib_dld_dld_link" = x""yes; then :
|
|
lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
|
|
fi
|
|
|
|
@@ -12193,10 +11534,10 @@ fi
|
|
save_LIBS="$LIBS"
|
|
LIBS="$lt_cv_dlopen_libs $LIBS"
|
|
|
|
- { echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
|
|
-echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6; }
|
|
-if test "${lt_cv_dlopen_self+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5
|
|
+$as_echo_n "checking whether a program can dlopen itself... " >&6; }
|
|
+if test "${lt_cv_dlopen_self+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
if test "$cross_compiling" = yes; then :
|
|
lt_cv_dlopen_self=cross
|
|
@@ -12204,7 +11545,7 @@ else
|
|
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
|
lt_status=$lt_dlunknown
|
|
cat > conftest.$ac_ext <<_LT_EOF
|
|
-#line 12207 "configure"
|
|
+#line 11548 "configure"
|
|
#include "confdefs.h"
|
|
|
|
#if HAVE_DLFCN_H
|
|
@@ -12263,11 +11604,11 @@ int main ()
|
|
return status;
|
|
}
|
|
_LT_EOF
|
|
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
|
|
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
|
|
(eval $ac_link) 2>&5
|
|
ac_status=$?
|
|
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
- (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
|
|
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
|
+ test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
|
|
(./conftest; exit; ) >&5 2>/dev/null
|
|
lt_status=$?
|
|
case x$lt_status in
|
|
@@ -12284,15 +11625,15 @@ rm -fr conftest*
|
|
|
|
|
|
fi
|
|
-{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
|
|
-echo "${ECHO_T}$lt_cv_dlopen_self" >&6; }
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5
|
|
+$as_echo "$lt_cv_dlopen_self" >&6; }
|
|
|
|
if test "x$lt_cv_dlopen_self" = xyes; then
|
|
wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
|
|
- { echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
|
|
-echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6; }
|
|
-if test "${lt_cv_dlopen_self_static+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5
|
|
+$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; }
|
|
+if test "${lt_cv_dlopen_self_static+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
if test "$cross_compiling" = yes; then :
|
|
lt_cv_dlopen_self_static=cross
|
|
@@ -12300,7 +11641,7 @@ else
|
|
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
|
lt_status=$lt_dlunknown
|
|
cat > conftest.$ac_ext <<_LT_EOF
|
|
-#line 12303 "configure"
|
|
+#line 11644 "configure"
|
|
#include "confdefs.h"
|
|
|
|
#if HAVE_DLFCN_H
|
|
@@ -12359,11 +11700,11 @@ int main ()
|
|
return status;
|
|
}
|
|
_LT_EOF
|
|
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
|
|
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
|
|
(eval $ac_link) 2>&5
|
|
ac_status=$?
|
|
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
- (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
|
|
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
|
+ test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
|
|
(./conftest; exit; ) >&5 2>/dev/null
|
|
lt_status=$?
|
|
case x$lt_status in
|
|
@@ -12380,8 +11721,8 @@ rm -fr conftest*
|
|
|
|
|
|
fi
|
|
-{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
|
|
-echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6; }
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5
|
|
+$as_echo "$lt_cv_dlopen_self_static" >&6; }
|
|
fi
|
|
|
|
CPPFLAGS="$save_CPPFLAGS"
|
|
@@ -12419,13 +11760,13 @@ fi
|
|
|
|
striplib=
|
|
old_striplib=
|
|
-{ echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
|
|
-echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6; }
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5
|
|
+$as_echo_n "checking whether stripping libraries is possible... " >&6; }
|
|
if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
|
|
test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
|
|
test -z "$striplib" && striplib="$STRIP --strip-unneeded"
|
|
- { echo "$as_me:$LINENO: result: yes" >&5
|
|
-echo "${ECHO_T}yes" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
|
+$as_echo "yes" >&6; }
|
|
else
|
|
# FIXME - insert some real tests, host_os isn't really good enough
|
|
case $host_os in
|
|
@@ -12433,16 +11774,16 @@ else
|
|
if test -n "$STRIP" ; then
|
|
striplib="$STRIP -x"
|
|
old_striplib="$STRIP -S"
|
|
- { echo "$as_me:$LINENO: result: yes" >&5
|
|
-echo "${ECHO_T}yes" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
|
+$as_echo "yes" >&6; }
|
|
else
|
|
- { echo "$as_me:$LINENO: result: no" >&5
|
|
-echo "${ECHO_T}no" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
+$as_echo "no" >&6; }
|
|
fi
|
|
;;
|
|
*)
|
|
- { echo "$as_me:$LINENO: result: no" >&5
|
|
-echo "${ECHO_T}no" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
+$as_echo "no" >&6; }
|
|
;;
|
|
esac
|
|
fi
|
|
@@ -12459,13 +11800,13 @@ fi
|
|
|
|
|
|
# Report which library types will actually be built
|
|
- { echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
|
|
-echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; }
|
|
- { echo "$as_me:$LINENO: result: $can_build_shared" >&5
|
|
-echo "${ECHO_T}$can_build_shared" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5
|
|
+$as_echo_n "checking if libtool supports shared libraries... " >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5
|
|
+$as_echo "$can_build_shared" >&6; }
|
|
|
|
- { echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
|
|
-echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5
|
|
+$as_echo_n "checking whether to build shared libraries... " >&6; }
|
|
test "$can_build_shared" = "no" && enable_shared=no
|
|
|
|
# On AIX, shared libraries and static libraries use the same namespace, and
|
|
@@ -12485,15 +11826,15 @@ echo $ECHO_N "checking whether to build
|
|
fi
|
|
;;
|
|
esac
|
|
- { echo "$as_me:$LINENO: result: $enable_shared" >&5
|
|
-echo "${ECHO_T}$enable_shared" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5
|
|
+$as_echo "$enable_shared" >&6; }
|
|
|
|
- { echo "$as_me:$LINENO: checking whether to build static libraries" >&5
|
|
-echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5
|
|
+$as_echo_n "checking whether to build static libraries... " >&6; }
|
|
# Make sure either enable_shared or enable_static is yes.
|
|
test "$enable_shared" = yes || enable_static=yes
|
|
- { echo "$as_me:$LINENO: result: $enable_static" >&5
|
|
-echo "${ECHO_T}$enable_static" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
|
|
+$as_echo "$enable_static" >&6; }
|
|
|
|
|
|
|
|
@@ -12546,7 +11887,7 @@ fi
|
|
|
|
|
|
# Check whether --with-libgtop-examples was given.
|
|
-if test "${with_libgtop_examples+set}" = set; then
|
|
+if test "${with_libgtop_examples+set}" = set; then :
|
|
withval=$with_libgtop_examples;
|
|
build_examples="$withval"
|
|
else
|
|
@@ -12564,7 +11905,7 @@ fi
|
|
|
|
|
|
# Check whether --enable-hacker-mode was given.
|
|
-if test "${enable_hacker_mode+set}" = set; then
|
|
+if test "${enable_hacker_mode+set}" = set; then :
|
|
enableval=$enable_hacker_mode; hacker_mode="$enableval"
|
|
else
|
|
hacker_mode=no
|
|
@@ -12582,7 +11923,7 @@ fi
|
|
|
|
|
|
# Check whether --with-libgtop-smp was given.
|
|
-if test "${with_libgtop_smp+set}" = set; then
|
|
+if test "${with_libgtop_smp+set}" = set; then :
|
|
withval=$with_libgtop_smp;
|
|
libgtop_smp="$withval"
|
|
else
|
|
@@ -12591,8 +11932,8 @@ fi
|
|
|
|
|
|
if test $libgtop_smp = auto ; then
|
|
- { echo "$as_me:$LINENO: checking whether to enable SMP support" >&5
|
|
-echo $ECHO_N "checking whether to enable SMP support... $ECHO_C" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable SMP support" >&5
|
|
+$as_echo_n "checking whether to enable SMP support... " >&6; }
|
|
case "$host_os" in
|
|
linux*)
|
|
libgtop_smp=yes
|
|
@@ -12604,15 +11945,13 @@ echo $ECHO_N "checking whether to enable
|
|
libgtop_smp=no
|
|
;;
|
|
esac
|
|
- { echo "$as_me:$LINENO: result: $libgtop_smp" >&5
|
|
-echo "${ECHO_T}$libgtop_smp" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $libgtop_smp" >&5
|
|
+$as_echo "$libgtop_smp" >&6; }
|
|
fi
|
|
|
|
if test $libgtop_smp = yes ; then
|
|
|
|
-cat >>confdefs.h <<\_ACEOF
|
|
-#define HAVE_LIBGTOP_SMP 1
|
|
-_ACEOF
|
|
+$as_echo "#define HAVE_LIBGTOP_SMP 1" >>confdefs.h
|
|
|
|
fi
|
|
|
|
@@ -12625,8 +11964,8 @@ else
|
|
fi
|
|
|
|
|
|
- { echo "$as_me:$LINENO: checking for libgtop sysdeps directory" >&5
|
|
-echo $ECHO_N "checking for libgtop sysdeps directory... $ECHO_C" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libgtop sysdeps directory" >&5
|
|
+$as_echo_n "checking for libgtop sysdeps directory... " >&6; }
|
|
|
|
case "$host_os" in
|
|
linux*)
|
|
@@ -12641,7 +11980,7 @@ echo $ECHO_N "checking for libgtop sysde
|
|
libgtop_sysdeps_dir=bsd
|
|
libgtop_use_machine_h=yes
|
|
libgtop_need_server=yes
|
|
- libgtop_postinstall='chgrp kmem $(bindir)/libgtop_server2 && chmod 2755 $(bindir)/libgtop_server2'
|
|
+ libgtop_postinstall='chgrp kmem $(DESTDIR)$(libexecdir)/libgtop_server2 && chmod 2755 $(DESTDIR)$(libexecdir)/libgtop_server2'
|
|
;;
|
|
freebsd*|kfreebsd*)
|
|
libgtop_sysdeps_dir=freebsd
|
|
@@ -12649,27 +11988,27 @@ echo $ECHO_N "checking for libgtop sysde
|
|
libgtop_need_server=yes
|
|
libgtop_sysdeps_private_mountlist=yes
|
|
libgtop_sysdeps_private_fsusage=yes
|
|
- libgtop_postinstall='chgrp kmem $(bindir)/libgtop_server2 && chmod 2755 $(bindir)/libgtop_server2'
|
|
+ libgtop_postinstall='chgrp kmem $(DESTDIR)$(libexecdir)/libgtop_server2 && chmod 2755 $(DESTDIR)$(libexecdir)/libgtop_server2'
|
|
;;
|
|
solaris*)
|
|
libgtop_sysdeps_dir=solaris
|
|
libgtop_use_machine_h=yes
|
|
libgtop_need_server=yes
|
|
- libgtop_postinstall='chgrp sys $(bindir)/libgtop_server && chmod 2755 $(bindir)/libgtop_server'
|
|
+ libgtop_postinstall='chgrp sys $(DESTDIR)$(libexecdir)/libgtop_server && chmod 2755 $(DESTDIR)$(libexecdir)/libgtop_server'
|
|
;;
|
|
aix*)
|
|
libgtop_sysdeps_dir=aix
|
|
libgtop_use_machine_h=yes
|
|
libgtop_need_server=yes
|
|
libgtop_have_sysinfo=yes
|
|
- libgtop_postinstall='chgrp system $(bindir)/libgtop_server && chmod g+s $(bindir)/libgtop_server2'
|
|
+ libgtop_postinstall='chgrp system $(DESTDIR)$(libexecdir)/libgtop_server && chmod g+s $(DESTDIR)$(libexecdir)/libgtop_server2'
|
|
;;
|
|
darwin*)
|
|
libgtop_sysdeps_dir=darwin
|
|
libgtop_use_machine_h=yes
|
|
libgtop_need_server=yes
|
|
libgtop_have_sysinfo=yes
|
|
- libgtop_postinstall='chgrp kmem $(bindir)/libgtop_server2 && chmod g+s $(bindir)/libgtop_server2'
|
|
+ libgtop_postinstall='chgrp kmem $(DESTDIR)$(libexecdir)/libgtop_server2 && chmod g+s $(DESTDIR)$(libexecdir)/libgtop_server2'
|
|
;;
|
|
cygwin*)
|
|
libgtop_sysdeps_dir=cygwin
|
|
@@ -12708,8 +12047,8 @@ echo $ECHO_N "checking for libgtop sysde
|
|
|
|
test -z "$libgtop_postinstall" && libgtop_postinstall=:
|
|
|
|
- { echo "$as_me:$LINENO: result: $libgtop_sysdeps_dir" >&5
|
|
-echo "${ECHO_T}$libgtop_sysdeps_dir" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $libgtop_sysdeps_dir" >&5
|
|
+$as_echo "$libgtop_sysdeps_dir" >&6; }
|
|
|
|
|
|
|
|
@@ -12717,20 +12056,14 @@ echo "${ECHO_T}$libgtop_sysdeps_dir" >&6
|
|
|
|
case "$host_os" in
|
|
*bsd*)
|
|
- case "$host_os" in
|
|
- *kfreebsd*)
|
|
- { echo "$as_me:$LINENO: checking for kvm_open in -lkvm" >&5
|
|
-echo $ECHO_N "checking for kvm_open in -lkvm... $ECHO_C" >&6; }
|
|
-if test "${ac_cv_lib_kvm_kvm_open+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for kvm_open in -lkvm" >&5
|
|
+$as_echo_n "checking for kvm_open in -lkvm... " >&6; }
|
|
+if test "${ac_cv_lib_kvm_kvm_open+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
ac_check_lib_save_LIBS=$LIBS
|
|
-LIBS="-lkvm -lfreebsd -lbsd $LIBS"
|
|
-cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
+LIBS="-lkvm $LIBS"
|
|
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
/* end confdefs.h. */
|
|
|
|
/* Override any GCC internal prototype to avoid an error.
|
|
@@ -12748,113 +12081,22 @@ return kvm_open ();
|
|
return 0;
|
|
}
|
|
_ACEOF
|
|
-rm -f conftest.$ac_objext conftest$ac_exeext
|
|
-if { (ac_try="$ac_link"
|
|
-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_link") 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_exeext &&
|
|
- $as_test_x conftest$ac_exeext; then
|
|
+if ac_fn_c_try_link "$LINENO"; then :
|
|
ac_cv_lib_kvm_kvm_open=yes
|
|
else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
- ac_cv_lib_kvm_kvm_open=no
|
|
+ ac_cv_lib_kvm_kvm_open=no
|
|
fi
|
|
-
|
|
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
- conftest$ac_exeext conftest.$ac_ext
|
|
+rm -f core conftest.err conftest.$ac_objext \
|
|
+ conftest$ac_exeext conftest.$ac_ext
|
|
LIBS=$ac_check_lib_save_LIBS
|
|
fi
|
|
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_kvm_kvm_open" >&5
|
|
-echo "${ECHO_T}$ac_cv_lib_kvm_kvm_open" >&6; }
|
|
-if test $ac_cv_lib_kvm_kvm_open = yes; then
|
|
- KVM_LIBS="-lkvm -lfreebsd -lbsd"
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_kvm_kvm_open" >&5
|
|
+$as_echo "$ac_cv_lib_kvm_kvm_open" >&6; }
|
|
+if test "x$ac_cv_lib_kvm_kvm_open" = x""yes; then :
|
|
+ KVM_LIBS=-lkvm
|
|
else
|
|
KVM_LIBS=
|
|
fi
|
|
-;;
|
|
- *)
|
|
- { echo "$as_me:$LINENO: checking for kvm_open in -lkvm" >&5
|
|
-echo $ECHO_N "checking for kvm_open in -lkvm... $ECHO_C" >&6; }
|
|
-if test "${ac_cv_lib_kvm_kvm_open+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
-else
|
|
- ac_check_lib_save_LIBS=$LIBS
|
|
-LIBS="-lkvm $LIBS"
|
|
-cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
-/* end confdefs.h. */
|
|
-
|
|
-/* Override any GCC internal prototype to avoid an error.
|
|
- Use char because int might match the return type of a GCC
|
|
- builtin and then its argument prototype would still apply. */
|
|
-#ifdef __cplusplus
|
|
-extern "C"
|
|
-#endif
|
|
-char kvm_open ();
|
|
-int
|
|
-main ()
|
|
-{
|
|
-return kvm_open ();
|
|
- ;
|
|
- return 0;
|
|
-}
|
|
-_ACEOF
|
|
-rm -f conftest.$ac_objext conftest$ac_exeext
|
|
-if { (ac_try="$ac_link"
|
|
-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_link") 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_exeext &&
|
|
- $as_test_x conftest$ac_exeext; then
|
|
- ac_cv_lib_kvm_kvm_open=yes
|
|
-else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
- ac_cv_lib_kvm_kvm_open=no
|
|
-fi
|
|
-
|
|
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
- conftest$ac_exeext conftest.$ac_ext
|
|
-LIBS=$ac_check_lib_save_LIBS
|
|
-fi
|
|
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_kvm_kvm_open" >&5
|
|
-echo "${ECHO_T}$ac_cv_lib_kvm_kvm_open" >&6; }
|
|
-if test $ac_cv_lib_kvm_kvm_open = yes; then
|
|
- KVM_LIBS=-lkvm
|
|
-else
|
|
- KVM_LIBS=
|
|
-fi
|
|
-;;
|
|
- esac
|
|
|
|
|
|
|
|
@@ -12872,158 +12114,21 @@ fi
|
|
|
|
|
|
|
|
-
|
|
-for ac_header in net/if_var.h
|
|
-do
|
|
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
|
|
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
|
|
- { echo "$as_me:$LINENO: checking for $ac_header" >&5
|
|
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
|
|
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
-fi
|
|
-ac_res=`eval echo '${'$as_ac_Header'}'`
|
|
- { echo "$as_me:$LINENO: result: $ac_res" >&5
|
|
-echo "${ECHO_T}$ac_res" >&6; }
|
|
-else
|
|
- # Is the header compilable?
|
|
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
|
|
-echo $ECHO_N "checking $ac_header usability... $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. */
|
|
-$ac_includes_default
|
|
-#include <$ac_header>
|
|
-_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
|
|
- ac_header_compiler=yes
|
|
-else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
- ac_header_compiler=no
|
|
-fi
|
|
-
|
|
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
|
|
-echo "${ECHO_T}$ac_header_compiler" >&6; }
|
|
-
|
|
-# Is the header present?
|
|
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
|
|
-echo $ECHO_N "checking $ac_header presence... $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. */
|
|
-#include <$ac_header>
|
|
-_ACEOF
|
|
-if { (ac_try="$ac_cpp conftest.$ac_ext"
|
|
-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_cpp conftest.$ac_ext") 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); } >/dev/null && {
|
|
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
|
|
- test ! -s conftest.err
|
|
- }; then
|
|
- ac_header_preproc=yes
|
|
-else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
- ac_header_preproc=no
|
|
-fi
|
|
-
|
|
-rm -f conftest.err conftest.$ac_ext
|
|
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
|
|
-echo "${ECHO_T}$ac_header_preproc" >&6; }
|
|
-
|
|
-# So? What about this header?
|
|
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
|
|
- yes:no: )
|
|
- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
|
|
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
|
|
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
|
|
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
|
|
- ac_header_preproc=yes
|
|
- ;;
|
|
- no:yes:* )
|
|
- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
|
|
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
|
|
- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
|
|
-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
|
|
- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
|
|
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
|
|
- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
|
|
-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
|
|
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
|
|
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
|
|
- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
|
|
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
|
|
- ( cat <<\_ASBOX
|
|
-## ---------------------------------------------------------------------- ##
|
|
-## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=libgtop ##
|
|
-## ---------------------------------------------------------------------- ##
|
|
-_ASBOX
|
|
- ) | sed "s/^/$as_me: WARNING: /" >&2
|
|
- ;;
|
|
-esac
|
|
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
|
|
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
|
|
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
-else
|
|
- eval "$as_ac_Header=\$ac_header_preproc"
|
|
-fi
|
|
-ac_res=`eval echo '${'$as_ac_Header'}'`
|
|
- { echo "$as_me:$LINENO: result: $ac_res" >&5
|
|
-echo "${ECHO_T}$ac_res" >&6; }
|
|
-
|
|
-fi
|
|
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
|
|
+ for ac_header in net/if_var.h
|
|
+do :
|
|
+ ac_fn_c_check_header_mongrel "$LINENO" "net/if_var.h" "ac_cv_header_net_if_var_h" "$ac_includes_default"
|
|
+if test "x$ac_cv_header_net_if_var_h" = x""yes; then :
|
|
cat >>confdefs.h <<_ACEOF
|
|
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
|
|
+#define HAVE_NET_IF_VAR_H 1
|
|
_ACEOF
|
|
|
|
fi
|
|
|
|
done
|
|
|
|
- { echo "$as_me:$LINENO: checking for I4B" >&5
|
|
-echo $ECHO_N "checking for I4B... $ECHO_C" >&6; }
|
|
- cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for I4B" >&5
|
|
+$as_echo_n "checking for I4B... " >&6; }
|
|
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
/* end confdefs.h. */
|
|
|
|
#include <sys/types.h>
|
|
@@ -13055,47 +12160,21 @@ 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
|
|
+if ac_fn_c_try_compile "$LINENO"; then :
|
|
have_i4b=yes
|
|
else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
- have_i4b=no
|
|
+ have_i4b=no
|
|
fi
|
|
-
|
|
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
- { echo "$as_me:$LINENO: result: $have_i4b" >&5
|
|
-echo "${ECHO_T}$have_i4b" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_i4b" >&5
|
|
+$as_echo "$have_i4b" >&6; }
|
|
if test x$have_i4b = xyes; then
|
|
|
|
-cat >>confdefs.h <<\_ACEOF
|
|
-#define HAVE_I4B 1
|
|
-_ACEOF
|
|
+$as_echo "#define HAVE_I4B 1" >>confdefs.h
|
|
|
|
- { echo "$as_me:$LINENO: checking for I4B accounting" >&5
|
|
-echo $ECHO_N "checking for I4B accounting... $ECHO_C" >&6; }
|
|
- cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for I4B accounting" >&5
|
|
+$as_echo_n "checking for I4B accounting... " >&6; }
|
|
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
/* end confdefs.h. */
|
|
|
|
#include <sys/types.h>
|
|
@@ -13129,60 +12208,39 @@ 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
|
|
+if ac_fn_c_try_compile "$LINENO"; then :
|
|
have_i4b_acct=yes
|
|
else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
- have_i4b_acct=no
|
|
+ have_i4b_acct=no
|
|
fi
|
|
-
|
|
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
- { echo "$as_me:$LINENO: result: $have_i4b_acct" >&5
|
|
-echo "${ECHO_T}$have_i4b_acct" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_i4b_acct" >&5
|
|
+$as_echo "$have_i4b_acct" >&6; }
|
|
if test x$have_i4b_acct = xyes ; then
|
|
|
|
-cat >>confdefs.h <<\_ACEOF
|
|
-#define HAVE_I4B_ACCT 1
|
|
-_ACEOF
|
|
+$as_echo "#define HAVE_I4B_ACCT 1" >>confdefs.h
|
|
|
|
else
|
|
- { echo "$as_me:$LINENO: WARNING:
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:
|
|
*** I4B accounting disabled - you won't get any PPP statistics.
|
|
*** Read \"misc/i4b_acct.txt\" in the LibGTop source directory
|
|
*** to see how to enable it." >&5
|
|
-echo "$as_me: WARNING:
|
|
+$as_echo "$as_me: WARNING:
|
|
*** I4B accounting disabled - you won't get any PPP statistics.
|
|
*** Read \"misc/i4b_acct.txt\" in the LibGTop source directory
|
|
*** to see how to enable it." >&2;}
|
|
fi
|
|
fi
|
|
|
|
- { echo "$as_me:$LINENO: checking what we need to define to get struct msginfo" >&5
|
|
-echo $ECHO_N "checking what we need to define to get struct msginfo... $ECHO_C" >&6; }
|
|
- if test "${msginfo_needs+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking what we need to define to get struct msginfo" >&5
|
|
+$as_echo_n "checking what we need to define to get struct msginfo... " >&6; }
|
|
+ if test "${msginfo_needs+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
msginfo_needs=
|
|
for def in nothing KERNEL _KERNEL; do
|
|
- cat >conftest.$ac_ext <<_ACEOF
|
|
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
+/* end confdefs.h. */
|
|
#define $def
|
|
#include <sys/types.h>
|
|
#include <sys/ipc.h>
|
|
@@ -13197,59 +12255,31 @@ main (void)
|
|
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
|
|
+if ac_fn_c_try_compile "$LINENO"; then :
|
|
|
|
msginfo_needs=$def
|
|
if test ${msginfo_needs} = KERNEL; then
|
|
|
|
-cat >>confdefs.h <<\_ACEOF
|
|
-#define STRUCT_MSGINFO_NEEDS_KERNEL 1
|
|
-_ACEOF
|
|
+$as_echo "#define STRUCT_MSGINFO_NEEDS_KERNEL 1" >>confdefs.h
|
|
|
|
elif test ${msginfo_needs} = _KERNEL; then
|
|
|
|
-cat >>confdefs.h <<\_ACEOF
|
|
-#define STRUCT_MSGINFO_NEEDS__KERNEL 1
|
|
-_ACEOF
|
|
+$as_echo "#define STRUCT_MSGINFO_NEEDS__KERNEL 1" >>confdefs.h
|
|
|
|
fi
|
|
|
|
|
|
-else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
-
|
|
fi
|
|
-
|
|
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
test -n "${msginfo_needs}" && break
|
|
done
|
|
|
|
fi
|
|
|
|
- { echo "$as_me:$LINENO: result: $msginfo_needs" >&5
|
|
-echo "${ECHO_T}$msginfo_needs" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $msginfo_needs" >&5
|
|
+$as_echo "$msginfo_needs" >&6; }
|
|
if test -z "${msginfo_needs}"; then
|
|
- { { echo "$as_me:$LINENO: error: Could not find the definition of 'struct msginfo'" >&5
|
|
-echo "$as_me: error: Could not find the definition of 'struct msginfo'" >&2;}
|
|
- { (exit 1); exit 1; }; }
|
|
+ as_fn_error "Could not find the definition of 'struct msginfo'" "$LINENO" 5
|
|
fi
|
|
;;
|
|
linux*)
|
|
@@ -13261,145 +12291,12 @@ echo "$as_me: error: Could not find the
|
|
sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
|
|
os_version_expr="$os_major_version 65536 * $os_minor_version 256 * + $os_micro_version + p q"
|
|
|
|
-
|
|
-for ac_header in linux/version.h
|
|
-do
|
|
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
|
|
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
|
|
- { echo "$as_me:$LINENO: checking for $ac_header" >&5
|
|
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
|
|
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
-fi
|
|
-ac_res=`eval echo '${'$as_ac_Header'}'`
|
|
- { echo "$as_me:$LINENO: result: $ac_res" >&5
|
|
-echo "${ECHO_T}$ac_res" >&6; }
|
|
-else
|
|
- # Is the header compilable?
|
|
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
|
|
-echo $ECHO_N "checking $ac_header usability... $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. */
|
|
-$ac_includes_default
|
|
-#include <$ac_header>
|
|
-_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
|
|
- ac_header_compiler=yes
|
|
-else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
- ac_header_compiler=no
|
|
-fi
|
|
-
|
|
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
|
|
-echo "${ECHO_T}$ac_header_compiler" >&6; }
|
|
-
|
|
-# Is the header present?
|
|
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
|
|
-echo $ECHO_N "checking $ac_header presence... $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. */
|
|
-#include <$ac_header>
|
|
-_ACEOF
|
|
-if { (ac_try="$ac_cpp conftest.$ac_ext"
|
|
-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_cpp conftest.$ac_ext") 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); } >/dev/null && {
|
|
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
|
|
- test ! -s conftest.err
|
|
- }; then
|
|
- ac_header_preproc=yes
|
|
-else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
- ac_header_preproc=no
|
|
-fi
|
|
-
|
|
-rm -f conftest.err conftest.$ac_ext
|
|
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
|
|
-echo "${ECHO_T}$ac_header_preproc" >&6; }
|
|
-
|
|
-# So? What about this header?
|
|
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
|
|
- yes:no: )
|
|
- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
|
|
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
|
|
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
|
|
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
|
|
- ac_header_preproc=yes
|
|
- ;;
|
|
- no:yes:* )
|
|
- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
|
|
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
|
|
- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
|
|
-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
|
|
- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
|
|
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
|
|
- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
|
|
-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
|
|
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
|
|
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
|
|
- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
|
|
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
|
|
- ( cat <<\_ASBOX
|
|
-## ---------------------------------------------------------------------- ##
|
|
-## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=libgtop ##
|
|
-## ---------------------------------------------------------------------- ##
|
|
-_ASBOX
|
|
- ) | sed "s/^/$as_me: WARNING: /" >&2
|
|
- ;;
|
|
-esac
|
|
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
|
|
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
|
|
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
-else
|
|
- eval "$as_ac_Header=\$ac_header_preproc"
|
|
-fi
|
|
-ac_res=`eval echo '${'$as_ac_Header'}'`
|
|
- { echo "$as_me:$LINENO: result: $ac_res" >&5
|
|
-echo "${ECHO_T}$ac_res" >&6; }
|
|
-
|
|
-fi
|
|
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
|
|
+ for ac_header in linux/version.h
|
|
+do :
|
|
+ ac_fn_c_check_header_mongrel "$LINENO" "linux/version.h" "ac_cv_header_linux_version_h" "$ac_includes_default"
|
|
+if test "x$ac_cv_header_linux_version_h" = x""yes; then :
|
|
cat >>confdefs.h <<_ACEOF
|
|
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
|
|
+#define HAVE_LINUX_VERSION_H 1
|
|
_ACEOF
|
|
have_linux_version_h=yes
|
|
else
|
|
@@ -13418,15 +12315,15 @@ done
|
|
os_version_code=`echo "$os_version_expr" | dc`
|
|
fi
|
|
|
|
- { echo "$as_me:$LINENO: checking for Linux kernel version code" >&5
|
|
-echo $ECHO_N "checking for Linux kernel version code... $ECHO_C" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Linux kernel version code" >&5
|
|
+$as_echo_n "checking for Linux kernel version code... " >&6; }
|
|
|
|
cat >>confdefs.h <<_ACEOF
|
|
#define GLIBTOP_LINUX_VERSION_CODE $os_version_code
|
|
_ACEOF
|
|
|
|
- { echo "$as_me:$LINENO: result: $os_version_code" >&5
|
|
-echo "${ECHO_T}$os_version_code" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $os_version_code" >&5
|
|
+$as_echo "$os_version_code" >&6; }
|
|
;;
|
|
solaris*)
|
|
os_major_version=`uname -r | sed 's/\([0-9]*\).\([0-9]*\)\.*\([0-9]*\)/\1/'`
|
|
@@ -13436,41 +12333,37 @@ echo "${ECHO_T}$os_version_code" >&6; }
|
|
os_version_expr="$os_major_version 10000 * $os_minor_version 100 * + $os_micro_version + p q"
|
|
os_version_code=`echo "$os_version_expr" | dc`
|
|
|
|
- { echo "$as_me:$LINENO: checking for Solaris release code" >&5
|
|
-echo $ECHO_N "checking for Solaris release code... $ECHO_C" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Solaris release code" >&5
|
|
+$as_echo_n "checking for Solaris release code... " >&6; }
|
|
|
|
cat >>confdefs.h <<_ACEOF
|
|
#define GLIBTOP_SOLARIS_RELEASE $os_version_code
|
|
_ACEOF
|
|
|
|
- { echo "$as_me:$LINENO: result: $os_version_code" >&5
|
|
-echo "${ECHO_T}$os_version_code" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $os_version_code" >&5
|
|
+$as_echo "$os_version_code" >&6; }
|
|
;;
|
|
esac
|
|
|
|
- { echo "$as_me:$LINENO: checking for machine.h in libgtop sysdeps dir" >&5
|
|
-echo $ECHO_N "checking for machine.h in libgtop sysdeps dir... $ECHO_C" >&6; }
|
|
- { echo "$as_me:$LINENO: result: $libgtop_use_machine_h" >&5
|
|
-echo "${ECHO_T}$libgtop_use_machine_h" >&6; }
|
|
-
|
|
- { echo "$as_me:$LINENO: checking whether we need libgtop" >&5
|
|
-echo $ECHO_N "checking whether we need libgtop... $ECHO_C" >&6; }
|
|
- { echo "$as_me:$LINENO: result: $libgtop_need_server" >&5
|
|
-echo "${ECHO_T}$libgtop_need_server" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for machine.h in libgtop sysdeps dir" >&5
|
|
+$as_echo_n "checking for machine.h in libgtop sysdeps dir... " >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $libgtop_use_machine_h" >&5
|
|
+$as_echo "$libgtop_use_machine_h" >&6; }
|
|
+
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we need libgtop" >&5
|
|
+$as_echo_n "checking whether we need libgtop... " >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $libgtop_need_server" >&5
|
|
+$as_echo "$libgtop_need_server" >&6; }
|
|
|
|
if test x$libgtop_need_server = xyes ; then
|
|
|
|
-cat >>confdefs.h <<\_ACEOF
|
|
-#define NEED_LIBGTOP 1
|
|
-_ACEOF
|
|
+$as_echo "#define NEED_LIBGTOP 1" >>confdefs.h
|
|
|
|
fi
|
|
|
|
if test x$libgtop_use_machine_h = xyes ; then
|
|
|
|
-cat >>confdefs.h <<\_ACEOF
|
|
-#define HAVE_GLIBTOP_MACHINE_H 1
|
|
-_ACEOF
|
|
+$as_echo "#define HAVE_GLIBTOP_MACHINE_H 1" >>confdefs.h
|
|
|
|
fi
|
|
|
|
@@ -13500,154 +12393,21 @@ fi
|
|
|
|
|
|
|
|
-
|
|
-for ac_header in sys/bitypes.h
|
|
-do
|
|
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
|
|
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
|
|
- { echo "$as_me:$LINENO: checking for $ac_header" >&5
|
|
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
|
|
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
-fi
|
|
-ac_res=`eval echo '${'$as_ac_Header'}'`
|
|
- { echo "$as_me:$LINENO: result: $ac_res" >&5
|
|
-echo "${ECHO_T}$ac_res" >&6; }
|
|
-else
|
|
- # Is the header compilable?
|
|
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
|
|
-echo $ECHO_N "checking $ac_header usability... $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. */
|
|
-$ac_includes_default
|
|
-#include <$ac_header>
|
|
+ for ac_header in sys/bitypes.h
|
|
+do :
|
|
+ ac_fn_c_check_header_mongrel "$LINENO" "sys/bitypes.h" "ac_cv_header_sys_bitypes_h" "$ac_includes_default"
|
|
+if test "x$ac_cv_header_sys_bitypes_h" = x""yes; then :
|
|
+ cat >>confdefs.h <<_ACEOF
|
|
+#define HAVE_SYS_BITYPES_H 1
|
|
_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
|
|
- ac_header_compiler=yes
|
|
-else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
|
|
- ac_header_compiler=no
|
|
fi
|
|
|
|
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
|
|
-echo "${ECHO_T}$ac_header_compiler" >&6; }
|
|
+done
|
|
|
|
-# Is the header present?
|
|
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
|
|
-echo $ECHO_N "checking $ac_header presence... $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. */
|
|
-#include <$ac_header>
|
|
-_ACEOF
|
|
-if { (ac_try="$ac_cpp conftest.$ac_ext"
|
|
-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_cpp conftest.$ac_ext") 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); } >/dev/null && {
|
|
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
|
|
- test ! -s conftest.err
|
|
- }; then
|
|
- ac_header_preproc=yes
|
|
-else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
|
|
- ac_header_preproc=no
|
|
-fi
|
|
|
|
-rm -f conftest.err conftest.$ac_ext
|
|
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
|
|
-echo "${ECHO_T}$ac_header_preproc" >&6; }
|
|
-
|
|
-# So? What about this header?
|
|
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
|
|
- yes:no: )
|
|
- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
|
|
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
|
|
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
|
|
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
|
|
- ac_header_preproc=yes
|
|
- ;;
|
|
- no:yes:* )
|
|
- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
|
|
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
|
|
- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
|
|
-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
|
|
- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
|
|
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
|
|
- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
|
|
-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
|
|
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
|
|
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
|
|
- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
|
|
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
|
|
- ( cat <<\_ASBOX
|
|
-## ---------------------------------------------------------------------- ##
|
|
-## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=libgtop ##
|
|
-## ---------------------------------------------------------------------- ##
|
|
-_ASBOX
|
|
- ) | sed "s/^/$as_me: WARNING: /" >&2
|
|
- ;;
|
|
-esac
|
|
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
|
|
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
|
|
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
-else
|
|
- eval "$as_ac_Header=\$ac_header_preproc"
|
|
-fi
|
|
-ac_res=`eval echo '${'$as_ac_Header'}'`
|
|
- { echo "$as_me:$LINENO: result: $ac_res" >&5
|
|
-echo "${ECHO_T}$ac_res" >&6; }
|
|
-
|
|
-fi
|
|
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
|
|
- cat >>confdefs.h <<_ACEOF
|
|
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
|
|
-_ACEOF
|
|
-
|
|
-fi
|
|
-
|
|
-done
|
|
-
|
|
-
|
|
-
|
|
-GLIB_REQUIRED=2.6.0
|
|
+GLIB_REQUIRED=2.6.0
|
|
|
|
|
|
|
|
@@ -13655,10 +12415,10 @@ if test "x$ac_cv_env_PKG_CONFIG_set" !=
|
|
if test -n "$ac_tool_prefix"; then
|
|
# Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
|
|
set dummy ${ac_tool_prefix}pkg-config; 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_PKG_CONFIG+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
|
+$as_echo_n "checking for $ac_word... " >&6; }
|
|
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
case $PKG_CONFIG in
|
|
[\\/]* | ?:[\\/]*)
|
|
@@ -13670,14 +12430,14 @@ 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
|
|
+ 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_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
|
|
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
break 2
|
|
fi
|
|
done
|
|
-done
|
|
+ done
|
|
IFS=$as_save_IFS
|
|
|
|
;;
|
|
@@ -13685,11 +12445,11 @@ esac
|
|
fi
|
|
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
|
|
if test -n "$PKG_CONFIG"; then
|
|
- { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
|
|
-echo "${ECHO_T}$PKG_CONFIG" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
|
|
+$as_echo "$PKG_CONFIG" >&6; }
|
|
else
|
|
- { echo "$as_me:$LINENO: result: no" >&5
|
|
-echo "${ECHO_T}no" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
+$as_echo "no" >&6; }
|
|
fi
|
|
|
|
|
|
@@ -13698,10 +12458,10 @@ if test -z "$ac_cv_path_PKG_CONFIG"; the
|
|
ac_pt_PKG_CONFIG=$PKG_CONFIG
|
|
# Extract the first word of "pkg-config", so it can be a program name with args.
|
|
set dummy pkg-config; 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_ac_pt_PKG_CONFIG+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
|
+$as_echo_n "checking for $ac_word... " >&6; }
|
|
+if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
case $ac_pt_PKG_CONFIG in
|
|
[\\/]* | ?:[\\/]*)
|
|
@@ -13713,14 +12473,14 @@ 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
|
|
+ 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_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
|
|
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
break 2
|
|
fi
|
|
done
|
|
-done
|
|
+ done
|
|
IFS=$as_save_IFS
|
|
|
|
;;
|
|
@@ -13728,11 +12488,11 @@ esac
|
|
fi
|
|
ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
|
|
if test -n "$ac_pt_PKG_CONFIG"; then
|
|
- { echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
|
|
-echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
|
|
+$as_echo "$ac_pt_PKG_CONFIG" >&6; }
|
|
else
|
|
- { echo "$as_me:$LINENO: result: no" >&5
|
|
-echo "${ECHO_T}no" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
+$as_echo "no" >&6; }
|
|
fi
|
|
|
|
if test "x$ac_pt_PKG_CONFIG" = x; then
|
|
@@ -13740,12 +12500,8 @@ fi
|
|
else
|
|
case $cross_compiling:$ac_tool_warned in
|
|
yes:)
|
|
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
|
|
-whose name does not start with the host triplet. If you think this
|
|
-configuration is useful to you, please write to autoconf@gnu.org." >&5
|
|
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
|
|
-whose name does not start with the host triplet. If you think this
|
|
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
|
|
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
|
|
ac_tool_warned=yes ;;
|
|
esac
|
|
PKG_CONFIG=$ac_pt_PKG_CONFIG
|
|
@@ -13757,33 +12513,33 @@ fi
|
|
fi
|
|
if test -n "$PKG_CONFIG"; then
|
|
_pkg_min_version=0.9.0
|
|
- { echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
|
|
-echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
|
|
+$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
|
|
if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
|
|
- { echo "$as_me:$LINENO: result: yes" >&5
|
|
-echo "${ECHO_T}yes" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
|
+$as_echo "yes" >&6; }
|
|
else
|
|
- { echo "$as_me:$LINENO: result: no" >&5
|
|
-echo "${ECHO_T}no" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
+$as_echo "no" >&6; }
|
|
PKG_CONFIG=""
|
|
fi
|
|
|
|
fi
|
|
|
|
pkg_failed=no
|
|
-{ echo "$as_me:$LINENO: checking for GLIB" >&5
|
|
-echo $ECHO_N "checking for GLIB... $ECHO_C" >&6; }
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GLIB" >&5
|
|
+$as_echo_n "checking for GLIB... " >&6; }
|
|
|
|
if test -n "$PKG_CONFIG"; then
|
|
if test -n "$GLIB_CFLAGS"; then
|
|
pkg_cv_GLIB_CFLAGS="$GLIB_CFLAGS"
|
|
else
|
|
if test -n "$PKG_CONFIG" && \
|
|
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED\"") >&5
|
|
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED\""; } >&5
|
|
($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQUIRED") 2>&5
|
|
ac_status=$?
|
|
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
- (exit $ac_status); }; then
|
|
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
|
+ test $ac_status = 0; }; then
|
|
pkg_cv_GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= $GLIB_REQUIRED" 2>/dev/null`
|
|
else
|
|
pkg_failed=yes
|
|
@@ -13797,11 +12553,11 @@ if test -n "$PKG_CONFIG"; then
|
|
pkg_cv_GLIB_LIBS="$GLIB_LIBS"
|
|
else
|
|
if test -n "$PKG_CONFIG" && \
|
|
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED\"") >&5
|
|
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED\""; } >&5
|
|
($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQUIRED") 2>&5
|
|
ac_status=$?
|
|
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
- (exit $ac_status); }; then
|
|
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
|
+ test $ac_status = 0; }; then
|
|
pkg_cv_GLIB_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= $GLIB_REQUIRED" 2>/dev/null`
|
|
else
|
|
pkg_failed=yes
|
|
@@ -13828,18 +12584,7 @@ fi
|
|
# Put the nasty error message in config.log where it belongs
|
|
echo "$GLIB_PKG_ERRORS" >&5
|
|
|
|
- { { echo "$as_me:$LINENO: error: Package requirements (glib-2.0 >= $GLIB_REQUIRED) were not met:
|
|
-
|
|
-$GLIB_PKG_ERRORS
|
|
-
|
|
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
|
|
-installed software in a non-standard prefix.
|
|
-
|
|
-Alternatively, you may set the environment variables GLIB_CFLAGS
|
|
-and GLIB_LIBS to avoid the need to call pkg-config.
|
|
-See the pkg-config man page for more details.
|
|
-" >&5
|
|
-echo "$as_me: error: Package requirements (glib-2.0 >= $GLIB_REQUIRED) were not met:
|
|
+ as_fn_error "Package requirements (glib-2.0 >= $GLIB_REQUIRED) were not met:
|
|
|
|
$GLIB_PKG_ERRORS
|
|
|
|
@@ -13849,20 +12594,11 @@ installed software in a non-standard pre
|
|
Alternatively, you may set the environment variables GLIB_CFLAGS
|
|
and GLIB_LIBS to avoid the need to call pkg-config.
|
|
See the pkg-config man page for more details.
|
|
-" >&2;}
|
|
- { (exit 1); exit 1; }; }
|
|
+" "$LINENO" 5
|
|
elif test $pkg_failed = untried; then
|
|
- { { echo "$as_me:$LINENO: 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
|
|
-path to pkg-config.
|
|
-
|
|
-Alternatively, you may set the environment variables GLIB_CFLAGS
|
|
-and GLIB_LIBS to avoid the need to call pkg-config.
|
|
-See the pkg-config man page for more details.
|
|
-
|
|
-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
|
|
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
|
|
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
|
|
+as_fn_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
|
|
path to pkg-config.
|
|
|
|
@@ -13871,149 +12607,19 @@ and GLIB_LIBS to avoid the need to call
|
|
See the pkg-config man page for more details.
|
|
|
|
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
|
|
-See \`config.log' for more details." >&2;}
|
|
- { (exit 1); exit 1; }; }
|
|
+See \`config.log' for more details." "$LINENO" 5; }
|
|
else
|
|
GLIB_CFLAGS=$pkg_cv_GLIB_CFLAGS
|
|
GLIB_LIBS=$pkg_cv_GLIB_LIBS
|
|
- { echo "$as_me:$LINENO: result: yes" >&5
|
|
-echo "${ECHO_T}yes" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
|
+$as_echo "yes" >&6; }
|
|
:
|
|
fi
|
|
|
|
|
|
|
|
-if test "${ac_cv_header_ifaddrs_h+set}" = set; then
|
|
- { echo "$as_me:$LINENO: checking for ifaddrs.h" >&5
|
|
-echo $ECHO_N "checking for ifaddrs.h... $ECHO_C" >&6; }
|
|
-if test "${ac_cv_header_ifaddrs_h+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
-fi
|
|
-{ echo "$as_me:$LINENO: result: $ac_cv_header_ifaddrs_h" >&5
|
|
-echo "${ECHO_T}$ac_cv_header_ifaddrs_h" >&6; }
|
|
-else
|
|
- # Is the header compilable?
|
|
-{ echo "$as_me:$LINENO: checking ifaddrs.h usability" >&5
|
|
-echo $ECHO_N "checking ifaddrs.h usability... $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. */
|
|
-$ac_includes_default
|
|
-#include <ifaddrs.h>
|
|
-_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
|
|
- ac_header_compiler=yes
|
|
-else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
- ac_header_compiler=no
|
|
-fi
|
|
-
|
|
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
|
|
-echo "${ECHO_T}$ac_header_compiler" >&6; }
|
|
-
|
|
-# Is the header present?
|
|
-{ echo "$as_me:$LINENO: checking ifaddrs.h presence" >&5
|
|
-echo $ECHO_N "checking ifaddrs.h presence... $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. */
|
|
-#include <ifaddrs.h>
|
|
-_ACEOF
|
|
-if { (ac_try="$ac_cpp conftest.$ac_ext"
|
|
-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_cpp conftest.$ac_ext") 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); } >/dev/null && {
|
|
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
|
|
- test ! -s conftest.err
|
|
- }; then
|
|
- ac_header_preproc=yes
|
|
-else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
- ac_header_preproc=no
|
|
-fi
|
|
-
|
|
-rm -f conftest.err conftest.$ac_ext
|
|
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
|
|
-echo "${ECHO_T}$ac_header_preproc" >&6; }
|
|
-
|
|
-# So? What about this header?
|
|
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
|
|
- yes:no: )
|
|
- { echo "$as_me:$LINENO: WARNING: ifaddrs.h: accepted by the compiler, rejected by the preprocessor!" >&5
|
|
-echo "$as_me: WARNING: ifaddrs.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
|
|
- { echo "$as_me:$LINENO: WARNING: ifaddrs.h: proceeding with the compiler's result" >&5
|
|
-echo "$as_me: WARNING: ifaddrs.h: proceeding with the compiler's result" >&2;}
|
|
- ac_header_preproc=yes
|
|
- ;;
|
|
- no:yes:* )
|
|
- { echo "$as_me:$LINENO: WARNING: ifaddrs.h: present but cannot be compiled" >&5
|
|
-echo "$as_me: WARNING: ifaddrs.h: present but cannot be compiled" >&2;}
|
|
- { echo "$as_me:$LINENO: WARNING: ifaddrs.h: check for missing prerequisite headers?" >&5
|
|
-echo "$as_me: WARNING: ifaddrs.h: check for missing prerequisite headers?" >&2;}
|
|
- { echo "$as_me:$LINENO: WARNING: ifaddrs.h: see the Autoconf documentation" >&5
|
|
-echo "$as_me: WARNING: ifaddrs.h: see the Autoconf documentation" >&2;}
|
|
- { echo "$as_me:$LINENO: WARNING: ifaddrs.h: section \"Present But Cannot Be Compiled\"" >&5
|
|
-echo "$as_me: WARNING: ifaddrs.h: section \"Present But Cannot Be Compiled\"" >&2;}
|
|
- { echo "$as_me:$LINENO: WARNING: ifaddrs.h: proceeding with the preprocessor's result" >&5
|
|
-echo "$as_me: WARNING: ifaddrs.h: proceeding with the preprocessor's result" >&2;}
|
|
- { echo "$as_me:$LINENO: WARNING: ifaddrs.h: in the future, the compiler will take precedence" >&5
|
|
-echo "$as_me: WARNING: ifaddrs.h: in the future, the compiler will take precedence" >&2;}
|
|
- ( cat <<\_ASBOX
|
|
-## ---------------------------------------------------------------------- ##
|
|
-## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=libgtop ##
|
|
-## ---------------------------------------------------------------------- ##
|
|
-_ASBOX
|
|
- ) | sed "s/^/$as_me: WARNING: /" >&2
|
|
- ;;
|
|
-esac
|
|
-{ echo "$as_me:$LINENO: checking for ifaddrs.h" >&5
|
|
-echo $ECHO_N "checking for ifaddrs.h... $ECHO_C" >&6; }
|
|
-if test "${ac_cv_header_ifaddrs_h+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
-else
|
|
- ac_cv_header_ifaddrs_h=$ac_header_preproc
|
|
-fi
|
|
-{ echo "$as_me:$LINENO: result: $ac_cv_header_ifaddrs_h" >&5
|
|
-echo "${ECHO_T}$ac_cv_header_ifaddrs_h" >&6; }
|
|
-
|
|
-fi
|
|
-if test $ac_cv_header_ifaddrs_h = yes; then
|
|
+ac_fn_c_check_header_mongrel "$LINENO" "ifaddrs.h" "ac_cv_header_ifaddrs_h" "$ac_includes_default"
|
|
+if test "x$ac_cv_header_ifaddrs_h" = x""yes; then :
|
|
HAVE_IFADDRS_H=yes
|
|
else
|
|
HAVE_IFADDRS_H=no
|
|
@@ -14022,22 +12628,16 @@ fi
|
|
|
|
if test x$HAVE_IFADDRS_H = xyes ; then
|
|
|
|
-cat >>confdefs.h <<\_ACEOF
|
|
-#define HAVE_IFADDRS_H 1
|
|
-_ACEOF
|
|
+$as_echo "#define HAVE_IFADDRS_H 1" >>confdefs.h
|
|
|
|
fi
|
|
|
|
-{ echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
|
|
-echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6; }
|
|
-if test "${ac_cv_c_const+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5
|
|
+$as_echo_n "checking for an ANSI C-conforming const... " >&6; }
|
|
+if test "${ac_cv_c_const+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
- cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
/* end confdefs.h. */
|
|
|
|
int
|
|
@@ -14097,55 +12697,29 @@ 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
|
|
+if ac_fn_c_try_compile "$LINENO"; then :
|
|
ac_cv_c_const=yes
|
|
else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
- ac_cv_c_const=no
|
|
+ ac_cv_c_const=no
|
|
fi
|
|
-
|
|
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
fi
|
|
-{ echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
|
|
-echo "${ECHO_T}$ac_cv_c_const" >&6; }
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" >&5
|
|
+$as_echo "$ac_cv_c_const" >&6; }
|
|
if test $ac_cv_c_const = no; then
|
|
|
|
-cat >>confdefs.h <<\_ACEOF
|
|
-#define const
|
|
-_ACEOF
|
|
+$as_echo "#define const /**/" >>confdefs.h
|
|
|
|
fi
|
|
|
|
-{ echo "$as_me:$LINENO: checking for inline" >&5
|
|
-echo $ECHO_N "checking for inline... $ECHO_C" >&6; }
|
|
-if test "${ac_cv_c_inline+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5
|
|
+$as_echo_n "checking for inline... " >&6; }
|
|
+if test "${ac_cv_c_inline+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
ac_cv_c_inline=no
|
|
for ac_kw in inline __inline__ __inline; do
|
|
- cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
/* end confdefs.h. */
|
|
#ifndef __cplusplus
|
|
typedef int foo_t;
|
|
@@ -14154,39 +12728,16 @@ $ac_kw foo_t foo () {return 0; }
|
|
#endif
|
|
|
|
_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
|
|
+if ac_fn_c_try_compile "$LINENO"; then :
|
|
ac_cv_c_inline=$ac_kw
|
|
-else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
-
|
|
fi
|
|
-
|
|
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
test "$ac_cv_c_inline" != no && break
|
|
done
|
|
|
|
fi
|
|
-{ echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
|
|
-echo "${ECHO_T}$ac_cv_c_inline" >&6; }
|
|
-
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5
|
|
+$as_echo "$ac_cv_c_inline" >&6; }
|
|
|
|
case $ac_cv_c_inline in
|
|
inline | yes) ;;
|
|
@@ -14203,848 +12754,570 @@ _ACEOF
|
|
;;
|
|
esac
|
|
|
|
-{ echo "$as_me:$LINENO: checking for off_t" >&5
|
|
-echo $ECHO_N "checking for off_t... $ECHO_C" >&6; }
|
|
-if test "${ac_cv_type_off_t+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+ac_fn_c_check_type "$LINENO" "off_t" "ac_cv_type_off_t" "$ac_includes_default"
|
|
+if test "x$ac_cv_type_off_t" = x""yes; then :
|
|
+
|
|
else
|
|
- cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
-/* end confdefs.h. */
|
|
-$ac_includes_default
|
|
-typedef off_t ac__type_new_;
|
|
-int
|
|
-main ()
|
|
-{
|
|
-if ((ac__type_new_ *) 0)
|
|
- return 0;
|
|
-if (sizeof (ac__type_new_))
|
|
- return 0;
|
|
- ;
|
|
- return 0;
|
|
-}
|
|
+
|
|
+cat >>confdefs.h <<_ACEOF
|
|
+#define off_t long int
|
|
_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
|
|
- ac_cv_type_off_t=yes
|
|
-else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
|
|
- ac_cv_type_off_t=no
|
|
fi
|
|
|
|
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
-fi
|
|
-{ echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5
|
|
-echo "${ECHO_T}$ac_cv_type_off_t" >&6; }
|
|
-if test $ac_cv_type_off_t = yes; then
|
|
- :
|
|
+ac_fn_c_check_type "$LINENO" "pid_t" "ac_cv_type_pid_t" "$ac_includes_default"
|
|
+if test "x$ac_cv_type_pid_t" = x""yes; then :
|
|
+
|
|
else
|
|
|
|
cat >>confdefs.h <<_ACEOF
|
|
-#define off_t long int
|
|
+#define pid_t int
|
|
_ACEOF
|
|
|
|
fi
|
|
|
|
-{ echo "$as_me:$LINENO: checking for pid_t" >&5
|
|
-echo $ECHO_N "checking for pid_t... $ECHO_C" >&6; }
|
|
-if test "${ac_cv_type_pid_t+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
|
|
+if test "x$ac_cv_type_size_t" = x""yes; then :
|
|
+
|
|
else
|
|
- cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
-/* end confdefs.h. */
|
|
-$ac_includes_default
|
|
-typedef pid_t ac__type_new_;
|
|
-int
|
|
-main ()
|
|
-{
|
|
-if ((ac__type_new_ *) 0)
|
|
- return 0;
|
|
-if (sizeof (ac__type_new_))
|
|
- return 0;
|
|
- ;
|
|
- return 0;
|
|
-}
|
|
+
|
|
+cat >>confdefs.h <<_ACEOF
|
|
+#define size_t unsigned int
|
|
_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
|
|
- ac_cv_type_pid_t=yes
|
|
-else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
|
|
- ac_cv_type_pid_t=no
|
|
fi
|
|
|
|
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
-fi
|
|
-{ echo "$as_me:$LINENO: result: $ac_cv_type_pid_t" >&5
|
|
-echo "${ECHO_T}$ac_cv_type_pid_t" >&6; }
|
|
-if test $ac_cv_type_pid_t = yes; then
|
|
- :
|
|
-else
|
|
+ac_fn_c_check_member "$LINENO" "struct stat" "st_rdev" "ac_cv_member_struct_stat_st_rdev" "$ac_includes_default"
|
|
+if test "x$ac_cv_member_struct_stat_st_rdev" = x""yes; then :
|
|
|
|
cat >>confdefs.h <<_ACEOF
|
|
-#define pid_t int
|
|
+#define HAVE_STRUCT_STAT_ST_RDEV 1
|
|
_ACEOF
|
|
|
|
+
|
|
+$as_echo "#define HAVE_ST_RDEV 1" >>confdefs.h
|
|
+
|
|
fi
|
|
|
|
-{ echo "$as_me:$LINENO: checking for size_t" >&5
|
|
-echo $ECHO_N "checking for size_t... $ECHO_C" >&6; }
|
|
-if test "${ac_cv_type_size_t+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether time.h and sys/time.h may both be included" >&5
|
|
+$as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; }
|
|
+if test "${ac_cv_header_time+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
- cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
/* end confdefs.h. */
|
|
-$ac_includes_default
|
|
-typedef size_t ac__type_new_;
|
|
+#include <sys/types.h>
|
|
+#include <sys/time.h>
|
|
+#include <time.h>
|
|
+
|
|
int
|
|
main ()
|
|
{
|
|
-if ((ac__type_new_ *) 0)
|
|
- return 0;
|
|
-if (sizeof (ac__type_new_))
|
|
- return 0;
|
|
+if ((struct tm *) 0)
|
|
+return 0;
|
|
;
|
|
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
|
|
- ac_cv_type_size_t=yes
|
|
+if ac_fn_c_try_compile "$LINENO"; then :
|
|
+ ac_cv_header_time=yes
|
|
else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
- ac_cv_type_size_t=no
|
|
+ ac_cv_header_time=no
|
|
fi
|
|
-
|
|
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
fi
|
|
-{ echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
|
|
-echo "${ECHO_T}$ac_cv_type_size_t" >&6; }
|
|
-if test $ac_cv_type_size_t = yes; then
|
|
- :
|
|
-else
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_time" >&5
|
|
+$as_echo "$ac_cv_header_time" >&6; }
|
|
+if test $ac_cv_header_time = yes; then
|
|
|
|
-cat >>confdefs.h <<_ACEOF
|
|
-#define size_t unsigned int
|
|
-_ACEOF
|
|
+$as_echo "#define TIME_WITH_SYS_TIME 1" >>confdefs.h
|
|
|
|
fi
|
|
|
|
-{ echo "$as_me:$LINENO: checking for struct stat.st_rdev" >&5
|
|
-echo $ECHO_N "checking for struct stat.st_rdev... $ECHO_C" >&6; }
|
|
-if test "${ac_cv_member_struct_stat_st_rdev+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether struct tm is in sys/time.h or time.h" >&5
|
|
+$as_echo_n "checking whether struct tm is in sys/time.h or time.h... " >&6; }
|
|
+if test "${ac_cv_struct_tm+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
- cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
/* end confdefs.h. */
|
|
-$ac_includes_default
|
|
+#include <sys/types.h>
|
|
+#include <time.h>
|
|
+
|
|
int
|
|
main ()
|
|
{
|
|
-static struct stat ac_aggr;
|
|
-if (ac_aggr.st_rdev)
|
|
-return 0;
|
|
+struct tm tm;
|
|
+ int *p = &tm.tm_sec;
|
|
+ return !p;
|
|
;
|
|
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
|
|
- ac_cv_member_struct_stat_st_rdev=yes
|
|
+if ac_fn_c_try_compile "$LINENO"; then :
|
|
+ ac_cv_struct_tm=time.h
|
|
else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
+ ac_cv_struct_tm=sys/time.h
|
|
+fi
|
|
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
+fi
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_struct_tm" >&5
|
|
+$as_echo "$ac_cv_struct_tm" >&6; }
|
|
+if test $ac_cv_struct_tm = sys/time.h; then
|
|
|
|
- cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
+$as_echo "#define TM_IN_SYS_TIME 1" >>confdefs.h
|
|
+
|
|
+fi
|
|
+
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for uid_t in sys/types.h" >&5
|
|
+$as_echo_n "checking for uid_t in sys/types.h... " >&6; }
|
|
+if test "${ac_cv_type_uid_t+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
+else
|
|
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
/* end confdefs.h. */
|
|
-$ac_includes_default
|
|
-int
|
|
-main ()
|
|
-{
|
|
-static struct stat ac_aggr;
|
|
-if (sizeof ac_aggr.st_rdev)
|
|
-return 0;
|
|
- ;
|
|
- return 0;
|
|
-}
|
|
+#include <sys/types.h>
|
|
+
|
|
_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
|
|
- ac_cv_member_struct_stat_st_rdev=yes
|
|
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
|
|
+ $EGREP "uid_t" >/dev/null 2>&1; then :
|
|
+ ac_cv_type_uid_t=yes
|
|
else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
- ac_cv_member_struct_stat_st_rdev=no
|
|
+ ac_cv_type_uid_t=no
|
|
fi
|
|
+rm -f conftest*
|
|
|
|
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
fi
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_uid_t" >&5
|
|
+$as_echo "$ac_cv_type_uid_t" >&6; }
|
|
+if test $ac_cv_type_uid_t = no; then
|
|
+
|
|
+$as_echo "#define uid_t int" >>confdefs.h
|
|
+
|
|
+
|
|
+$as_echo "#define gid_t int" >>confdefs.h
|
|
|
|
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
fi
|
|
-{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_rdev" >&5
|
|
-echo "${ECHO_T}$ac_cv_member_struct_stat_st_rdev" >&6; }
|
|
-if test $ac_cv_member_struct_stat_st_rdev = yes; then
|
|
+
|
|
+
|
|
+ac_fn_c_check_type "$LINENO" "ssize_t" "ac_cv_type_ssize_t" "$ac_includes_default"
|
|
+if test "x$ac_cv_type_ssize_t" = x""yes; then :
|
|
+
|
|
+else
|
|
|
|
cat >>confdefs.h <<_ACEOF
|
|
-#define HAVE_STRUCT_STAT_ST_RDEV 1
|
|
+#define ssize_t int
|
|
_ACEOF
|
|
|
|
+fi
|
|
|
|
-cat >>confdefs.h <<\_ACEOF
|
|
-#define HAVE_ST_RDEV 1
|
|
+for ac_header in memory.h
|
|
+do :
|
|
+ ac_fn_c_check_header_mongrel "$LINENO" "memory.h" "ac_cv_header_memory_h" "$ac_includes_default"
|
|
+if test "x$ac_cv_header_memory_h" = x""yes; then :
|
|
+ cat >>confdefs.h <<_ACEOF
|
|
+#define HAVE_MEMORY_H 1
|
|
_ACEOF
|
|
|
|
fi
|
|
|
|
+done
|
|
+
|
|
+for ac_header in string.h strings.h
|
|
+do :
|
|
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
|
|
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
|
|
+eval as_val=\$$as_ac_Header
|
|
+ if test "x$as_val" = x""yes; then :
|
|
+ cat >>confdefs.h <<_ACEOF
|
|
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
|
|
+_ACEOF
|
|
+ break
|
|
+fi
|
|
+
|
|
+done
|
|
+
|
|
+for ac_func in strerror
|
|
+do :
|
|
+ ac_fn_c_check_func "$LINENO" "strerror" "ac_cv_func_strerror"
|
|
+if test "x$ac_cv_func_strerror" = x""yes; then :
|
|
+ cat >>confdefs.h <<_ACEOF
|
|
+#define HAVE_STRERROR 1
|
|
+_ACEOF
|
|
|
|
-{ echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5
|
|
-echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6; }
|
|
-if test "${ac_cv_header_time+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
else
|
|
- cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
+ case " $LIBOBJS " in
|
|
+ *" $ac_func.$ac_objext "* ) ;;
|
|
+ *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext"
|
|
+ ;;
|
|
+esac
|
|
+
|
|
+fi
|
|
+done
|
|
+
|
|
+
|
|
+
|
|
+DL_LIB=
|
|
+for ac_func in dlopen
|
|
+do :
|
|
+ ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
|
|
+if test "x$ac_cv_func_dlopen" = x""yes; then :
|
|
+ cat >>confdefs.h <<_ACEOF
|
|
+#define HAVE_DLOPEN 1
|
|
_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
+
|
|
+else
|
|
+
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
|
|
+$as_echo_n "checking for dlopen in -ldl... " >&6; }
|
|
+if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
+else
|
|
+ ac_check_lib_save_LIBS=$LIBS
|
|
+LIBS="-ldl $LIBS"
|
|
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
/* end confdefs.h. */
|
|
-#include <sys/types.h>
|
|
-#include <sys/time.h>
|
|
-#include <time.h>
|
|
|
|
+/* Override any GCC internal prototype to avoid an error.
|
|
+ Use char because int might match the return type of a GCC
|
|
+ builtin and then its argument prototype would still apply. */
|
|
+#ifdef __cplusplus
|
|
+extern "C"
|
|
+#endif
|
|
+char dlopen ();
|
|
int
|
|
main ()
|
|
{
|
|
-if ((struct tm *) 0)
|
|
-return 0;
|
|
+return dlopen ();
|
|
;
|
|
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
|
|
- ac_cv_header_time=yes
|
|
+if ac_fn_c_try_link "$LINENO"; then :
|
|
+ ac_cv_lib_dl_dlopen=yes
|
|
else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
- ac_cv_header_time=no
|
|
-fi
|
|
-
|
|
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
+ ac_cv_lib_dl_dlopen=no
|
|
fi
|
|
-{ echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5
|
|
-echo "${ECHO_T}$ac_cv_header_time" >&6; }
|
|
-if test $ac_cv_header_time = yes; then
|
|
-
|
|
-cat >>confdefs.h <<\_ACEOF
|
|
-#define TIME_WITH_SYS_TIME 1
|
|
-_ACEOF
|
|
-
|
|
+rm -f core conftest.err conftest.$ac_objext \
|
|
+ conftest$ac_exeext conftest.$ac_ext
|
|
+LIBS=$ac_check_lib_save_LIBS
|
|
fi
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
|
|
+$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
|
|
+if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
|
|
+ DL_LIB="-ldl"
|
|
+else
|
|
|
|
-{ echo "$as_me:$LINENO: checking whether struct tm is in sys/time.h or time.h" >&5
|
|
-echo $ECHO_N "checking whether struct tm is in sys/time.h or time.h... $ECHO_C" >&6; }
|
|
-if test "${ac_cv_struct_tm+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
|
|
+$as_echo_n "checking for shl_load in -ldld... " >&6; }
|
|
+if test "${ac_cv_lib_dld_shl_load+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
- cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
+ ac_check_lib_save_LIBS=$LIBS
|
|
+LIBS="-ldld $LIBS"
|
|
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
/* end confdefs.h. */
|
|
-#include <sys/types.h>
|
|
-#include <time.h>
|
|
|
|
+/* Override any GCC internal prototype to avoid an error.
|
|
+ Use char because int might match the return type of a GCC
|
|
+ builtin and then its argument prototype would still apply. */
|
|
+#ifdef __cplusplus
|
|
+extern "C"
|
|
+#endif
|
|
+char shl_load ();
|
|
int
|
|
main ()
|
|
{
|
|
-struct tm tm;
|
|
- int *p = &tm.tm_sec;
|
|
- return !p;
|
|
+return shl_load ();
|
|
;
|
|
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
|
|
- ac_cv_struct_tm=time.h
|
|
+if ac_fn_c_try_link "$LINENO"; then :
|
|
+ ac_cv_lib_dld_shl_load=yes
|
|
else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
- ac_cv_struct_tm=sys/time.h
|
|
+ ac_cv_lib_dld_shl_load=no
|
|
fi
|
|
-
|
|
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
+rm -f core conftest.err conftest.$ac_objext \
|
|
+ conftest$ac_exeext conftest.$ac_ext
|
|
+LIBS=$ac_check_lib_save_LIBS
|
|
fi
|
|
-{ echo "$as_me:$LINENO: result: $ac_cv_struct_tm" >&5
|
|
-echo "${ECHO_T}$ac_cv_struct_tm" >&6; }
|
|
-if test $ac_cv_struct_tm = sys/time.h; then
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
|
|
+$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
|
|
+if test "x$ac_cv_lib_dld_shl_load" = x""yes; then :
|
|
+ DL_LIB="-ldld"
|
|
+else
|
|
|
|
-cat >>confdefs.h <<\_ACEOF
|
|
-#define TM_IN_SYS_TIME 1
|
|
+ for ac_func in dlopen
|
|
+do :
|
|
+ ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
|
|
+if test "x$ac_cv_func_dlopen" = x""yes; then :
|
|
+ cat >>confdefs.h <<_ACEOF
|
|
+#define HAVE_DLOPEN 1
|
|
_ACEOF
|
|
+ DL_LIB=""
|
|
+else
|
|
+ DL_LIB=""
|
|
+fi
|
|
+done
|
|
+
|
|
|
|
fi
|
|
|
|
-{ echo "$as_me:$LINENO: checking for uid_t in sys/types.h" >&5
|
|
-echo $ECHO_N "checking for uid_t in sys/types.h... $ECHO_C" >&6; }
|
|
-if test "${ac_cv_type_uid_t+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
-else
|
|
- cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
-/* end confdefs.h. */
|
|
-#include <sys/types.h>
|
|
|
|
-_ACEOF
|
|
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
|
|
- $EGREP "uid_t" >/dev/null 2>&1; then
|
|
- ac_cv_type_uid_t=yes
|
|
-else
|
|
- ac_cv_type_uid_t=no
|
|
fi
|
|
-rm -f conftest*
|
|
+
|
|
|
|
fi
|
|
-{ echo "$as_me:$LINENO: result: $ac_cv_type_uid_t" >&5
|
|
-echo "${ECHO_T}$ac_cv_type_uid_t" >&6; }
|
|
-if test $ac_cv_type_uid_t = no; then
|
|
+done
|
|
|
|
-cat >>confdefs.h <<\_ACEOF
|
|
-#define uid_t int
|
|
+oLIBS="$LIBS"
|
|
+LIBS="$LIBS $DL_LIB"
|
|
+for ac_func in dlerror
|
|
+do :
|
|
+ ac_fn_c_check_func "$LINENO" "dlerror" "ac_cv_func_dlerror"
|
|
+if test "x$ac_cv_func_dlerror" = x""yes; then :
|
|
+ cat >>confdefs.h <<_ACEOF
|
|
+#define HAVE_DLERROR 1
|
|
_ACEOF
|
|
|
|
+fi
|
|
+done
|
|
|
|
-cat >>confdefs.h <<\_ACEOF
|
|
-#define gid_t int
|
|
-_ACEOF
|
|
+LIBS="$oLIBS"
|
|
|
|
+
|
|
+ac_fn_c_check_header_mongrel "$LINENO" "linux/isdn.h" "ac_cv_header_linux_isdn_h" "$ac_includes_default"
|
|
+if test "x$ac_cv_header_linux_isdn_h" = x""yes; then :
|
|
+ HAVE_ISDN_H=yes
|
|
+else
|
|
+ HAVE_ISDN_H=no
|
|
fi
|
|
|
|
|
|
-{ echo "$as_me:$LINENO: checking for ssize_t" >&5
|
|
-echo $ECHO_N "checking for ssize_t... $ECHO_C" >&6; }
|
|
-if test "${ac_cv_type_ssize_t+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+if test x$HAVE_ISDN_H = xyes ; then
|
|
+
|
|
+$as_echo "#define HAVE_ISDN_H 1" >>confdefs.h
|
|
+
|
|
+fi
|
|
+
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for vmgetinfo in -lperfstat" >&5
|
|
+$as_echo_n "checking for vmgetinfo in -lperfstat... " >&6; }
|
|
+if test "${ac_cv_lib_perfstat_vmgetinfo+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
- cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
+ ac_check_lib_save_LIBS=$LIBS
|
|
+LIBS="-lperfstat $LIBS"
|
|
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
/* end confdefs.h. */
|
|
-$ac_includes_default
|
|
-typedef ssize_t ac__type_new_;
|
|
+
|
|
+/* Override any GCC internal prototype to avoid an error.
|
|
+ Use char because int might match the return type of a GCC
|
|
+ builtin and then its argument prototype would still apply. */
|
|
+#ifdef __cplusplus
|
|
+extern "C"
|
|
+#endif
|
|
+char vmgetinfo ();
|
|
int
|
|
main ()
|
|
{
|
|
-if ((ac__type_new_ *) 0)
|
|
- return 0;
|
|
-if (sizeof (ac__type_new_))
|
|
- return 0;
|
|
+return vmgetinfo ();
|
|
;
|
|
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
|
|
- ac_cv_type_ssize_t=yes
|
|
+if ac_fn_c_try_link "$LINENO"; then :
|
|
+ ac_cv_lib_perfstat_vmgetinfo=yes
|
|
else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
- ac_cv_type_ssize_t=no
|
|
+ ac_cv_lib_perfstat_vmgetinfo=no
|
|
fi
|
|
-
|
|
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
+rm -f core conftest.err conftest.$ac_objext \
|
|
+ conftest$ac_exeext conftest.$ac_ext
|
|
+LIBS=$ac_check_lib_save_LIBS
|
|
fi
|
|
-{ echo "$as_me:$LINENO: result: $ac_cv_type_ssize_t" >&5
|
|
-echo "${ECHO_T}$ac_cv_type_ssize_t" >&6; }
|
|
-if test $ac_cv_type_ssize_t = yes; then
|
|
- :
|
|
-else
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_perfstat_vmgetinfo" >&5
|
|
+$as_echo "$ac_cv_lib_perfstat_vmgetinfo" >&6; }
|
|
+if test "x$ac_cv_lib_perfstat_vmgetinfo" = x""yes; then :
|
|
|
|
-cat >>confdefs.h <<_ACEOF
|
|
-#define ssize_t int
|
|
-_ACEOF
|
|
+$as_echo "#define HAVE_VMGETINFO 1" >>confdefs.h
|
|
|
|
fi
|
|
|
|
|
|
-for ac_header in memory.h
|
|
-do
|
|
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
|
|
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
|
|
- { echo "$as_me:$LINENO: checking for $ac_header" >&5
|
|
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
|
|
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
-fi
|
|
-ac_res=`eval echo '${'$as_ac_Header'}'`
|
|
- { echo "$as_me:$LINENO: result: $ac_res" >&5
|
|
-echo "${ECHO_T}$ac_res" >&6; }
|
|
+case "$host_os" in
|
|
+ solaris*)
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for kstat_open in -lkstat" >&5
|
|
+$as_echo_n "checking for kstat_open in -lkstat... " >&6; }
|
|
+if test "${ac_cv_lib_kstat_kstat_open+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
- # Is the header compilable?
|
|
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
|
|
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
|
|
-cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
+ ac_check_lib_save_LIBS=$LIBS
|
|
+LIBS="-lkstat $LIBS"
|
|
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
/* end confdefs.h. */
|
|
-$ac_includes_default
|
|
-#include <$ac_header>
|
|
+
|
|
+/* Override any GCC internal prototype to avoid an error.
|
|
+ Use char because int might match the return type of a GCC
|
|
+ builtin and then its argument prototype would still apply. */
|
|
+#ifdef __cplusplus
|
|
+extern "C"
|
|
+#endif
|
|
+char kstat_open ();
|
|
+int
|
|
+main ()
|
|
+{
|
|
+return kstat_open ();
|
|
+ ;
|
|
+ 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
|
|
- ac_header_compiler=yes
|
|
+if ac_fn_c_try_link "$LINENO"; then :
|
|
+ ac_cv_lib_kstat_kstat_open=yes
|
|
else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
- ac_header_compiler=no
|
|
+ ac_cv_lib_kstat_kstat_open=no
|
|
+fi
|
|
+rm -f core conftest.err conftest.$ac_objext \
|
|
+ conftest$ac_exeext conftest.$ac_ext
|
|
+LIBS=$ac_check_lib_save_LIBS
|
|
fi
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_kstat_kstat_open" >&5
|
|
+$as_echo "$ac_cv_lib_kstat_kstat_open" >&6; }
|
|
+if test "x$ac_cv_lib_kstat_kstat_open" = x""yes; then :
|
|
+ cat >>confdefs.h <<_ACEOF
|
|
+#define HAVE_LIBKSTAT 1
|
|
+_ACEOF
|
|
|
|
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
|
|
-echo "${ECHO_T}$ac_header_compiler" >&6; }
|
|
+ LIBS="-lkstat $LIBS"
|
|
|
|
-# Is the header present?
|
|
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
|
|
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
|
|
-cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
+fi
|
|
+
|
|
+ for ac_func in getloadavg swapctl
|
|
+do :
|
|
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
|
|
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
|
|
+eval as_val=\$$as_ac_var
|
|
+ if test "x$as_val" = x""yes; then :
|
|
+ cat >>confdefs.h <<_ACEOF
|
|
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
|
|
_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
-/* end confdefs.h. */
|
|
-#include <$ac_header>
|
|
+
|
|
+fi
|
|
+done
|
|
+
|
|
+ for ac_header in procfs.h sys/procfs.h
|
|
+do :
|
|
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
|
|
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
|
|
+eval as_val=\$$as_ac_Header
|
|
+ if test "x$as_val" = x""yes; then :
|
|
+ cat >>confdefs.h <<_ACEOF
|
|
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
|
|
_ACEOF
|
|
-if { (ac_try="$ac_cpp conftest.$ac_ext"
|
|
-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_cpp conftest.$ac_ext") 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); } >/dev/null && {
|
|
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
|
|
- test ! -s conftest.err
|
|
- }; then
|
|
- ac_header_preproc=yes
|
|
-else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
- ac_header_preproc=no
|
|
-fi
|
|
-
|
|
-rm -f conftest.err conftest.$ac_ext
|
|
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
|
|
-echo "${ECHO_T}$ac_header_preproc" >&6; }
|
|
-
|
|
-# So? What about this header?
|
|
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
|
|
- yes:no: )
|
|
- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
|
|
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
|
|
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
|
|
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
|
|
- ac_header_preproc=yes
|
|
- ;;
|
|
- no:yes:* )
|
|
- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
|
|
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
|
|
- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
|
|
-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
|
|
- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
|
|
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
|
|
- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
|
|
-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
|
|
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
|
|
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
|
|
- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
|
|
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
|
|
- ( cat <<\_ASBOX
|
|
-## ---------------------------------------------------------------------- ##
|
|
-## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=libgtop ##
|
|
-## ---------------------------------------------------------------------- ##
|
|
-_ASBOX
|
|
- ) | sed "s/^/$as_me: WARNING: /" >&2
|
|
- ;;
|
|
-esac
|
|
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
|
|
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
|
|
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
-else
|
|
- eval "$as_ac_Header=\$ac_header_preproc"
|
|
-fi
|
|
-ac_res=`eval echo '${'$as_ac_Header'}'`
|
|
- { echo "$as_me:$LINENO: result: $ac_res" >&5
|
|
-echo "${ECHO_T}$ac_res" >&6; }
|
|
-
|
|
-fi
|
|
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
|
|
- cat >>confdefs.h <<_ACEOF
|
|
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
|
|
-_ACEOF
|
|
-
|
|
+ break
|
|
fi
|
|
|
|
done
|
|
|
|
|
|
|
|
-for ac_header in string.h strings.h
|
|
-do
|
|
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
|
|
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
|
|
- { echo "$as_me:$LINENO: checking for $ac_header" >&5
|
|
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
|
|
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
-fi
|
|
-ac_res=`eval echo '${'$as_ac_Header'}'`
|
|
- { echo "$as_me:$LINENO: result: $ac_res" >&5
|
|
-echo "${ECHO_T}$ac_res" >&6; }
|
|
+ case $host_os in
|
|
+ solaris[8-9] | solaris2.[0-9].*)
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for kvm_open in -lkvm" >&5
|
|
+$as_echo_n "checking for kvm_open in -lkvm... " >&6; }
|
|
+if test "${ac_cv_lib_kvm_kvm_open+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
- # Is the header compilable?
|
|
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
|
|
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
|
|
-cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
+ ac_check_lib_save_LIBS=$LIBS
|
|
+LIBS="-lkvm $LIBS"
|
|
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
/* end confdefs.h. */
|
|
-$ac_includes_default
|
|
-#include <$ac_header>
|
|
+
|
|
+/* Override any GCC internal prototype to avoid an error.
|
|
+ Use char because int might match the return type of a GCC
|
|
+ builtin and then its argument prototype would still apply. */
|
|
+#ifdef __cplusplus
|
|
+extern "C"
|
|
+#endif
|
|
+char kvm_open ();
|
|
+int
|
|
+main ()
|
|
+{
|
|
+return kvm_open ();
|
|
+ ;
|
|
+ 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
|
|
- ac_header_compiler=yes
|
|
+if ac_fn_c_try_link "$LINENO"; then :
|
|
+ ac_cv_lib_kvm_kvm_open=yes
|
|
else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
- ac_header_compiler=no
|
|
+ ac_cv_lib_kvm_kvm_open=no
|
|
fi
|
|
+rm -f core conftest.err conftest.$ac_objext \
|
|
+ conftest$ac_exeext conftest.$ac_ext
|
|
+LIBS=$ac_check_lib_save_LIBS
|
|
+fi
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_kvm_kvm_open" >&5
|
|
+$as_echo "$ac_cv_lib_kvm_kvm_open" >&6; }
|
|
+if test "x$ac_cv_lib_kvm_kvm_open" = x""yes; then :
|
|
|
|
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
|
|
-echo "${ECHO_T}$ac_header_compiler" >&6; }
|
|
+ LIBS="-lkvm $LIBS"
|
|
|
|
-# Is the header present?
|
|
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
|
|
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
|
|
-cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
+else
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for kvm_open in -lkvm with -lelf" >&5
|
|
+$as_echo_n "checking for kvm_open in -lkvm with -lelf... " >&6; }
|
|
+ if test "${ac_cv_lib_kvm_with_elf+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
+else
|
|
+ ac_save_LIBS="$LIBS"
|
|
+ LIBS="-lkvm -lelf $LIBS"
|
|
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
/* end confdefs.h. */
|
|
-#include <$ac_header>
|
|
+char kvm_open();
|
|
+int
|
|
+main ()
|
|
+{
|
|
+kvm_open()
|
|
+ ;
|
|
+ return 0;
|
|
+}
|
|
_ACEOF
|
|
-if { (ac_try="$ac_cpp conftest.$ac_ext"
|
|
-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_cpp conftest.$ac_ext") 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); } >/dev/null && {
|
|
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
|
|
- test ! -s conftest.err
|
|
- }; then
|
|
- ac_header_preproc=yes
|
|
+if ac_fn_c_try_link "$LINENO"; then :
|
|
+ ac_cv_lib_kvm_with_elf=yes
|
|
else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
- ac_header_preproc=no
|
|
+ ac_cv_lib_kvm_with_elf=no
|
|
fi
|
|
+rm -f core conftest.err conftest.$ac_objext \
|
|
+ conftest$ac_exeext conftest.$ac_ext
|
|
+ LIBS="$ac_save_LIBS"
|
|
|
|
-rm -f conftest.err conftest.$ac_ext
|
|
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
|
|
-echo "${ECHO_T}$ac_header_preproc" >&6; }
|
|
-
|
|
-# So? What about this header?
|
|
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
|
|
- yes:no: )
|
|
- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
|
|
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
|
|
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
|
|
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
|
|
- ac_header_preproc=yes
|
|
- ;;
|
|
- no:yes:* )
|
|
- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
|
|
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
|
|
- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
|
|
-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
|
|
- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
|
|
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
|
|
- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
|
|
-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
|
|
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
|
|
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
|
|
- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
|
|
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
|
|
- ( cat <<\_ASBOX
|
|
-## ---------------------------------------------------------------------- ##
|
|
-## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=libgtop ##
|
|
-## ---------------------------------------------------------------------- ##
|
|
-_ASBOX
|
|
- ) | sed "s/^/$as_me: WARNING: /" >&2
|
|
- ;;
|
|
-esac
|
|
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
|
|
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
|
|
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
-else
|
|
- eval "$as_ac_Header=\$ac_header_preproc"
|
|
fi
|
|
-ac_res=`eval echo '${'$as_ac_Header'}'`
|
|
- { echo "$as_me:$LINENO: result: $ac_res" >&5
|
|
-echo "${ECHO_T}$ac_res" >&6; }
|
|
|
|
-fi
|
|
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
|
|
- cat >>confdefs.h <<_ACEOF
|
|
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
|
|
-_ACEOF
|
|
- break
|
|
-fi
|
|
+ if test "$ac_cv_lib_kvm_with_elf" = "yes"; then
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
|
+$as_echo "yes" >&6; }
|
|
+ LIBS="-lkvm -lelf $LIBS"
|
|
+ else
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
+$as_echo "no" >&6; }
|
|
+ fi
|
|
|
|
-done
|
|
+fi
|
|
|
|
+ ;;
|
|
+ esac
|
|
+ ;;
|
|
+esac
|
|
|
|
-for ac_func in strerror
|
|
-do
|
|
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
|
|
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
|
|
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
|
|
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for vm_statistics in -lmach" >&5
|
|
+$as_echo_n "checking for vm_statistics in -lmach... " >&6; }
|
|
+if test "${ac_cv_lib_mach_vm_statistics+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
- cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
+ ac_check_lib_save_LIBS=$LIBS
|
|
+LIBS="-lmach $LIBS"
|
|
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
/* end confdefs.h. */
|
|
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
|
|
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
|
|
-#define $ac_func innocuous_$ac_func
|
|
-
|
|
-/* System header to define __stub macros and hopefully few prototypes,
|
|
- which can conflict with char $ac_func (); below.
|
|
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
|
|
- <limits.h> exists even on freestanding compilers. */
|
|
-
|
|
-#ifdef __STDC__
|
|
-# include <limits.h>
|
|
-#else
|
|
-# include <assert.h>
|
|
-#endif
|
|
-
|
|
-#undef $ac_func
|
|
|
|
/* Override any GCC internal prototype to avoid an error.
|
|
Use char because int might match the return type of a GCC
|
|
@@ -15052,730 +13325,569 @@ cat >>conftest.$ac_ext <<_ACEOF
|
|
#ifdef __cplusplus
|
|
extern "C"
|
|
#endif
|
|
-char $ac_func ();
|
|
-/* The GNU C library defines this for functions which it implements
|
|
- to always fail with ENOSYS. Some functions are actually named
|
|
- something starting with __ and the normal name is an alias. */
|
|
-#if defined __stub_$ac_func || defined __stub___$ac_func
|
|
-choke me
|
|
-#endif
|
|
-
|
|
+char vm_statistics ();
|
|
int
|
|
main ()
|
|
{
|
|
-return $ac_func ();
|
|
+return vm_statistics ();
|
|
;
|
|
return 0;
|
|
}
|
|
_ACEOF
|
|
-rm -f conftest.$ac_objext conftest$ac_exeext
|
|
-if { (ac_try="$ac_link"
|
|
-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_link") 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_exeext &&
|
|
- $as_test_x conftest$ac_exeext; then
|
|
- eval "$as_ac_var=yes"
|
|
+if ac_fn_c_try_link "$LINENO"; then :
|
|
+ ac_cv_lib_mach_vm_statistics=yes
|
|
else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
- eval "$as_ac_var=no"
|
|
+ ac_cv_lib_mach_vm_statistics=no
|
|
fi
|
|
-
|
|
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
- conftest$ac_exeext conftest.$ac_ext
|
|
+rm -f core conftest.err conftest.$ac_objext \
|
|
+ conftest$ac_exeext conftest.$ac_ext
|
|
+LIBS=$ac_check_lib_save_LIBS
|
|
fi
|
|
-ac_res=`eval echo '${'$as_ac_var'}'`
|
|
- { echo "$as_me:$LINENO: result: $ac_res" >&5
|
|
-echo "${ECHO_T}$ac_res" >&6; }
|
|
-if test `eval echo '${'$as_ac_var'}'` = yes; then
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mach_vm_statistics" >&5
|
|
+$as_echo "$ac_cv_lib_mach_vm_statistics" >&6; }
|
|
+if test "x$ac_cv_lib_mach_vm_statistics" = x""yes; then :
|
|
cat >>confdefs.h <<_ACEOF
|
|
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
|
|
+#define HAVE_LIBMACH 1
|
|
_ACEOF
|
|
|
|
-else
|
|
- case " $LIBOBJS " in
|
|
- *" $ac_func.$ac_objext "* ) ;;
|
|
- *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext"
|
|
- ;;
|
|
-esac
|
|
+ LIBS="-lmach $LIBS"
|
|
|
|
fi
|
|
-done
|
|
|
|
|
|
-
|
|
-DL_LIB=
|
|
-
|
|
-for ac_func in dlopen
|
|
-do
|
|
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
|
|
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
|
|
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
|
|
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+saved_CFLAGS=$CFLAGS
|
|
+CFLAGS="$CFLAGS -D_GNU_SOURCE"
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether program_invocation_name must be declared" >&5
|
|
+$as_echo_n "checking whether program_invocation_name must be declared... " >&6; }
|
|
+if test "${gcc_cv_decl_needed_program_invocation_name+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
- cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
/* end confdefs.h. */
|
|
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
|
|
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
|
|
-#define $ac_func innocuous_$ac_func
|
|
-
|
|
-/* System header to define __stub macros and hopefully few prototypes,
|
|
- which can conflict with char $ac_func (); below.
|
|
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
|
|
- <limits.h> exists even on freestanding compilers. */
|
|
|
|
-#ifdef __STDC__
|
|
-# include <limits.h>
|
|
+#include <stdio.h>
|
|
+#ifdef HAVE_STRING_H
|
|
+#include <string.h>
|
|
#else
|
|
-# include <assert.h>
|
|
+#ifdef HAVE_STRINGS_H
|
|
+#include <strings.h>
|
|
#endif
|
|
-
|
|
-#undef $ac_func
|
|
-
|
|
-/* Override any GCC internal prototype to avoid an error.
|
|
- Use char because int might match the return type of a GCC
|
|
- builtin and then its argument prototype would still apply. */
|
|
-#ifdef __cplusplus
|
|
-extern "C"
|
|
#endif
|
|
-char $ac_func ();
|
|
-/* The GNU C library defines this for functions which it implements
|
|
- to always fail with ENOSYS. Some functions are actually named
|
|
- something starting with __ and the normal name is an alias. */
|
|
-#if defined __stub_$ac_func || defined __stub___$ac_func
|
|
-choke me
|
|
+#ifdef HAVE_STDLIB_H
|
|
+#include <stdlib.h>
|
|
+#endif
|
|
+#ifdef HAVE_UNISTD_H
|
|
+#include <unistd.h>
|
|
#endif
|
|
|
|
+#include <errno.h>
|
|
+#include <stdio.h>
|
|
+#include <stdlib.h>
|
|
+#include <string.h>
|
|
+
|
|
int
|
|
main ()
|
|
{
|
|
-return $ac_func ();
|
|
+char *(*pfn) = (char *(*)) program_invocation_name
|
|
;
|
|
return 0;
|
|
}
|
|
_ACEOF
|
|
-rm -f conftest.$ac_objext conftest$ac_exeext
|
|
-if { (ac_try="$ac_link"
|
|
-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_link") 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_exeext &&
|
|
- $as_test_x conftest$ac_exeext; then
|
|
- eval "$as_ac_var=yes"
|
|
+if ac_fn_c_try_compile "$LINENO"; then :
|
|
+ eval "gcc_cv_decl_needed_program_invocation_name=no"
|
|
else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
- eval "$as_ac_var=no"
|
|
+ eval "gcc_cv_decl_needed_program_invocation_name=yes"
|
|
fi
|
|
-
|
|
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
- conftest$ac_exeext conftest.$ac_ext
|
|
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
fi
|
|
-ac_res=`eval echo '${'$as_ac_var'}'`
|
|
- { echo "$as_me:$LINENO: result: $ac_res" >&5
|
|
-echo "${ECHO_T}$ac_res" >&6; }
|
|
-if test `eval echo '${'$as_ac_var'}'` = yes; then
|
|
- cat >>confdefs.h <<_ACEOF
|
|
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
|
|
+
|
|
+if eval "test \"`echo '$gcc_cv_decl_needed_'program_invocation_name`\" = yes"; then
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
|
+$as_echo "yes" >&6; }
|
|
+ gcc_need_declarations="$gcc_need_declarations program_invocation_name"
|
|
+ gcc_tr_decl=NEED_DECLARATION_`echo program_invocation_name | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
|
|
+
|
|
+cat >>confdefs.h <<_ACEOF
|
|
+#define $gcc_tr_decl 1
|
|
_ACEOF
|
|
|
|
else
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
+$as_echo "no" >&6; }
|
|
+fi
|
|
|
|
- { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
|
|
-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
|
|
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
-else
|
|
- ac_check_lib_save_LIBS=$LIBS
|
|
-LIBS="-ldl $LIBS"
|
|
-cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
+
|
|
+CFLAGS=$saved_CFLAGS
|
|
+
|
|
+ac_fn_c_check_func "$LINENO" "socket" "ac_cv_func_socket"
|
|
+if test "x$ac_cv_func_socket" = x""yes; then :
|
|
+ ac_fn_c_check_header_mongrel "$LINENO" "netinet/in.h" "ac_cv_header_netinet_in_h" "$ac_includes_default"
|
|
+if test "x$ac_cv_header_netinet_in_h" = x""yes; then :
|
|
+ ac_fn_c_check_header_mongrel "$LINENO" "arpa/inet.h" "ac_cv_header_arpa_inet_h" "$ac_includes_default"
|
|
+if test "x$ac_cv_header_arpa_inet_h" = x""yes; then :
|
|
+
|
|
+
|
|
+$as_echo "#define HAVE_SOCKETS 1" >>confdefs.h
|
|
+
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking \"for sun_len member in struct sockaddr_un\"" >&5
|
|
+$as_echo_n "checking \"for sun_len member in struct sockaddr_un\"... " >&6; }
|
|
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
/* end confdefs.h. */
|
|
|
|
-/* Override any GCC internal prototype to avoid an error.
|
|
- Use char because int might match the return type of a GCC
|
|
- builtin and then its argument prototype would still apply. */
|
|
-#ifdef __cplusplus
|
|
-extern "C"
|
|
-#endif
|
|
-char dlopen ();
|
|
+#include <sys/types.h>
|
|
+#include <sys/socket.h>
|
|
+#include <sys/un.h>
|
|
+
|
|
int
|
|
main ()
|
|
{
|
|
-return dlopen ();
|
|
+static struct sockaddr_un x; x.sun_len = 1;
|
|
;
|
|
return 0;
|
|
}
|
|
_ACEOF
|
|
-rm -f conftest.$ac_objext conftest$ac_exeext
|
|
-if { (ac_try="$ac_link"
|
|
-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_link") 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_exeext &&
|
|
- $as_test_x conftest$ac_exeext; then
|
|
- ac_cv_lib_dl_dlopen=yes
|
|
+if ac_fn_c_try_link "$LINENO"; then :
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
|
+$as_echo "yes" >&6; };
|
|
+$as_echo "#define HAVE_SOCKADDR_SUN_LEN 1" >>confdefs.h
|
|
+
|
|
else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
+$as_echo "no" >&6; }
|
|
+fi
|
|
+rm -f core conftest.err conftest.$ac_objext \
|
|
+ conftest$ac_exeext conftest.$ac_ext
|
|
+fi
|
|
+
|
|
|
|
- ac_cv_lib_dl_dlopen=no
|
|
fi
|
|
|
|
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
- conftest$ac_exeext conftest.$ac_ext
|
|
-LIBS=$ac_check_lib_save_LIBS
|
|
+
|
|
fi
|
|
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
|
|
-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
|
|
-if test $ac_cv_lib_dl_dlopen = yes; then
|
|
- DL_LIB="-ldl"
|
|
-else
|
|
|
|
- { echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
|
|
-echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6; }
|
|
-if test "${ac_cv_lib_dld_shl_load+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+
|
|
+# The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
|
|
+# for constant arguments. Useless!
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working alloca.h" >&5
|
|
+$as_echo_n "checking for working alloca.h... " >&6; }
|
|
+if test "${ac_cv_working_alloca_h+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
- ac_check_lib_save_LIBS=$LIBS
|
|
-LIBS="-ldld $LIBS"
|
|
-cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
/* end confdefs.h. */
|
|
-
|
|
-/* Override any GCC internal prototype to avoid an error.
|
|
- Use char because int might match the return type of a GCC
|
|
- builtin and then its argument prototype would still apply. */
|
|
-#ifdef __cplusplus
|
|
-extern "C"
|
|
-#endif
|
|
-char shl_load ();
|
|
+#include <alloca.h>
|
|
int
|
|
main ()
|
|
{
|
|
-return shl_load ();
|
|
+char *p = (char *) alloca (2 * sizeof (int));
|
|
+ if (p) return 0;
|
|
;
|
|
return 0;
|
|
}
|
|
_ACEOF
|
|
-rm -f conftest.$ac_objext conftest$ac_exeext
|
|
-if { (ac_try="$ac_link"
|
|
-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_link") 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_exeext &&
|
|
- $as_test_x conftest$ac_exeext; then
|
|
- ac_cv_lib_dld_shl_load=yes
|
|
+if ac_fn_c_try_link "$LINENO"; then :
|
|
+ ac_cv_working_alloca_h=yes
|
|
else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
- ac_cv_lib_dld_shl_load=no
|
|
+ ac_cv_working_alloca_h=no
|
|
fi
|
|
-
|
|
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
- conftest$ac_exeext conftest.$ac_ext
|
|
-LIBS=$ac_check_lib_save_LIBS
|
|
+rm -f core conftest.err conftest.$ac_objext \
|
|
+ conftest$ac_exeext conftest.$ac_ext
|
|
fi
|
|
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
|
|
-echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; }
|
|
-if test $ac_cv_lib_dld_shl_load = yes; then
|
|
- DL_LIB="-ldld"
|
|
-else
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_working_alloca_h" >&5
|
|
+$as_echo "$ac_cv_working_alloca_h" >&6; }
|
|
+if test $ac_cv_working_alloca_h = yes; then
|
|
|
|
+$as_echo "#define HAVE_ALLOCA_H 1" >>confdefs.h
|
|
|
|
-for ac_func in dlopen
|
|
-do
|
|
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
|
|
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
|
|
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
|
|
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+fi
|
|
+
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for alloca" >&5
|
|
+$as_echo_n "checking for alloca... " >&6; }
|
|
+if test "${ac_cv_func_alloca_works+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
- cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
/* end confdefs.h. */
|
|
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
|
|
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
|
|
-#define $ac_func innocuous_$ac_func
|
|
-
|
|
-/* System header to define __stub macros and hopefully few prototypes,
|
|
- which can conflict with char $ac_func (); below.
|
|
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
|
|
- <limits.h> exists even on freestanding compilers. */
|
|
-
|
|
-#ifdef __STDC__
|
|
-# include <limits.h>
|
|
+#ifdef __GNUC__
|
|
+# define alloca __builtin_alloca
|
|
#else
|
|
-# include <assert.h>
|
|
-#endif
|
|
-
|
|
-#undef $ac_func
|
|
-
|
|
-/* Override any GCC internal prototype to avoid an error.
|
|
- Use char because int might match the return type of a GCC
|
|
- builtin and then its argument prototype would still apply. */
|
|
-#ifdef __cplusplus
|
|
-extern "C"
|
|
-#endif
|
|
-char $ac_func ();
|
|
-/* The GNU C library defines this for functions which it implements
|
|
- to always fail with ENOSYS. Some functions are actually named
|
|
- something starting with __ and the normal name is an alias. */
|
|
-#if defined __stub_$ac_func || defined __stub___$ac_func
|
|
-choke me
|
|
+# ifdef _MSC_VER
|
|
+# include <malloc.h>
|
|
+# define alloca _alloca
|
|
+# else
|
|
+# ifdef HAVE_ALLOCA_H
|
|
+# include <alloca.h>
|
|
+# else
|
|
+# ifdef _AIX
|
|
+ #pragma alloca
|
|
+# else
|
|
+# ifndef alloca /* predefined by HP cc +Olibcalls */
|
|
+char *alloca ();
|
|
+# endif
|
|
+# endif
|
|
+# endif
|
|
+# endif
|
|
#endif
|
|
|
|
int
|
|
main ()
|
|
{
|
|
-return $ac_func ();
|
|
+char *p = (char *) alloca (1);
|
|
+ if (p) return 0;
|
|
;
|
|
return 0;
|
|
}
|
|
_ACEOF
|
|
-rm -f conftest.$ac_objext conftest$ac_exeext
|
|
-if { (ac_try="$ac_link"
|
|
-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_link") 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_exeext &&
|
|
- $as_test_x conftest$ac_exeext; then
|
|
- eval "$as_ac_var=yes"
|
|
+if ac_fn_c_try_link "$LINENO"; then :
|
|
+ ac_cv_func_alloca_works=yes
|
|
else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
- eval "$as_ac_var=no"
|
|
-fi
|
|
-
|
|
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
- conftest$ac_exeext conftest.$ac_ext
|
|
+ ac_cv_func_alloca_works=no
|
|
fi
|
|
-ac_res=`eval echo '${'$as_ac_var'}'`
|
|
- { echo "$as_me:$LINENO: result: $ac_res" >&5
|
|
-echo "${ECHO_T}$ac_res" >&6; }
|
|
-if test `eval echo '${'$as_ac_var'}'` = yes; then
|
|
- cat >>confdefs.h <<_ACEOF
|
|
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
|
|
-_ACEOF
|
|
- DL_LIB=""
|
|
-else
|
|
- DL_LIB=""
|
|
+rm -f core conftest.err conftest.$ac_objext \
|
|
+ conftest$ac_exeext conftest.$ac_ext
|
|
fi
|
|
-done
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_alloca_works" >&5
|
|
+$as_echo "$ac_cv_func_alloca_works" >&6; }
|
|
|
|
+if test $ac_cv_func_alloca_works = yes; then
|
|
|
|
-fi
|
|
-
|
|
+$as_echo "#define HAVE_ALLOCA 1" >>confdefs.h
|
|
|
|
-fi
|
|
+else
|
|
+ # The SVR3 libPW and SVR4 libucb both contain incompatible functions
|
|
+# that cause trouble. Some versions do not even contain alloca or
|
|
+# contain a buggy version. If you still want to use their alloca,
|
|
+# use ar to extract alloca.o from them instead of compiling alloca.c.
|
|
|
|
+ALLOCA=\${LIBOBJDIR}alloca.$ac_objext
|
|
|
|
-fi
|
|
-done
|
|
+$as_echo "#define C_ALLOCA 1" >>confdefs.h
|
|
|
|
-oLIBS="$LIBS"
|
|
-LIBS="$LIBS $DL_LIB"
|
|
|
|
-for ac_func in dlerror
|
|
-do
|
|
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
|
|
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
|
|
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
|
|
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether \`alloca.c' needs Cray hooks" >&5
|
|
+$as_echo_n "checking whether \`alloca.c' needs Cray hooks... " >&6; }
|
|
+if test "${ac_cv_os_cray+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
- cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
/* end confdefs.h. */
|
|
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
|
|
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
|
|
-#define $ac_func innocuous_$ac_func
|
|
-
|
|
-/* System header to define __stub macros and hopefully few prototypes,
|
|
- which can conflict with char $ac_func (); below.
|
|
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
|
|
- <limits.h> exists even on freestanding compilers. */
|
|
-
|
|
-#ifdef __STDC__
|
|
-# include <limits.h>
|
|
+#if defined CRAY && ! defined CRAY2
|
|
+webecray
|
|
#else
|
|
-# include <assert.h>
|
|
+wenotbecray
|
|
#endif
|
|
|
|
-#undef $ac_func
|
|
+_ACEOF
|
|
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
|
|
+ $EGREP "webecray" >/dev/null 2>&1; then :
|
|
+ ac_cv_os_cray=yes
|
|
+else
|
|
+ ac_cv_os_cray=no
|
|
+fi
|
|
+rm -f conftest*
|
|
+
|
|
+fi
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_os_cray" >&5
|
|
+$as_echo "$ac_cv_os_cray" >&6; }
|
|
+if test $ac_cv_os_cray = yes; then
|
|
+ for ac_func in _getb67 GETB67 getb67; do
|
|
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
|
|
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
|
|
+eval as_val=\$$as_ac_var
|
|
+ if test "x$as_val" = x""yes; then :
|
|
|
|
-/* Override any GCC internal prototype to avoid an error.
|
|
- Use char because int might match the return type of a GCC
|
|
- builtin and then its argument prototype would still apply. */
|
|
-#ifdef __cplusplus
|
|
-extern "C"
|
|
-#endif
|
|
-char $ac_func ();
|
|
-/* The GNU C library defines this for functions which it implements
|
|
- to always fail with ENOSYS. Some functions are actually named
|
|
- something starting with __ and the normal name is an alias. */
|
|
-#if defined __stub_$ac_func || defined __stub___$ac_func
|
|
-choke me
|
|
-#endif
|
|
+cat >>confdefs.h <<_ACEOF
|
|
+#define CRAY_STACKSEG_END $ac_func
|
|
+_ACEOF
|
|
+
|
|
+ break
|
|
+fi
|
|
+
|
|
+ done
|
|
+fi
|
|
+
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking stack direction for C alloca" >&5
|
|
+$as_echo_n "checking stack direction for C alloca... " >&6; }
|
|
+if test "${ac_cv_c_stack_direction+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
+else
|
|
+ if test "$cross_compiling" = yes; then :
|
|
+ ac_cv_c_stack_direction=0
|
|
+else
|
|
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
+/* end confdefs.h. */
|
|
+$ac_includes_default
|
|
+int
|
|
+find_stack_direction ()
|
|
+{
|
|
+ static char *addr = 0;
|
|
+ auto char dummy;
|
|
+ if (addr == 0)
|
|
+ {
|
|
+ addr = &dummy;
|
|
+ return find_stack_direction ();
|
|
+ }
|
|
+ else
|
|
+ return (&dummy > addr) ? 1 : -1;
|
|
+}
|
|
|
|
int
|
|
main ()
|
|
{
|
|
-return $ac_func ();
|
|
- ;
|
|
- return 0;
|
|
+ return find_stack_direction () < 0;
|
|
}
|
|
_ACEOF
|
|
-rm -f conftest.$ac_objext conftest$ac_exeext
|
|
-if { (ac_try="$ac_link"
|
|
-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_link") 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_exeext &&
|
|
- $as_test_x conftest$ac_exeext; then
|
|
- eval "$as_ac_var=yes"
|
|
+if ac_fn_c_try_run "$LINENO"; then :
|
|
+ ac_cv_c_stack_direction=1
|
|
else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
+ ac_cv_c_stack_direction=-1
|
|
+fi
|
|
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
|
|
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
|
|
+fi
|
|
|
|
- eval "$as_ac_var=no"
|
|
fi
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_stack_direction" >&5
|
|
+$as_echo "$ac_cv_c_stack_direction" >&6; }
|
|
+cat >>confdefs.h <<_ACEOF
|
|
+#define STACK_DIRECTION $ac_cv_c_stack_direction
|
|
+_ACEOF
|
|
+
|
|
|
|
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
- conftest$ac_exeext conftest.$ac_ext
|
|
fi
|
|
-ac_res=`eval echo '${'$as_ac_var'}'`
|
|
- { echo "$as_me:$LINENO: result: $ac_res" >&5
|
|
-echo "${ECHO_T}$ac_res" >&6; }
|
|
-if test `eval echo '${'$as_ac_var'}'` = yes; then
|
|
+
|
|
+for ac_header in stdlib.h unistd.h
|
|
+do :
|
|
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
|
|
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
|
|
+eval as_val=\$$as_ac_Header
|
|
+ if test "x$as_val" = x""yes; then :
|
|
cat >>confdefs.h <<_ACEOF
|
|
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
|
|
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
|
|
_ACEOF
|
|
|
|
fi
|
|
-done
|
|
|
|
-LIBS="$oLIBS"
|
|
+done
|
|
|
|
+for ac_func in getpagesize
|
|
+do :
|
|
+ ac_fn_c_check_func "$LINENO" "getpagesize" "ac_cv_func_getpagesize"
|
|
+if test "x$ac_cv_func_getpagesize" = x""yes; then :
|
|
+ cat >>confdefs.h <<_ACEOF
|
|
+#define HAVE_GETPAGESIZE 1
|
|
+_ACEOF
|
|
|
|
-if test "${ac_cv_header_linux_isdn_h+set}" = set; then
|
|
- { echo "$as_me:$LINENO: checking for linux/isdn.h" >&5
|
|
-echo $ECHO_N "checking for linux/isdn.h... $ECHO_C" >&6; }
|
|
-if test "${ac_cv_header_linux_isdn_h+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
fi
|
|
-{ echo "$as_me:$LINENO: result: $ac_cv_header_linux_isdn_h" >&5
|
|
-echo "${ECHO_T}$ac_cv_header_linux_isdn_h" >&6; }
|
|
+done
|
|
+
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working mmap" >&5
|
|
+$as_echo_n "checking for working mmap... " >&6; }
|
|
+if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
- # Is the header compilable?
|
|
-{ echo "$as_me:$LINENO: checking linux/isdn.h usability" >&5
|
|
-echo $ECHO_N "checking linux/isdn.h usability... $ECHO_C" >&6; }
|
|
-cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
+ if test "$cross_compiling" = yes; then :
|
|
+ ac_cv_func_mmap_fixed_mapped=no
|
|
+else
|
|
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
/* end confdefs.h. */
|
|
$ac_includes_default
|
|
-#include <linux/isdn.h>
|
|
-_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
|
|
- ac_header_compiler=yes
|
|
-else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
- ac_header_compiler=no
|
|
-fi
|
|
-
|
|
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
|
|
-echo "${ECHO_T}$ac_header_compiler" >&6; }
|
|
+/* malloc might have been renamed as rpl_malloc. */
|
|
+#undef malloc
|
|
|
|
-# Is the header present?
|
|
-{ echo "$as_me:$LINENO: checking linux/isdn.h presence" >&5
|
|
-echo $ECHO_N "checking linux/isdn.h presence... $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. */
|
|
-#include <linux/isdn.h>
|
|
-_ACEOF
|
|
-if { (ac_try="$ac_cpp conftest.$ac_ext"
|
|
-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_cpp conftest.$ac_ext") 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); } >/dev/null && {
|
|
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
|
|
- test ! -s conftest.err
|
|
- }; then
|
|
- ac_header_preproc=yes
|
|
-else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
+/* Thanks to Mike Haertel and Jim Avera for this test.
|
|
+ Here is a matrix of mmap possibilities:
|
|
+ mmap private not fixed
|
|
+ mmap private fixed at somewhere currently unmapped
|
|
+ mmap private fixed at somewhere already mapped
|
|
+ mmap shared not fixed
|
|
+ mmap shared fixed at somewhere currently unmapped
|
|
+ mmap shared fixed at somewhere already mapped
|
|
+ For private mappings, we should verify that changes cannot be read()
|
|
+ back from the file, nor mmap's back from the file at a different
|
|
+ address. (There have been systems where private was not correctly
|
|
+ implemented like the infamous i386 svr4.0, and systems where the
|
|
+ VM page cache was not coherent with the file system buffer cache
|
|
+ like early versions of FreeBSD and possibly contemporary NetBSD.)
|
|
+ For shared mappings, we should conversely verify that changes get
|
|
+ propagated back to all the places they're supposed to be.
|
|
|
|
- ac_header_preproc=no
|
|
-fi
|
|
+ Grep wants private fixed already mapped.
|
|
+ The main things grep needs to know about mmap are:
|
|
+ * does it exist and is it safe to write into the mmap'd area
|
|
+ * how to use it (BSD variants) */
|
|
|
|
-rm -f conftest.err conftest.$ac_ext
|
|
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
|
|
-echo "${ECHO_T}$ac_header_preproc" >&6; }
|
|
+#include <fcntl.h>
|
|
+#include <sys/mman.h>
|
|
|
|
-# So? What about this header?
|
|
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
|
|
- yes:no: )
|
|
- { echo "$as_me:$LINENO: WARNING: linux/isdn.h: accepted by the compiler, rejected by the preprocessor!" >&5
|
|
-echo "$as_me: WARNING: linux/isdn.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
|
|
- { echo "$as_me:$LINENO: WARNING: linux/isdn.h: proceeding with the compiler's result" >&5
|
|
-echo "$as_me: WARNING: linux/isdn.h: proceeding with the compiler's result" >&2;}
|
|
- ac_header_preproc=yes
|
|
- ;;
|
|
- no:yes:* )
|
|
- { echo "$as_me:$LINENO: WARNING: linux/isdn.h: present but cannot be compiled" >&5
|
|
-echo "$as_me: WARNING: linux/isdn.h: present but cannot be compiled" >&2;}
|
|
- { echo "$as_me:$LINENO: WARNING: linux/isdn.h: check for missing prerequisite headers?" >&5
|
|
-echo "$as_me: WARNING: linux/isdn.h: check for missing prerequisite headers?" >&2;}
|
|
- { echo "$as_me:$LINENO: WARNING: linux/isdn.h: see the Autoconf documentation" >&5
|
|
-echo "$as_me: WARNING: linux/isdn.h: see the Autoconf documentation" >&2;}
|
|
- { echo "$as_me:$LINENO: WARNING: linux/isdn.h: section \"Present But Cannot Be Compiled\"" >&5
|
|
-echo "$as_me: WARNING: linux/isdn.h: section \"Present But Cannot Be Compiled\"" >&2;}
|
|
- { echo "$as_me:$LINENO: WARNING: linux/isdn.h: proceeding with the preprocessor's result" >&5
|
|
-echo "$as_me: WARNING: linux/isdn.h: proceeding with the preprocessor's result" >&2;}
|
|
- { echo "$as_me:$LINENO: WARNING: linux/isdn.h: in the future, the compiler will take precedence" >&5
|
|
-echo "$as_me: WARNING: linux/isdn.h: in the future, the compiler will take precedence" >&2;}
|
|
- ( cat <<\_ASBOX
|
|
-## ---------------------------------------------------------------------- ##
|
|
-## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=libgtop ##
|
|
-## ---------------------------------------------------------------------- ##
|
|
-_ASBOX
|
|
- ) | sed "s/^/$as_me: WARNING: /" >&2
|
|
- ;;
|
|
-esac
|
|
-{ echo "$as_me:$LINENO: checking for linux/isdn.h" >&5
|
|
-echo $ECHO_N "checking for linux/isdn.h... $ECHO_C" >&6; }
|
|
-if test "${ac_cv_header_linux_isdn_h+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
-else
|
|
- ac_cv_header_linux_isdn_h=$ac_header_preproc
|
|
-fi
|
|
-{ echo "$as_me:$LINENO: result: $ac_cv_header_linux_isdn_h" >&5
|
|
-echo "${ECHO_T}$ac_cv_header_linux_isdn_h" >&6; }
|
|
+#if !defined STDC_HEADERS && !defined HAVE_STDLIB_H
|
|
+char *malloc ();
|
|
+#endif
|
|
|
|
-fi
|
|
-if test $ac_cv_header_linux_isdn_h = yes; then
|
|
- HAVE_ISDN_H=yes
|
|
-else
|
|
- HAVE_ISDN_H=no
|
|
-fi
|
|
+/* This mess was copied from the GNU getpagesize.h. */
|
|
+#ifndef HAVE_GETPAGESIZE
|
|
+/* Assume that all systems that can run configure have sys/param.h. */
|
|
+# ifndef HAVE_SYS_PARAM_H
|
|
+# define HAVE_SYS_PARAM_H 1
|
|
+# endif
|
|
|
|
+# ifdef _SC_PAGESIZE
|
|
+# define getpagesize() sysconf(_SC_PAGESIZE)
|
|
+# else /* no _SC_PAGESIZE */
|
|
+# ifdef HAVE_SYS_PARAM_H
|
|
+# include <sys/param.h>
|
|
+# ifdef EXEC_PAGESIZE
|
|
+# define getpagesize() EXEC_PAGESIZE
|
|
+# else /* no EXEC_PAGESIZE */
|
|
+# ifdef NBPG
|
|
+# define getpagesize() NBPG * CLSIZE
|
|
+# ifndef CLSIZE
|
|
+# define CLSIZE 1
|
|
+# endif /* no CLSIZE */
|
|
+# else /* no NBPG */
|
|
+# ifdef NBPC
|
|
+# define getpagesize() NBPC
|
|
+# else /* no NBPC */
|
|
+# ifdef PAGESIZE
|
|
+# define getpagesize() PAGESIZE
|
|
+# endif /* PAGESIZE */
|
|
+# endif /* no NBPC */
|
|
+# endif /* no NBPG */
|
|
+# endif /* no EXEC_PAGESIZE */
|
|
+# else /* no HAVE_SYS_PARAM_H */
|
|
+# define getpagesize() 8192 /* punt totally */
|
|
+# endif /* no HAVE_SYS_PARAM_H */
|
|
+# endif /* no _SC_PAGESIZE */
|
|
|
|
-if test x$HAVE_ISDN_H = xyes ; then
|
|
+#endif /* no HAVE_GETPAGESIZE */
|
|
+
|
|
+int
|
|
+main ()
|
|
+{
|
|
+ char *data, *data2, *data3;
|
|
+ int i, pagesize;
|
|
+ int fd;
|
|
+
|
|
+ pagesize = getpagesize ();
|
|
+
|
|
+ /* First, make a file with some known garbage in it. */
|
|
+ data = (char *) malloc (pagesize);
|
|
+ if (!data)
|
|
+ return 1;
|
|
+ for (i = 0; i < pagesize; ++i)
|
|
+ *(data + i) = rand ();
|
|
+ umask (0);
|
|
+ fd = creat ("conftest.mmap", 0600);
|
|
+ if (fd < 0)
|
|
+ return 1;
|
|
+ if (write (fd, data, pagesize) != pagesize)
|
|
+ return 1;
|
|
+ close (fd);
|
|
+
|
|
+ /* Next, try to mmap the file at a fixed address which already has
|
|
+ something else allocated at it. If we can, also make sure that
|
|
+ we see the same garbage. */
|
|
+ fd = open ("conftest.mmap", O_RDWR);
|
|
+ if (fd < 0)
|
|
+ return 1;
|
|
+ data2 = (char *) malloc (2 * pagesize);
|
|
+ if (!data2)
|
|
+ return 1;
|
|
+ data2 += (pagesize - ((long int) data2 & (pagesize - 1))) & (pagesize - 1);
|
|
+ if (data2 != mmap (data2, pagesize, PROT_READ | PROT_WRITE,
|
|
+ MAP_PRIVATE | MAP_FIXED, fd, 0L))
|
|
+ return 1;
|
|
+ for (i = 0; i < pagesize; ++i)
|
|
+ if (*(data + i) != *(data2 + i))
|
|
+ return 1;
|
|
|
|
-cat >>confdefs.h <<\_ACEOF
|
|
-#define HAVE_ISDN_H 1
|
|
+ /* Finally, make sure that changes to the mapped area do not
|
|
+ percolate back to the file as seen by read(). (This is a bug on
|
|
+ some variants of i386 svr4.0.) */
|
|
+ for (i = 0; i < pagesize; ++i)
|
|
+ *(data2 + i) = *(data2 + i) + 1;
|
|
+ data3 = (char *) malloc (pagesize);
|
|
+ if (!data3)
|
|
+ return 1;
|
|
+ if (read (fd, data3, pagesize) != pagesize)
|
|
+ return 1;
|
|
+ for (i = 0; i < pagesize; ++i)
|
|
+ if (*(data + i) != *(data3 + i))
|
|
+ return 1;
|
|
+ close (fd);
|
|
+ return 0;
|
|
+}
|
|
_ACEOF
|
|
+if ac_fn_c_try_run "$LINENO"; then :
|
|
+ ac_cv_func_mmap_fixed_mapped=yes
|
|
+else
|
|
+ ac_cv_func_mmap_fixed_mapped=no
|
|
+fi
|
|
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
|
|
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
|
|
+fi
|
|
+
|
|
+fi
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_mmap_fixed_mapped" >&5
|
|
+$as_echo "$ac_cv_func_mmap_fixed_mapped" >&6; }
|
|
+if test $ac_cv_func_mmap_fixed_mapped = yes; then
|
|
+
|
|
+$as_echo "#define HAVE_MMAP 1" >>confdefs.h
|
|
|
|
fi
|
|
+rm -f conftest.mmap
|
|
|
|
-{ echo "$as_me:$LINENO: checking for vmgetinfo in -lperfstat" >&5
|
|
-echo $ECHO_N "checking for vmgetinfo in -lperfstat... $ECHO_C" >&6; }
|
|
-if test "${ac_cv_lib_perfstat_vmgetinfo+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking return type of signal handlers" >&5
|
|
+$as_echo_n "checking return type of signal handlers... " >&6; }
|
|
+if test "${ac_cv_type_signal+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
- ac_check_lib_save_LIBS=$LIBS
|
|
-LIBS="-lperfstat $LIBS"
|
|
-cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
/* end confdefs.h. */
|
|
+#include <sys/types.h>
|
|
+#include <signal.h>
|
|
|
|
-/* Override any GCC internal prototype to avoid an error.
|
|
- Use char because int might match the return type of a GCC
|
|
- builtin and then its argument prototype would still apply. */
|
|
-#ifdef __cplusplus
|
|
-extern "C"
|
|
-#endif
|
|
-char vmgetinfo ();
|
|
int
|
|
main ()
|
|
{
|
|
-return vmgetinfo ();
|
|
+return *(signal (0, 0)) (0) == 1;
|
|
;
|
|
return 0;
|
|
}
|
|
_ACEOF
|
|
-rm -f conftest.$ac_objext conftest$ac_exeext
|
|
-if { (ac_try="$ac_link"
|
|
-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_link") 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_exeext &&
|
|
- $as_test_x conftest$ac_exeext; then
|
|
- ac_cv_lib_perfstat_vmgetinfo=yes
|
|
+if ac_fn_c_try_compile "$LINENO"; then :
|
|
+ ac_cv_type_signal=int
|
|
else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
- ac_cv_lib_perfstat_vmgetinfo=no
|
|
+ ac_cv_type_signal=void
|
|
fi
|
|
-
|
|
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
- conftest$ac_exeext conftest.$ac_ext
|
|
-LIBS=$ac_check_lib_save_LIBS
|
|
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
fi
|
|
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_perfstat_vmgetinfo" >&5
|
|
-echo "${ECHO_T}$ac_cv_lib_perfstat_vmgetinfo" >&6; }
|
|
-if test $ac_cv_lib_perfstat_vmgetinfo = yes; then
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_signal" >&5
|
|
+$as_echo "$ac_cv_type_signal" >&6; }
|
|
|
|
-cat >>confdefs.h <<\_ACEOF
|
|
-#define HAVE_VMGETINFO 1
|
|
+cat >>confdefs.h <<_ACEOF
|
|
+#define RETSIGTYPE $ac_cv_type_signal
|
|
_ACEOF
|
|
|
|
-fi
|
|
-
|
|
|
|
-case "$host_os" in
|
|
- solaris*)
|
|
+for ac_func in strftime
|
|
+do :
|
|
+ ac_fn_c_check_func "$LINENO" "strftime" "ac_cv_func_strftime"
|
|
+if test "x$ac_cv_func_strftime" = x""yes; then :
|
|
+ cat >>confdefs.h <<_ACEOF
|
|
+#define HAVE_STRFTIME 1
|
|
+_ACEOF
|
|
|
|
-{ echo "$as_me:$LINENO: checking for kstat_open in -lkstat" >&5
|
|
-echo $ECHO_N "checking for kstat_open in -lkstat... $ECHO_C" >&6; }
|
|
-if test "${ac_cv_lib_kstat_kstat_open+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+else
|
|
+ # strftime is in -lintl on SCO UNIX.
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for strftime in -lintl" >&5
|
|
+$as_echo_n "checking for strftime in -lintl... " >&6; }
|
|
+if test "${ac_cv_lib_intl_strftime+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
ac_check_lib_save_LIBS=$LIBS
|
|
-LIBS="-lkstat $LIBS"
|
|
-cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
+LIBS="-lintl $LIBS"
|
|
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
/* end confdefs.h. */
|
|
|
|
/* Override any GCC internal prototype to avoid an error.
|
|
@@ -15784,1884 +13896,771 @@ cat >>conftest.$ac_ext <<_ACEOF
|
|
#ifdef __cplusplus
|
|
extern "C"
|
|
#endif
|
|
-char kstat_open ();
|
|
+char strftime ();
|
|
int
|
|
main ()
|
|
{
|
|
-return kstat_open ();
|
|
+return strftime ();
|
|
;
|
|
return 0;
|
|
}
|
|
_ACEOF
|
|
-rm -f conftest.$ac_objext conftest$ac_exeext
|
|
-if { (ac_try="$ac_link"
|
|
-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_link") 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_exeext &&
|
|
- $as_test_x conftest$ac_exeext; then
|
|
- ac_cv_lib_kstat_kstat_open=yes
|
|
+if ac_fn_c_try_link "$LINENO"; then :
|
|
+ ac_cv_lib_intl_strftime=yes
|
|
else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
+ ac_cv_lib_intl_strftime=no
|
|
+fi
|
|
+rm -f core conftest.err conftest.$ac_objext \
|
|
+ conftest$ac_exeext conftest.$ac_ext
|
|
+LIBS=$ac_check_lib_save_LIBS
|
|
+fi
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_strftime" >&5
|
|
+$as_echo "$ac_cv_lib_intl_strftime" >&6; }
|
|
+if test "x$ac_cv_lib_intl_strftime" = x""yes; then :
|
|
+ $as_echo "#define HAVE_STRFTIME 1" >>confdefs.h
|
|
|
|
- ac_cv_lib_kstat_kstat_open=no
|
|
+LIBS="-lintl $LIBS"
|
|
fi
|
|
|
|
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
- conftest$ac_exeext conftest.$ac_ext
|
|
-LIBS=$ac_check_lib_save_LIBS
|
|
fi
|
|
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_kstat_kstat_open" >&5
|
|
-echo "${ECHO_T}$ac_cv_lib_kstat_kstat_open" >&6; }
|
|
-if test $ac_cv_lib_kstat_kstat_open = yes; then
|
|
+done
|
|
+
|
|
+for ac_func in getcwd gettimeofday getwd putenv strdup strtoul uname
|
|
+do :
|
|
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
|
|
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
|
|
+eval as_val=\$$as_ac_var
|
|
+ if test "x$as_val" = x""yes; then :
|
|
cat >>confdefs.h <<_ACEOF
|
|
-#define HAVE_LIBKSTAT 1
|
|
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
|
|
_ACEOF
|
|
|
|
- LIBS="-lkstat $LIBS"
|
|
-
|
|
fi
|
|
+done
|
|
|
|
|
|
|
|
-for ac_func in getloadavg swapctl
|
|
-do
|
|
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
|
|
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
|
|
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
|
|
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5
|
|
+$as_echo_n "checking whether NLS is requested... " >&6; }
|
|
+ # Check whether --enable-nls was given.
|
|
+if test "${enable_nls+set}" = set; then :
|
|
+ enableval=$enable_nls; USE_NLS=$enableval
|
|
else
|
|
- cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
-/* end confdefs.h. */
|
|
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
|
|
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
|
|
-#define $ac_func innocuous_$ac_func
|
|
+ USE_NLS=yes
|
|
+fi
|
|
|
|
-/* System header to define __stub macros and hopefully few prototypes,
|
|
- which can conflict with char $ac_func (); below.
|
|
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
|
|
- <limits.h> exists even on freestanding compilers. */
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5
|
|
+$as_echo "$USE_NLS" >&6; }
|
|
|
|
-#ifdef __STDC__
|
|
-# include <limits.h>
|
|
-#else
|
|
-# include <assert.h>
|
|
-#endif
|
|
|
|
-#undef $ac_func
|
|
|
|
-/* Override any GCC internal prototype to avoid an error.
|
|
- Use char because int might match the return type of a GCC
|
|
- builtin and then its argument prototype would still apply. */
|
|
-#ifdef __cplusplus
|
|
-extern "C"
|
|
-#endif
|
|
-char $ac_func ();
|
|
-/* The GNU C library defines this for functions which it implements
|
|
- to always fail with ENOSYS. Some functions are actually named
|
|
- something starting with __ and the normal name is an alias. */
|
|
-#if defined __stub_$ac_func || defined __stub___$ac_func
|
|
-choke me
|
|
-#endif
|
|
|
|
-int
|
|
-main ()
|
|
-{
|
|
-return $ac_func ();
|
|
- ;
|
|
- return 0;
|
|
-}
|
|
-_ACEOF
|
|
-rm -f conftest.$ac_objext conftest$ac_exeext
|
|
-if { (ac_try="$ac_link"
|
|
-case "(($ac_try" in
|
|
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
- *) ac_try_echo=$ac_try;;
|
|
+case "$am__api_version" in
|
|
+ 1.01234)
|
|
+ as_fn_error "Automake 1.5 or newer is required to use intltool" "$LINENO" 5
|
|
+ ;;
|
|
+ *)
|
|
+ ;;
|
|
esac
|
|
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
- (eval "$ac_link") 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_exeext &&
|
|
- $as_test_x conftest$ac_exeext; then
|
|
- eval "$as_ac_var=yes"
|
|
-else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
|
|
- eval "$as_ac_var=no"
|
|
-fi
|
|
+if test -n "0.35.0"; then
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for intltool >= 0.35.0" >&5
|
|
+$as_echo_n "checking for intltool >= 0.35.0... " >&6; }
|
|
|
|
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
- conftest$ac_exeext conftest.$ac_ext
|
|
-fi
|
|
-ac_res=`eval echo '${'$as_ac_var'}'`
|
|
- { echo "$as_me:$LINENO: result: $ac_res" >&5
|
|
-echo "${ECHO_T}$ac_res" >&6; }
|
|
-if test `eval echo '${'$as_ac_var'}'` = yes; then
|
|
- cat >>confdefs.h <<_ACEOF
|
|
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
|
|
-_ACEOF
|
|
+ INTLTOOL_REQUIRED_VERSION_AS_INT=`echo 0.35.0 | 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:${as_lineno-$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_fn_error "Your intltool is too old. You need intltool 0.35.0 or later." "$LINENO" 5
|
|
fi
|
|
-done
|
|
|
|
-
|
|
-
|
|
-for ac_header in procfs.h sys/procfs.h
|
|
-do
|
|
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
|
|
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
|
|
- { echo "$as_me:$LINENO: checking for $ac_header" >&5
|
|
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
|
|
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
-fi
|
|
-ac_res=`eval echo '${'$as_ac_Header'}'`
|
|
- { echo "$as_me:$LINENO: result: $ac_res" >&5
|
|
-echo "${ECHO_T}$ac_res" >&6; }
|
|
+# 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:${as_lineno-$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
|
|
- # Is the header compilable?
|
|
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
|
|
-echo $ECHO_N "checking $ac_header usability... $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. */
|
|
-$ac_includes_default
|
|
-#include <$ac_header>
|
|
-_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;;
|
|
+ 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:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
+ break 2
|
|
+ fi
|
|
+done
|
|
+ done
|
|
+IFS=$as_save_IFS
|
|
+
|
|
+ ;;
|
|
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
|
|
- ac_header_compiler=yes
|
|
+fi
|
|
+INTLTOOL_UPDATE=$ac_cv_path_INTLTOOL_UPDATE
|
|
+if test -n "$INTLTOOL_UPDATE"; then
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_UPDATE" >&5
|
|
+$as_echo "$INTLTOOL_UPDATE" >&6; }
|
|
else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
- ac_header_compiler=no
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
+$as_echo "no" >&6; }
|
|
fi
|
|
|
|
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
|
|
-echo "${ECHO_T}$ac_header_compiler" >&6; }
|
|
|
|
-# Is the header present?
|
|
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
|
|
-echo $ECHO_N "checking $ac_header presence... $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. */
|
|
-#include <$ac_header>
|
|
-_ACEOF
|
|
-if { (ac_try="$ac_cpp conftest.$ac_ext"
|
|
-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_cpp conftest.$ac_ext") 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); } >/dev/null && {
|
|
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
|
|
- test ! -s conftest.err
|
|
- }; then
|
|
- ac_header_preproc=yes
|
|
+# 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:${as_lineno-$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
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
+ 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:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
+ break 2
|
|
+ fi
|
|
+done
|
|
+ done
|
|
+IFS=$as_save_IFS
|
|
|
|
- ac_header_preproc=no
|
|
+ ;;
|
|
+esac
|
|
+fi
|
|
+INTLTOOL_MERGE=$ac_cv_path_INTLTOOL_MERGE
|
|
+if test -n "$INTLTOOL_MERGE"; then
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_MERGE" >&5
|
|
+$as_echo "$INTLTOOL_MERGE" >&6; }
|
|
+else
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
+$as_echo "no" >&6; }
|
|
fi
|
|
|
|
-rm -f conftest.err conftest.$ac_ext
|
|
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
|
|
-echo "${ECHO_T}$ac_header_preproc" >&6; }
|
|
|
|
-# So? What about this header?
|
|
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
|
|
- yes:no: )
|
|
- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
|
|
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
|
|
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
|
|
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
|
|
- ac_header_preproc=yes
|
|
- ;;
|
|
- no:yes:* )
|
|
- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
|
|
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
|
|
- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
|
|
-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
|
|
- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
|
|
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
|
|
- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
|
|
-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
|
|
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
|
|
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
|
|
- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
|
|
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
|
|
- ( cat <<\_ASBOX
|
|
-## ---------------------------------------------------------------------- ##
|
|
-## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=libgtop ##
|
|
-## ---------------------------------------------------------------------- ##
|
|
-_ASBOX
|
|
- ) | sed "s/^/$as_me: WARNING: /" >&2
|
|
- ;;
|
|
+# 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:${as_lineno-$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:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
+ break 2
|
|
+ fi
|
|
+done
|
|
+ done
|
|
+IFS=$as_save_IFS
|
|
+
|
|
+ ;;
|
|
esac
|
|
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
|
|
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
|
|
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+fi
|
|
+INTLTOOL_EXTRACT=$ac_cv_path_INTLTOOL_EXTRACT
|
|
+if test -n "$INTLTOOL_EXTRACT"; then
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_EXTRACT" >&5
|
|
+$as_echo "$INTLTOOL_EXTRACT" >&6; }
|
|
else
|
|
- eval "$as_ac_Header=\$ac_header_preproc"
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
+$as_echo "no" >&6; }
|
|
fi
|
|
-ac_res=`eval echo '${'$as_ac_Header'}'`
|
|
- { echo "$as_me:$LINENO: result: $ac_res" >&5
|
|
-echo "${ECHO_T}$ac_res" >&6; }
|
|
|
|
-fi
|
|
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
|
|
- cat >>confdefs.h <<_ACEOF
|
|
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
|
|
-_ACEOF
|
|
- break
|
|
+
|
|
+if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then
|
|
+ as_fn_error "The intltool scripts were not found. Please install intltool." "$LINENO" 5
|
|
fi
|
|
|
|
-done
|
|
+ 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 $< $@'
|
|
|
|
|
|
|
|
- case $host_os in
|
|
- solaris[8-9] | solaris2.[0-9].*)
|
|
- { echo "$as_me:$LINENO: checking for kvm_open in -lkvm" >&5
|
|
-echo $ECHO_N "checking for kvm_open in -lkvm... $ECHO_C" >&6; }
|
|
-if test "${ac_cv_lib_kvm_kvm_open+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
-else
|
|
- ac_check_lib_save_LIBS=$LIBS
|
|
-LIBS="-lkvm $LIBS"
|
|
-cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
-/* end confdefs.h. */
|
|
|
|
-/* Override any GCC internal prototype to avoid an error.
|
|
- Use char because int might match the return type of a GCC
|
|
- builtin and then its argument prototype would still apply. */
|
|
-#ifdef __cplusplus
|
|
-extern "C"
|
|
-#endif
|
|
-char kvm_open ();
|
|
-int
|
|
-main ()
|
|
-{
|
|
-return kvm_open ();
|
|
- ;
|
|
- return 0;
|
|
-}
|
|
-_ACEOF
|
|
-rm -f conftest.$ac_objext conftest$ac_exeext
|
|
-if { (ac_try="$ac_link"
|
|
-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_link") 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_exeext &&
|
|
- $as_test_x conftest$ac_exeext; then
|
|
- ac_cv_lib_kvm_kvm_open=yes
|
|
-else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
|
|
- ac_cv_lib_kvm_kvm_open=no
|
|
-fi
|
|
|
|
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
- conftest$ac_exeext conftest.$ac_ext
|
|
-LIBS=$ac_check_lib_save_LIBS
|
|
-fi
|
|
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_kvm_kvm_open" >&5
|
|
-echo "${ECHO_T}$ac_cv_lib_kvm_kvm_open" >&6; }
|
|
-if test $ac_cv_lib_kvm_kvm_open = yes; then
|
|
|
|
- LIBS="-lkvm $LIBS"
|
|
|
|
-else
|
|
- { echo "$as_me:$LINENO: checking for kvm_open in -lkvm with -lelf" >&5
|
|
-echo $ECHO_N "checking for kvm_open in -lkvm with -lelf... $ECHO_C" >&6; }
|
|
- if test "${ac_cv_lib_kvm_with_elf+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
-else
|
|
- ac_save_LIBS="$LIBS"
|
|
- LIBS="-lkvm -lelf $LIBS"
|
|
- cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
-/* end confdefs.h. */
|
|
-char kvm_open();
|
|
-int
|
|
-main ()
|
|
-{
|
|
-kvm_open()
|
|
- ;
|
|
- return 0;
|
|
-}
|
|
-_ACEOF
|
|
-rm -f conftest.$ac_objext conftest$ac_exeext
|
|
-if { (ac_try="$ac_link"
|
|
-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_link") 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_exeext &&
|
|
- $as_test_x conftest$ac_exeext; then
|
|
- ac_cv_lib_kvm_with_elf=yes
|
|
-else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
|
|
- ac_cv_lib_kvm_with_elf=no
|
|
-fi
|
|
|
|
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
- conftest$ac_exeext conftest.$ac_ext
|
|
- LIBS="$ac_save_LIBS"
|
|
|
|
-fi
|
|
|
|
- if test "$ac_cv_lib_kvm_with_elf" = "yes"; then
|
|
- { echo "$as_me:$LINENO: result: yes" >&5
|
|
-echo "${ECHO_T}yes" >&6; }
|
|
- LIBS="-lkvm -lelf $LIBS"
|
|
- else
|
|
- { echo "$as_me:$LINENO: result: no" >&5
|
|
-echo "${ECHO_T}no" >&6; }
|
|
- fi
|
|
|
|
-fi
|
|
|
|
- ;;
|
|
- esac
|
|
- ;;
|
|
-esac
|
|
|
|
|
|
-{ echo "$as_me:$LINENO: checking for vm_statistics in -lmach" >&5
|
|
-echo $ECHO_N "checking for vm_statistics in -lmach... $ECHO_C" >&6; }
|
|
-if test "${ac_cv_lib_mach_vm_statistics+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
-else
|
|
- ac_check_lib_save_LIBS=$LIBS
|
|
-LIBS="-lmach $LIBS"
|
|
-cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
-/* end confdefs.h. */
|
|
|
|
-/* Override any GCC internal prototype to avoid an error.
|
|
- Use char because int might match the return type of a GCC
|
|
- builtin and then its argument prototype would still apply. */
|
|
-#ifdef __cplusplus
|
|
-extern "C"
|
|
-#endif
|
|
-char vm_statistics ();
|
|
-int
|
|
-main ()
|
|
-{
|
|
-return vm_statistics ();
|
|
- ;
|
|
- return 0;
|
|
-}
|
|
-_ACEOF
|
|
-rm -f conftest.$ac_objext conftest$ac_exeext
|
|
-if { (ac_try="$ac_link"
|
|
-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_link") 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_exeext &&
|
|
- $as_test_x conftest$ac_exeext; then
|
|
- ac_cv_lib_mach_vm_statistics=yes
|
|
-else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
|
|
- ac_cv_lib_mach_vm_statistics=no
|
|
-fi
|
|
|
|
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
- conftest$ac_exeext conftest.$ac_ext
|
|
-LIBS=$ac_check_lib_save_LIBS
|
|
-fi
|
|
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_mach_vm_statistics" >&5
|
|
-echo "${ECHO_T}$ac_cv_lib_mach_vm_statistics" >&6; }
|
|
-if test $ac_cv_lib_mach_vm_statistics = yes; then
|
|
- cat >>confdefs.h <<_ACEOF
|
|
-#define HAVE_LIBMACH 1
|
|
-_ACEOF
|
|
|
|
- LIBS="-lmach $LIBS"
|
|
|
|
-fi
|
|
|
|
|
|
-saved_CFLAGS=$CFLAGS
|
|
-CFLAGS="$CFLAGS -D_GNU_SOURCE"
|
|
-{ echo "$as_me:$LINENO: checking whether program_invocation_name must be declared" >&5
|
|
-echo $ECHO_N "checking whether program_invocation_name must be declared... $ECHO_C" >&6; }
|
|
-if test "${gcc_cv_decl_needed_program_invocation_name+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
-else
|
|
- cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
-/* end confdefs.h. */
|
|
|
|
-#include <stdio.h>
|
|
-#ifdef HAVE_STRING_H
|
|
-#include <string.h>
|
|
-#else
|
|
-#ifdef HAVE_STRINGS_H
|
|
-#include <strings.h>
|
|
-#endif
|
|
-#endif
|
|
-#ifdef HAVE_STDLIB_H
|
|
-#include <stdlib.h>
|
|
-#endif
|
|
-#ifdef HAVE_UNISTD_H
|
|
-#include <unistd.h>
|
|
-#endif
|
|
|
|
-#include <errno.h>
|
|
-#include <stdio.h>
|
|
-#include <stdlib.h>
|
|
-#include <string.h>
|
|
|
|
-int
|
|
-main ()
|
|
-{
|
|
-char *(*pfn) = (char *(*)) program_invocation_name
|
|
- ;
|
|
- 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
|
|
- eval "gcc_cv_decl_needed_program_invocation_name=no"
|
|
-else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
|
|
- eval "gcc_cv_decl_needed_program_invocation_name=yes"
|
|
-fi
|
|
|
|
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
-fi
|
|
|
|
-if eval "test \"`echo '$gcc_cv_decl_needed_'program_invocation_name`\" = yes"; then
|
|
- { echo "$as_me:$LINENO: result: yes" >&5
|
|
-echo "${ECHO_T}yes" >&6; }
|
|
- gcc_need_declarations="$gcc_need_declarations program_invocation_name"
|
|
- gcc_tr_decl=NEED_DECLARATION_`echo program_invocation_name | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
|
|
|
|
-cat >>confdefs.h <<_ACEOF
|
|
-#define $gcc_tr_decl 1
|
|
-_ACEOF
|
|
|
|
-else
|
|
- { echo "$as_me:$LINENO: result: no" >&5
|
|
-echo "${ECHO_T}no" >&6; }
|
|
-fi
|
|
|
|
|
|
-CFLAGS=$saved_CFLAGS
|
|
|
|
-{ echo "$as_me:$LINENO: checking for socket" >&5
|
|
-echo $ECHO_N "checking for socket... $ECHO_C" >&6; }
|
|
-if test "${ac_cv_func_socket+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
-else
|
|
- cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
-/* end confdefs.h. */
|
|
-/* Define socket to an innocuous variant, in case <limits.h> declares socket.
|
|
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
|
|
-#define socket innocuous_socket
|
|
|
|
-/* System header to define __stub macros and hopefully few prototypes,
|
|
- which can conflict with char socket (); below.
|
|
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
|
|
- <limits.h> exists even on freestanding compilers. */
|
|
|
|
-#ifdef __STDC__
|
|
-# include <limits.h>
|
|
-#else
|
|
-# include <assert.h>
|
|
-#endif
|
|
|
|
-#undef socket
|
|
|
|
-/* Override any GCC internal prototype to avoid an error.
|
|
- Use char because int might match the return type of a GCC
|
|
- builtin and then its argument prototype would still apply. */
|
|
-#ifdef __cplusplus
|
|
-extern "C"
|
|
-#endif
|
|
-char socket ();
|
|
-/* The GNU C library defines this for functions which it implements
|
|
- to always fail with ENOSYS. Some functions are actually named
|
|
- something starting with __ and the normal name is an alias. */
|
|
-#if defined __stub_socket || defined __stub___socket
|
|
-choke me
|
|
-#endif
|
|
|
|
-int
|
|
-main ()
|
|
-{
|
|
-return socket ();
|
|
- ;
|
|
- return 0;
|
|
-}
|
|
-_ACEOF
|
|
-rm -f conftest.$ac_objext conftest$ac_exeext
|
|
-if { (ac_try="$ac_link"
|
|
-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_link") 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_exeext &&
|
|
- $as_test_x conftest$ac_exeext; then
|
|
- ac_cv_func_socket=yes
|
|
-else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
|
|
- ac_cv_func_socket=no
|
|
-fi
|
|
|
|
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
- conftest$ac_exeext conftest.$ac_ext
|
|
-fi
|
|
-{ echo "$as_me:$LINENO: result: $ac_cv_func_socket" >&5
|
|
-echo "${ECHO_T}$ac_cv_func_socket" >&6; }
|
|
-if test $ac_cv_func_socket = yes; then
|
|
- if test "${ac_cv_header_netinet_in_h+set}" = set; then
|
|
- { echo "$as_me:$LINENO: checking for netinet/in.h" >&5
|
|
-echo $ECHO_N "checking for netinet/in.h... $ECHO_C" >&6; }
|
|
-if test "${ac_cv_header_netinet_in_h+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
-fi
|
|
-{ echo "$as_me:$LINENO: result: $ac_cv_header_netinet_in_h" >&5
|
|
-echo "${ECHO_T}$ac_cv_header_netinet_in_h" >&6; }
|
|
-else
|
|
- # Is the header compilable?
|
|
-{ echo "$as_me:$LINENO: checking netinet/in.h usability" >&5
|
|
-echo $ECHO_N "checking netinet/in.h usability... $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. */
|
|
-$ac_includes_default
|
|
-#include <netinet/in.h>
|
|
-_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
|
|
- ac_header_compiler=yes
|
|
-else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
|
|
- ac_header_compiler=no
|
|
-fi
|
|
|
|
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
|
|
-echo "${ECHO_T}$ac_header_compiler" >&6; }
|
|
|
|
-# Is the header present?
|
|
-{ echo "$as_me:$LINENO: checking netinet/in.h presence" >&5
|
|
-echo $ECHO_N "checking netinet/in.h presence... $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. */
|
|
-#include <netinet/in.h>
|
|
-_ACEOF
|
|
-if { (ac_try="$ac_cpp conftest.$ac_ext"
|
|
-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_cpp conftest.$ac_ext") 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); } >/dev/null && {
|
|
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
|
|
- test ! -s conftest.err
|
|
- }; then
|
|
- ac_header_preproc=yes
|
|
-else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
|
|
- ac_header_preproc=no
|
|
-fi
|
|
|
|
-rm -f conftest.err conftest.$ac_ext
|
|
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
|
|
-echo "${ECHO_T}$ac_header_preproc" >&6; }
|
|
|
|
-# So? What about this header?
|
|
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
|
|
- yes:no: )
|
|
- { echo "$as_me:$LINENO: WARNING: netinet/in.h: accepted by the compiler, rejected by the preprocessor!" >&5
|
|
-echo "$as_me: WARNING: netinet/in.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
|
|
- { echo "$as_me:$LINENO: WARNING: netinet/in.h: proceeding with the compiler's result" >&5
|
|
-echo "$as_me: WARNING: netinet/in.h: proceeding with the compiler's result" >&2;}
|
|
- ac_header_preproc=yes
|
|
- ;;
|
|
- no:yes:* )
|
|
- { echo "$as_me:$LINENO: WARNING: netinet/in.h: present but cannot be compiled" >&5
|
|
-echo "$as_me: WARNING: netinet/in.h: present but cannot be compiled" >&2;}
|
|
- { echo "$as_me:$LINENO: WARNING: netinet/in.h: check for missing prerequisite headers?" >&5
|
|
-echo "$as_me: WARNING: netinet/in.h: check for missing prerequisite headers?" >&2;}
|
|
- { echo "$as_me:$LINENO: WARNING: netinet/in.h: see the Autoconf documentation" >&5
|
|
-echo "$as_me: WARNING: netinet/in.h: see the Autoconf documentation" >&2;}
|
|
- { echo "$as_me:$LINENO: WARNING: netinet/in.h: section \"Present But Cannot Be Compiled\"" >&5
|
|
-echo "$as_me: WARNING: netinet/in.h: section \"Present But Cannot Be Compiled\"" >&2;}
|
|
- { echo "$as_me:$LINENO: WARNING: netinet/in.h: proceeding with the preprocessor's result" >&5
|
|
-echo "$as_me: WARNING: netinet/in.h: proceeding with the preprocessor's result" >&2;}
|
|
- { echo "$as_me:$LINENO: WARNING: netinet/in.h: in the future, the compiler will take precedence" >&5
|
|
-echo "$as_me: WARNING: netinet/in.h: in the future, the compiler will take precedence" >&2;}
|
|
- ( cat <<\_ASBOX
|
|
-## ---------------------------------------------------------------------- ##
|
|
-## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=libgtop ##
|
|
-## ---------------------------------------------------------------------- ##
|
|
-_ASBOX
|
|
- ) | sed "s/^/$as_me: WARNING: /" >&2
|
|
- ;;
|
|
-esac
|
|
-{ echo "$as_me:$LINENO: checking for netinet/in.h" >&5
|
|
-echo $ECHO_N "checking for netinet/in.h... $ECHO_C" >&6; }
|
|
-if test "${ac_cv_header_netinet_in_h+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
-else
|
|
- ac_cv_header_netinet_in_h=$ac_header_preproc
|
|
-fi
|
|
-{ echo "$as_me:$LINENO: result: $ac_cv_header_netinet_in_h" >&5
|
|
-echo "${ECHO_T}$ac_cv_header_netinet_in_h" >&6; }
|
|
-
|
|
-fi
|
|
-if test $ac_cv_header_netinet_in_h = yes; then
|
|
- if test "${ac_cv_header_arpa_inet_h+set}" = set; then
|
|
- { echo "$as_me:$LINENO: checking for arpa/inet.h" >&5
|
|
-echo $ECHO_N "checking for arpa/inet.h... $ECHO_C" >&6; }
|
|
-if test "${ac_cv_header_arpa_inet_h+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
-fi
|
|
-{ echo "$as_me:$LINENO: result: $ac_cv_header_arpa_inet_h" >&5
|
|
-echo "${ECHO_T}$ac_cv_header_arpa_inet_h" >&6; }
|
|
-else
|
|
- # Is the header compilable?
|
|
-{ echo "$as_me:$LINENO: checking arpa/inet.h usability" >&5
|
|
-echo $ECHO_N "checking arpa/inet.h usability... $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. */
|
|
-$ac_includes_default
|
|
-#include <arpa/inet.h>
|
|
-_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
|
|
- ac_header_compiler=yes
|
|
-else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
|
|
- ac_header_compiler=no
|
|
-fi
|
|
|
|
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
|
|
-echo "${ECHO_T}$ac_header_compiler" >&6; }
|
|
|
|
-# Is the header present?
|
|
-{ echo "$as_me:$LINENO: checking arpa/inet.h presence" >&5
|
|
-echo $ECHO_N "checking arpa/inet.h presence... $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. */
|
|
-#include <arpa/inet.h>
|
|
-_ACEOF
|
|
-if { (ac_try="$ac_cpp conftest.$ac_ext"
|
|
-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_cpp conftest.$ac_ext") 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); } >/dev/null && {
|
|
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
|
|
- test ! -s conftest.err
|
|
- }; then
|
|
- ac_header_preproc=yes
|
|
-else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
|
|
- ac_header_preproc=no
|
|
-fi
|
|
|
|
-rm -f conftest.err conftest.$ac_ext
|
|
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
|
|
-echo "${ECHO_T}$ac_header_preproc" >&6; }
|
|
|
|
-# So? What about this header?
|
|
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
|
|
- yes:no: )
|
|
- { echo "$as_me:$LINENO: WARNING: arpa/inet.h: accepted by the compiler, rejected by the preprocessor!" >&5
|
|
-echo "$as_me: WARNING: arpa/inet.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
|
|
- { echo "$as_me:$LINENO: WARNING: arpa/inet.h: proceeding with the compiler's result" >&5
|
|
-echo "$as_me: WARNING: arpa/inet.h: proceeding with the compiler's result" >&2;}
|
|
- ac_header_preproc=yes
|
|
- ;;
|
|
- no:yes:* )
|
|
- { echo "$as_me:$LINENO: WARNING: arpa/inet.h: present but cannot be compiled" >&5
|
|
-echo "$as_me: WARNING: arpa/inet.h: present but cannot be compiled" >&2;}
|
|
- { echo "$as_me:$LINENO: WARNING: arpa/inet.h: check for missing prerequisite headers?" >&5
|
|
-echo "$as_me: WARNING: arpa/inet.h: check for missing prerequisite headers?" >&2;}
|
|
- { echo "$as_me:$LINENO: WARNING: arpa/inet.h: see the Autoconf documentation" >&5
|
|
-echo "$as_me: WARNING: arpa/inet.h: see the Autoconf documentation" >&2;}
|
|
- { echo "$as_me:$LINENO: WARNING: arpa/inet.h: section \"Present But Cannot Be Compiled\"" >&5
|
|
-echo "$as_me: WARNING: arpa/inet.h: section \"Present But Cannot Be Compiled\"" >&2;}
|
|
- { echo "$as_me:$LINENO: WARNING: arpa/inet.h: proceeding with the preprocessor's result" >&5
|
|
-echo "$as_me: WARNING: arpa/inet.h: proceeding with the preprocessor's result" >&2;}
|
|
- { echo "$as_me:$LINENO: WARNING: arpa/inet.h: in the future, the compiler will take precedence" >&5
|
|
-echo "$as_me: WARNING: arpa/inet.h: in the future, the compiler will take precedence" >&2;}
|
|
- ( cat <<\_ASBOX
|
|
-## ---------------------------------------------------------------------- ##
|
|
-## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=libgtop ##
|
|
-## ---------------------------------------------------------------------- ##
|
|
-_ASBOX
|
|
- ) | sed "s/^/$as_me: WARNING: /" >&2
|
|
- ;;
|
|
-esac
|
|
-{ echo "$as_me:$LINENO: checking for arpa/inet.h" >&5
|
|
-echo $ECHO_N "checking for arpa/inet.h... $ECHO_C" >&6; }
|
|
-if test "${ac_cv_header_arpa_inet_h+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
-else
|
|
- ac_cv_header_arpa_inet_h=$ac_header_preproc
|
|
-fi
|
|
-{ echo "$as_me:$LINENO: result: $ac_cv_header_arpa_inet_h" >&5
|
|
-echo "${ECHO_T}$ac_cv_header_arpa_inet_h" >&6; }
|
|
|
|
-fi
|
|
-if test $ac_cv_header_arpa_inet_h = yes; then
|
|
|
|
|
|
-cat >>confdefs.h <<\_ACEOF
|
|
-#define HAVE_SOCKETS 1
|
|
-_ACEOF
|
|
|
|
- { echo "$as_me:$LINENO: checking \"for sun_len member in struct sockaddr_un\"" >&5
|
|
-echo $ECHO_N "checking \"for sun_len member in struct sockaddr_un\"... $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. */
|
|
|
|
-#include <sys/types.h>
|
|
-#include <sys/socket.h>
|
|
-#include <sys/un.h>
|
|
|
|
-int
|
|
-main ()
|
|
-{
|
|
-static struct sockaddr_un x; x.sun_len = 1;
|
|
- ;
|
|
- return 0;
|
|
-}
|
|
-_ACEOF
|
|
-rm -f conftest.$ac_objext conftest$ac_exeext
|
|
-if { (ac_try="$ac_link"
|
|
-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_link") 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_exeext &&
|
|
- $as_test_x conftest$ac_exeext; then
|
|
- { echo "$as_me:$LINENO: result: yes" >&5
|
|
-echo "${ECHO_T}yes" >&6; };
|
|
-cat >>confdefs.h <<\_ACEOF
|
|
-#define HAVE_SOCKADDR_SUN_LEN 1
|
|
-_ACEOF
|
|
|
|
-else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
|
|
- { echo "$as_me:$LINENO: result: no" >&5
|
|
-echo "${ECHO_T}no" >&6; }
|
|
-fi
|
|
|
|
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
- conftest$ac_exeext conftest.$ac_ext
|
|
-fi
|
|
|
|
|
|
-fi
|
|
|
|
|
|
-fi
|
|
|
|
|
|
-# The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
|
|
-# for constant arguments. Useless!
|
|
-{ echo "$as_me:$LINENO: checking for working alloca.h" >&5
|
|
-echo $ECHO_N "checking for working alloca.h... $ECHO_C" >&6; }
|
|
-if test "${ac_cv_working_alloca_h+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
-else
|
|
- cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
-/* end confdefs.h. */
|
|
-#include <alloca.h>
|
|
-int
|
|
-main ()
|
|
-{
|
|
-char *p = (char *) alloca (2 * sizeof (int));
|
|
- if (p) return 0;
|
|
- ;
|
|
- return 0;
|
|
-}
|
|
-_ACEOF
|
|
-rm -f conftest.$ac_objext conftest$ac_exeext
|
|
-if { (ac_try="$ac_link"
|
|
-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_link") 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_exeext &&
|
|
- $as_test_x conftest$ac_exeext; then
|
|
- ac_cv_working_alloca_h=yes
|
|
-else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
|
|
- ac_cv_working_alloca_h=no
|
|
-fi
|
|
|
|
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
- conftest$ac_exeext conftest.$ac_ext
|
|
-fi
|
|
-{ echo "$as_me:$LINENO: result: $ac_cv_working_alloca_h" >&5
|
|
-echo "${ECHO_T}$ac_cv_working_alloca_h" >&6; }
|
|
-if test $ac_cv_working_alloca_h = yes; then
|
|
|
|
-cat >>confdefs.h <<\_ACEOF
|
|
-#define HAVE_ALLOCA_H 1
|
|
-_ACEOF
|
|
|
|
-fi
|
|
|
|
-{ echo "$as_me:$LINENO: checking for alloca" >&5
|
|
-echo $ECHO_N "checking for alloca... $ECHO_C" >&6; }
|
|
-if test "${ac_cv_func_alloca_works+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
-else
|
|
- cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
-/* end confdefs.h. */
|
|
-#ifdef __GNUC__
|
|
-# define alloca __builtin_alloca
|
|
-#else
|
|
-# ifdef _MSC_VER
|
|
-# include <malloc.h>
|
|
-# define alloca _alloca
|
|
-# else
|
|
-# ifdef HAVE_ALLOCA_H
|
|
-# include <alloca.h>
|
|
-# else
|
|
-# ifdef _AIX
|
|
- #pragma alloca
|
|
-# else
|
|
-# ifndef alloca /* predefined by HP cc +Olibcalls */
|
|
-char *alloca ();
|
|
-# endif
|
|
-# endif
|
|
-# endif
|
|
-# endif
|
|
-#endif
|
|
|
|
-int
|
|
-main ()
|
|
-{
|
|
-char *p = (char *) alloca (1);
|
|
- if (p) return 0;
|
|
- ;
|
|
- return 0;
|
|
-}
|
|
-_ACEOF
|
|
-rm -f conftest.$ac_objext conftest$ac_exeext
|
|
-if { (ac_try="$ac_link"
|
|
-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_link") 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_exeext &&
|
|
- $as_test_x conftest$ac_exeext; then
|
|
- ac_cv_func_alloca_works=yes
|
|
-else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
|
|
- ac_cv_func_alloca_works=no
|
|
-fi
|
|
|
|
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
- conftest$ac_exeext conftest.$ac_ext
|
|
-fi
|
|
-{ echo "$as_me:$LINENO: result: $ac_cv_func_alloca_works" >&5
|
|
-echo "${ECHO_T}$ac_cv_func_alloca_works" >&6; }
|
|
|
|
-if test $ac_cv_func_alloca_works = yes; then
|
|
|
|
-cat >>confdefs.h <<\_ACEOF
|
|
-#define HAVE_ALLOCA 1
|
|
-_ACEOF
|
|
|
|
-else
|
|
- # The SVR3 libPW and SVR4 libucb both contain incompatible functions
|
|
-# that cause trouble. Some versions do not even contain alloca or
|
|
-# contain a buggy version. If you still want to use their alloca,
|
|
-# use ar to extract alloca.o from them instead of compiling alloca.c.
|
|
|
|
-ALLOCA=\${LIBOBJDIR}alloca.$ac_objext
|
|
|
|
-cat >>confdefs.h <<\_ACEOF
|
|
-#define C_ALLOCA 1
|
|
-_ACEOF
|
|
|
|
|
|
-{ echo "$as_me:$LINENO: checking whether \`alloca.c' needs Cray hooks" >&5
|
|
-echo $ECHO_N "checking whether \`alloca.c' needs Cray hooks... $ECHO_C" >&6; }
|
|
-if test "${ac_cv_os_cray+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
-else
|
|
- cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
-/* end confdefs.h. */
|
|
-#if defined CRAY && ! defined CRAY2
|
|
-webecray
|
|
-#else
|
|
-wenotbecray
|
|
-#endif
|
|
|
|
-_ACEOF
|
|
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
|
|
- $EGREP "webecray" >/dev/null 2>&1; then
|
|
- ac_cv_os_cray=yes
|
|
-else
|
|
- ac_cv_os_cray=no
|
|
-fi
|
|
-rm -f conftest*
|
|
|
|
-fi
|
|
-{ echo "$as_me:$LINENO: result: $ac_cv_os_cray" >&5
|
|
-echo "${ECHO_T}$ac_cv_os_cray" >&6; }
|
|
-if test $ac_cv_os_cray = yes; then
|
|
- for ac_func in _getb67 GETB67 getb67; do
|
|
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
|
|
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
|
|
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
|
|
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
-else
|
|
- cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
-/* end confdefs.h. */
|
|
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
|
|
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
|
|
-#define $ac_func innocuous_$ac_func
|
|
|
|
-/* System header to define __stub macros and hopefully few prototypes,
|
|
- which can conflict with char $ac_func (); below.
|
|
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
|
|
- <limits.h> exists even on freestanding compilers. */
|
|
|
|
-#ifdef __STDC__
|
|
-# include <limits.h>
|
|
-#else
|
|
-# include <assert.h>
|
|
-#endif
|
|
|
|
-#undef $ac_func
|
|
|
|
-/* Override any GCC internal prototype to avoid an error.
|
|
- Use char because int might match the return type of a GCC
|
|
- builtin and then its argument prototype would still apply. */
|
|
-#ifdef __cplusplus
|
|
-extern "C"
|
|
-#endif
|
|
-char $ac_func ();
|
|
-/* The GNU C library defines this for functions which it implements
|
|
- to always fail with ENOSYS. Some functions are actually named
|
|
- something starting with __ and the normal name is an alias. */
|
|
-#if defined __stub_$ac_func || defined __stub___$ac_func
|
|
-choke me
|
|
-#endif
|
|
|
|
-int
|
|
-main ()
|
|
-{
|
|
-return $ac_func ();
|
|
- ;
|
|
- return 0;
|
|
-}
|
|
-_ACEOF
|
|
-rm -f conftest.$ac_objext conftest$ac_exeext
|
|
-if { (ac_try="$ac_link"
|
|
-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_link") 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_exeext &&
|
|
- $as_test_x conftest$ac_exeext; then
|
|
- eval "$as_ac_var=yes"
|
|
-else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
|
|
- eval "$as_ac_var=no"
|
|
-fi
|
|
|
|
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
- conftest$ac_exeext conftest.$ac_ext
|
|
-fi
|
|
-ac_res=`eval echo '${'$as_ac_var'}'`
|
|
- { echo "$as_me:$LINENO: result: $ac_res" >&5
|
|
-echo "${ECHO_T}$ac_res" >&6; }
|
|
-if test `eval echo '${'$as_ac_var'}'` = yes; then
|
|
|
|
-cat >>confdefs.h <<_ACEOF
|
|
-#define CRAY_STACKSEG_END $ac_func
|
|
-_ACEOF
|
|
|
|
- break
|
|
-fi
|
|
|
|
- done
|
|
-fi
|
|
|
|
-{ echo "$as_me:$LINENO: checking stack direction for C alloca" >&5
|
|
-echo $ECHO_N "checking stack direction for C alloca... $ECHO_C" >&6; }
|
|
-if test "${ac_cv_c_stack_direction+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
-else
|
|
- if test "$cross_compiling" = yes; then
|
|
- ac_cv_c_stack_direction=0
|
|
-else
|
|
- cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
-/* end confdefs.h. */
|
|
-$ac_includes_default
|
|
-int
|
|
-find_stack_direction ()
|
|
-{
|
|
- static char *addr = 0;
|
|
- auto char dummy;
|
|
- if (addr == 0)
|
|
- {
|
|
- addr = &dummy;
|
|
- return find_stack_direction ();
|
|
- }
|
|
- else
|
|
- return (&dummy > addr) ? 1 : -1;
|
|
-}
|
|
|
|
-int
|
|
-main ()
|
|
-{
|
|
- return find_stack_direction () < 0;
|
|
-}
|
|
-_ACEOF
|
|
-rm -f conftest$ac_exeext
|
|
-if { (ac_try="$ac_link"
|
|
-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_link") 2>&5
|
|
- ac_status=$?
|
|
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
|
|
- { (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_try") 2>&5
|
|
- ac_status=$?
|
|
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
- (exit $ac_status); }; }; then
|
|
- ac_cv_c_stack_direction=1
|
|
+# Check the gettext tools to make sure they are GNU
|
|
+# Extract the first word of "xgettext", so it can be a program name with args.
|
|
+set dummy xgettext; ac_word=$2
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
|
+$as_echo_n "checking for $ac_word... " >&6; }
|
|
+if test "${ac_cv_path_XGETTEXT+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
- echo "$as_me: program exited with status $ac_status" >&5
|
|
-echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
+ case $XGETTEXT in
|
|
+ [\\/]* | ?:[\\/]*)
|
|
+ ac_cv_path_XGETTEXT="$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_XGETTEXT="$as_dir/$ac_word$ac_exec_ext"
|
|
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
+ break 2
|
|
+ fi
|
|
+done
|
|
+ done
|
|
+IFS=$as_save_IFS
|
|
|
|
-( exit $ac_status )
|
|
-ac_cv_c_stack_direction=-1
|
|
-fi
|
|
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
|
|
+ ;;
|
|
+esac
|
|
fi
|
|
-
|
|
-
|
|
+XGETTEXT=$ac_cv_path_XGETTEXT
|
|
+if test -n "$XGETTEXT"; then
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5
|
|
+$as_echo "$XGETTEXT" >&6; }
|
|
+else
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
+$as_echo "no" >&6; }
|
|
fi
|
|
-{ echo "$as_me:$LINENO: result: $ac_cv_c_stack_direction" >&5
|
|
-echo "${ECHO_T}$ac_cv_c_stack_direction" >&6; }
|
|
|
|
-cat >>confdefs.h <<_ACEOF
|
|
-#define STACK_DIRECTION $ac_cv_c_stack_direction
|
|
-_ACEOF
|
|
|
|
+# Extract the first word of "msgmerge", so it can be a program name with args.
|
|
+set dummy msgmerge; ac_word=$2
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
|
+$as_echo_n "checking for $ac_word... " >&6; }
|
|
+if test "${ac_cv_path_MSGMERGE+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
+else
|
|
+ case $MSGMERGE in
|
|
+ [\\/]* | ?:[\\/]*)
|
|
+ ac_cv_path_MSGMERGE="$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_MSGMERGE="$as_dir/$ac_word$ac_exec_ext"
|
|
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
+ break 2
|
|
+ fi
|
|
+done
|
|
+ done
|
|
+IFS=$as_save_IFS
|
|
|
|
+ ;;
|
|
+esac
|
|
+fi
|
|
+MSGMERGE=$ac_cv_path_MSGMERGE
|
|
+if test -n "$MSGMERGE"; then
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGMERGE" >&5
|
|
+$as_echo "$MSGMERGE" >&6; }
|
|
+else
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
+$as_echo "no" >&6; }
|
|
fi
|
|
|
|
|
|
-
|
|
-for ac_header in stdlib.h unistd.h
|
|
-do
|
|
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
|
|
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
|
|
- { echo "$as_me:$LINENO: checking for $ac_header" >&5
|
|
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
|
|
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
-fi
|
|
-ac_res=`eval echo '${'$as_ac_Header'}'`
|
|
- { echo "$as_me:$LINENO: result: $ac_res" >&5
|
|
-echo "${ECHO_T}$ac_res" >&6; }
|
|
+# Extract the first word of "msgfmt", so it can be a program name with args.
|
|
+set dummy msgfmt; ac_word=$2
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
|
+$as_echo_n "checking for $ac_word... " >&6; }
|
|
+if test "${ac_cv_path_MSGFMT+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
- # Is the header compilable?
|
|
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
|
|
-echo $ECHO_N "checking $ac_header usability... $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. */
|
|
-$ac_includes_default
|
|
-#include <$ac_header>
|
|
-_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;;
|
|
+ case $MSGFMT in
|
|
+ [\\/]* | ?:[\\/]*)
|
|
+ ac_cv_path_MSGFMT="$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_MSGFMT="$as_dir/$ac_word$ac_exec_ext"
|
|
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
+ break 2
|
|
+ fi
|
|
+done
|
|
+ done
|
|
+IFS=$as_save_IFS
|
|
+
|
|
+ ;;
|
|
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
|
|
- ac_header_compiler=yes
|
|
+fi
|
|
+MSGFMT=$ac_cv_path_MSGFMT
|
|
+if test -n "$MSGFMT"; then
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5
|
|
+$as_echo "$MSGFMT" >&6; }
|
|
else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
- ac_header_compiler=no
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
+$as_echo "no" >&6; }
|
|
fi
|
|
|
|
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
|
|
-echo "${ECHO_T}$ac_header_compiler" >&6; }
|
|
|
|
-# Is the header present?
|
|
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
|
|
-echo $ECHO_N "checking $ac_header presence... $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. */
|
|
-#include <$ac_header>
|
|
-_ACEOF
|
|
-if { (ac_try="$ac_cpp conftest.$ac_ext"
|
|
-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_cpp conftest.$ac_ext") 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); } >/dev/null && {
|
|
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
|
|
- test ! -s conftest.err
|
|
- }; then
|
|
- ac_header_preproc=yes
|
|
+# Extract the first word of "gmsgfmt", so it can be a program name with args.
|
|
+set dummy gmsgfmt; ac_word=$2
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
|
+$as_echo_n "checking for $ac_word... " >&6; }
|
|
+if test "${ac_cv_path_GMSGFMT+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
- ac_header_preproc=no
|
|
-fi
|
|
-
|
|
-rm -f conftest.err conftest.$ac_ext
|
|
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
|
|
-echo "${ECHO_T}$ac_header_preproc" >&6; }
|
|
+ case $GMSGFMT in
|
|
+ [\\/]* | ?:[\\/]*)
|
|
+ ac_cv_path_GMSGFMT="$GMSGFMT" # 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_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
|
|
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
+ break 2
|
|
+ fi
|
|
+done
|
|
+ done
|
|
+IFS=$as_save_IFS
|
|
|
|
-# So? What about this header?
|
|
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
|
|
- yes:no: )
|
|
- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
|
|
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
|
|
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
|
|
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
|
|
- ac_header_preproc=yes
|
|
- ;;
|
|
- no:yes:* )
|
|
- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
|
|
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
|
|
- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
|
|
-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
|
|
- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
|
|
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
|
|
- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
|
|
-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
|
|
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
|
|
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
|
|
- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
|
|
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
|
|
- ( cat <<\_ASBOX
|
|
-## ---------------------------------------------------------------------- ##
|
|
-## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=libgtop ##
|
|
-## ---------------------------------------------------------------------- ##
|
|
-_ASBOX
|
|
- ) | sed "s/^/$as_me: WARNING: /" >&2
|
|
- ;;
|
|
+ test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
|
|
+ ;;
|
|
esac
|
|
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
|
|
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
|
|
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+fi
|
|
+GMSGFMT=$ac_cv_path_GMSGFMT
|
|
+if test -n "$GMSGFMT"; then
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5
|
|
+$as_echo "$GMSGFMT" >&6; }
|
|
else
|
|
- eval "$as_ac_Header=\$ac_header_preproc"
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
+$as_echo "no" >&6; }
|
|
fi
|
|
-ac_res=`eval echo '${'$as_ac_Header'}'`
|
|
- { echo "$as_me:$LINENO: result: $ac_res" >&5
|
|
-echo "${ECHO_T}$ac_res" >&6; }
|
|
|
|
-fi
|
|
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
|
|
- cat >>confdefs.h <<_ACEOF
|
|
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
|
|
-_ACEOF
|
|
|
|
+if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then
|
|
+ as_fn_error "GNU gettext tools not found; required for intltool" "$LINENO" 5
|
|
+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_fn_error "GNU gettext tools not found; required for intltool" "$LINENO" 5
|
|
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:${as_lineno-$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:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
+ break 2
|
|
+ fi
|
|
done
|
|
+ done
|
|
+IFS=$as_save_IFS
|
|
|
|
-
|
|
-for ac_func in getpagesize
|
|
-do
|
|
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
|
|
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
|
|
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
|
|
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+ ;;
|
|
+esac
|
|
+fi
|
|
+INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL
|
|
+if test -n "$INTLTOOL_PERL"; then
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_PERL" >&5
|
|
+$as_echo "$INTLTOOL_PERL" >&6; }
|
|
else
|
|
- cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
-/* end confdefs.h. */
|
|
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
|
|
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
|
|
-#define $ac_func innocuous_$ac_func
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
+$as_echo "no" >&6; }
|
|
+fi
|
|
|
|
-/* System header to define __stub macros and hopefully few prototypes,
|
|
- which can conflict with char $ac_func (); below.
|
|
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
|
|
- <limits.h> exists even on freestanding compilers. */
|
|
|
|
-#ifdef __STDC__
|
|
-# include <limits.h>
|
|
-#else
|
|
-# include <assert.h>
|
|
-#endif
|
|
+if test -z "$INTLTOOL_PERL"; then
|
|
+ as_fn_error "perl not found" "$LINENO" 5
|
|
+fi
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for perl >= 5.8.1" >&5
|
|
+$as_echo_n "checking for perl >= 5.8.1... " >&6; }
|
|
+$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1
|
|
+if test $? -ne 0; then
|
|
+ as_fn_error "perl 5.8.1 is required for intltool" "$LINENO" 5
|
|
+else
|
|
+ IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`"
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $IT_PERL_VERSION" >&5
|
|
+$as_echo "$IT_PERL_VERSION" >&6; }
|
|
+fi
|
|
+if test "x" != "xno-xml"; then
|
|
+ { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: result: ok" >&5
|
|
+$as_echo "ok" >&6; }
|
|
+ else
|
|
+ as_fn_error "XML::Parser perl module is required for intltool" "$LINENO" 5
|
|
+ fi
|
|
+fi
|
|
|
|
-#undef $ac_func
|
|
+# Substitute ALL_LINGUAS so we can use it in po/Makefile
|
|
|
|
-/* Override any GCC internal prototype to avoid an error.
|
|
- Use char because int might match the return type of a GCC
|
|
- builtin and then its argument prototype would still apply. */
|
|
-#ifdef __cplusplus
|
|
-extern "C"
|
|
-#endif
|
|
-char $ac_func ();
|
|
-/* The GNU C library defines this for functions which it implements
|
|
- to always fail with ENOSYS. Some functions are actually named
|
|
- something starting with __ and the normal name is an alias. */
|
|
-#if defined __stub_$ac_func || defined __stub___$ac_func
|
|
-choke me
|
|
-#endif
|
|
+
|
|
+# Set DATADIRNAME correctly if it is not set yet
|
|
+# (copied from glib-gettext.m4)
|
|
+if test -z "$DATADIRNAME"; then
|
|
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
+/* end confdefs.h. */
|
|
|
|
int
|
|
main ()
|
|
{
|
|
-return $ac_func ();
|
|
+extern int _nl_msg_cat_cntr;
|
|
+ return _nl_msg_cat_cntr
|
|
;
|
|
return 0;
|
|
}
|
|
_ACEOF
|
|
-rm -f conftest.$ac_objext conftest$ac_exeext
|
|
-if { (ac_try="$ac_link"
|
|
-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_link") 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_exeext &&
|
|
- $as_test_x conftest$ac_exeext; then
|
|
- eval "$as_ac_var=yes"
|
|
+if ac_fn_c_try_link "$LINENO"; then :
|
|
+ DATADIRNAME=share
|
|
else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
- eval "$as_ac_var=no"
|
|
+ case $host in
|
|
+ *-*-solaris*)
|
|
+ ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
|
|
+if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
|
|
+ DATADIRNAME=share
|
|
+else
|
|
+ DATADIRNAME=lib
|
|
fi
|
|
|
|
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
- conftest$ac_exeext conftest.$ac_ext
|
|
+ ;;
|
|
+ *)
|
|
+ DATADIRNAME=lib
|
|
+ ;;
|
|
+ esac
|
|
fi
|
|
-ac_res=`eval echo '${'$as_ac_var'}'`
|
|
- { echo "$as_me:$LINENO: result: $ac_res" >&5
|
|
-echo "${ECHO_T}$ac_res" >&6; }
|
|
-if test `eval echo '${'$as_ac_var'}'` = yes; then
|
|
+rm -f core conftest.err conftest.$ac_objext \
|
|
+ conftest$ac_exeext conftest.$ac_ext
|
|
+fi
|
|
+
|
|
+
|
|
+
|
|
+
|
|
+
|
|
+
|
|
+GETTEXT_PACKAGE=libgtop-2.0
|
|
+
|
|
+
|
|
+cat >>confdefs.h <<_ACEOF
|
|
+#define GETTEXT_PACKAGE "$GETTEXT_PACKAGE"
|
|
+_ACEOF
|
|
+
|
|
+
|
|
+
|
|
+ for ac_header in locale.h
|
|
+do :
|
|
+ ac_fn_c_check_header_mongrel "$LINENO" "locale.h" "ac_cv_header_locale_h" "$ac_includes_default"
|
|
+if test "x$ac_cv_header_locale_h" = x""yes; then :
|
|
cat >>confdefs.h <<_ACEOF
|
|
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
|
|
+#define HAVE_LOCALE_H 1
|
|
_ACEOF
|
|
|
|
fi
|
|
+
|
|
done
|
|
|
|
-{ echo "$as_me:$LINENO: checking for working mmap" >&5
|
|
-echo $ECHO_N "checking for working mmap... $ECHO_C" >&6; }
|
|
-if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
-else
|
|
- if test "$cross_compiling" = yes; then
|
|
- ac_cv_func_mmap_fixed_mapped=no
|
|
+ if test $ac_cv_header_locale_h = yes; then
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LC_MESSAGES" >&5
|
|
+$as_echo_n "checking for LC_MESSAGES... " >&6; }
|
|
+if test "${am_cv_val_LC_MESSAGES+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
- cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
/* end confdefs.h. */
|
|
-$ac_includes_default
|
|
-/* malloc might have been renamed as rpl_malloc. */
|
|
-#undef malloc
|
|
+#include <locale.h>
|
|
+int
|
|
+main ()
|
|
+{
|
|
+return LC_MESSAGES
|
|
+ ;
|
|
+ return 0;
|
|
+}
|
|
+_ACEOF
|
|
+if ac_fn_c_try_link "$LINENO"; then :
|
|
+ am_cv_val_LC_MESSAGES=yes
|
|
+else
|
|
+ am_cv_val_LC_MESSAGES=no
|
|
+fi
|
|
+rm -f core conftest.err conftest.$ac_objext \
|
|
+ conftest$ac_exeext conftest.$ac_ext
|
|
+fi
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_val_LC_MESSAGES" >&5
|
|
+$as_echo "$am_cv_val_LC_MESSAGES" >&6; }
|
|
+ if test $am_cv_val_LC_MESSAGES = yes; then
|
|
|
|
-/* Thanks to Mike Haertel and Jim Avera for this test.
|
|
- Here is a matrix of mmap possibilities:
|
|
- mmap private not fixed
|
|
- mmap private fixed at somewhere currently unmapped
|
|
- mmap private fixed at somewhere already mapped
|
|
- mmap shared not fixed
|
|
- mmap shared fixed at somewhere currently unmapped
|
|
- mmap shared fixed at somewhere already mapped
|
|
- For private mappings, we should verify that changes cannot be read()
|
|
- back from the file, nor mmap's back from the file at a different
|
|
- address. (There have been systems where private was not correctly
|
|
- implemented like the infamous i386 svr4.0, and systems where the
|
|
- VM page cache was not coherent with the file system buffer cache
|
|
- like early versions of FreeBSD and possibly contemporary NetBSD.)
|
|
- For shared mappings, we should conversely verify that changes get
|
|
- propagated back to all the places they're supposed to be.
|
|
+$as_echo "#define HAVE_LC_MESSAGES 1" >>confdefs.h
|
|
|
|
- Grep wants private fixed already mapped.
|
|
- The main things grep needs to know about mmap are:
|
|
- * does it exist and is it safe to write into the mmap'd area
|
|
- * how to use it (BSD variants) */
|
|
+ fi
|
|
+ fi
|
|
+ USE_NLS=yes
|
|
|
|
-#include <fcntl.h>
|
|
-#include <sys/mman.h>
|
|
|
|
-#if !defined STDC_HEADERS && !defined HAVE_STDLIB_H
|
|
-char *malloc ();
|
|
-#endif
|
|
+ gt_cv_have_gettext=no
|
|
|
|
-/* This mess was copied from the GNU getpagesize.h. */
|
|
-#ifndef HAVE_GETPAGESIZE
|
|
-/* Assume that all systems that can run configure have sys/param.h. */
|
|
-# ifndef HAVE_SYS_PARAM_H
|
|
-# define HAVE_SYS_PARAM_H 1
|
|
-# endif
|
|
+ CATOBJEXT=NONE
|
|
+ XGETTEXT=:
|
|
+ INTLLIBS=
|
|
|
|
-# ifdef _SC_PAGESIZE
|
|
-# define getpagesize() sysconf(_SC_PAGESIZE)
|
|
-# else /* no _SC_PAGESIZE */
|
|
-# ifdef HAVE_SYS_PARAM_H
|
|
-# include <sys/param.h>
|
|
-# ifdef EXEC_PAGESIZE
|
|
-# define getpagesize() EXEC_PAGESIZE
|
|
-# else /* no EXEC_PAGESIZE */
|
|
-# ifdef NBPG
|
|
-# define getpagesize() NBPG * CLSIZE
|
|
-# ifndef CLSIZE
|
|
-# define CLSIZE 1
|
|
-# endif /* no CLSIZE */
|
|
-# else /* no NBPG */
|
|
-# ifdef NBPC
|
|
-# define getpagesize() NBPC
|
|
-# else /* no NBPC */
|
|
-# ifdef PAGESIZE
|
|
-# define getpagesize() PAGESIZE
|
|
-# endif /* PAGESIZE */
|
|
-# endif /* no NBPC */
|
|
-# endif /* no NBPG */
|
|
-# endif /* no EXEC_PAGESIZE */
|
|
-# else /* no HAVE_SYS_PARAM_H */
|
|
-# define getpagesize() 8192 /* punt totally */
|
|
-# endif /* no HAVE_SYS_PARAM_H */
|
|
-# endif /* no _SC_PAGESIZE */
|
|
+ ac_fn_c_check_header_mongrel "$LINENO" "libintl.h" "ac_cv_header_libintl_h" "$ac_includes_default"
|
|
+if test "x$ac_cv_header_libintl_h" = x""yes; then :
|
|
+ gt_cv_func_dgettext_libintl="no"
|
|
+ libintl_extra_libs=""
|
|
|
|
-#endif /* no HAVE_GETPAGESIZE */
|
|
+ #
|
|
+ # First check in libc
|
|
+ #
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in libc" >&5
|
|
+$as_echo_n "checking for ngettext in libc... " >&6; }
|
|
+if test "${gt_cv_func_ngettext_libc+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
+else
|
|
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
+/* end confdefs.h. */
|
|
+
|
|
+#include <libintl.h>
|
|
|
|
int
|
|
main ()
|
|
{
|
|
- char *data, *data2, *data3;
|
|
- int i, pagesize;
|
|
- int fd;
|
|
-
|
|
- pagesize = getpagesize ();
|
|
-
|
|
- /* First, make a file with some known garbage in it. */
|
|
- data = (char *) malloc (pagesize);
|
|
- if (!data)
|
|
- return 1;
|
|
- for (i = 0; i < pagesize; ++i)
|
|
- *(data + i) = rand ();
|
|
- umask (0);
|
|
- fd = creat ("conftest.mmap", 0600);
|
|
- if (fd < 0)
|
|
- return 1;
|
|
- if (write (fd, data, pagesize) != pagesize)
|
|
- return 1;
|
|
- close (fd);
|
|
-
|
|
- /* Next, try to mmap the file at a fixed address which already has
|
|
- something else allocated at it. If we can, also make sure that
|
|
- we see the same garbage. */
|
|
- fd = open ("conftest.mmap", O_RDWR);
|
|
- if (fd < 0)
|
|
- return 1;
|
|
- data2 = (char *) malloc (2 * pagesize);
|
|
- if (!data2)
|
|
- return 1;
|
|
- data2 += (pagesize - ((long int) data2 & (pagesize - 1))) & (pagesize - 1);
|
|
- if (data2 != mmap (data2, pagesize, PROT_READ | PROT_WRITE,
|
|
- MAP_PRIVATE | MAP_FIXED, fd, 0L))
|
|
- return 1;
|
|
- for (i = 0; i < pagesize; ++i)
|
|
- if (*(data + i) != *(data2 + i))
|
|
- return 1;
|
|
-
|
|
- /* Finally, make sure that changes to the mapped area do not
|
|
- percolate back to the file as seen by read(). (This is a bug on
|
|
- some variants of i386 svr4.0.) */
|
|
- for (i = 0; i < pagesize; ++i)
|
|
- *(data2 + i) = *(data2 + i) + 1;
|
|
- data3 = (char *) malloc (pagesize);
|
|
- if (!data3)
|
|
- return 1;
|
|
- if (read (fd, data3, pagesize) != pagesize)
|
|
- return 1;
|
|
- for (i = 0; i < pagesize; ++i)
|
|
- if (*(data + i) != *(data3 + i))
|
|
- return 1;
|
|
- close (fd);
|
|
+return !ngettext ("","", 1)
|
|
+ ;
|
|
return 0;
|
|
}
|
|
_ACEOF
|
|
-rm -f conftest$ac_exeext
|
|
-if { (ac_try="$ac_link"
|
|
-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_link") 2>&5
|
|
- ac_status=$?
|
|
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
|
|
- { (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_try") 2>&5
|
|
- ac_status=$?
|
|
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
- (exit $ac_status); }; }; then
|
|
- ac_cv_func_mmap_fixed_mapped=yes
|
|
+if ac_fn_c_try_link "$LINENO"; then :
|
|
+ gt_cv_func_ngettext_libc=yes
|
|
else
|
|
- echo "$as_me: program exited with status $ac_status" >&5
|
|
-echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
-( exit $ac_status )
|
|
-ac_cv_func_mmap_fixed_mapped=no
|
|
-fi
|
|
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
|
|
-fi
|
|
-
|
|
-
|
|
+ gt_cv_func_ngettext_libc=no
|
|
fi
|
|
-{ echo "$as_me:$LINENO: result: $ac_cv_func_mmap_fixed_mapped" >&5
|
|
-echo "${ECHO_T}$ac_cv_func_mmap_fixed_mapped" >&6; }
|
|
-if test $ac_cv_func_mmap_fixed_mapped = yes; then
|
|
-
|
|
-cat >>confdefs.h <<\_ACEOF
|
|
-#define HAVE_MMAP 1
|
|
-_ACEOF
|
|
+rm -f core conftest.err conftest.$ac_objext \
|
|
+ conftest$ac_exeext conftest.$ac_ext
|
|
|
|
fi
|
|
-rm -f conftest.mmap
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_ngettext_libc" >&5
|
|
+$as_echo "$gt_cv_func_ngettext_libc" >&6; }
|
|
|
|
-{ echo "$as_me:$LINENO: checking return type of signal handlers" >&5
|
|
-echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6; }
|
|
-if test "${ac_cv_type_signal+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+ if test "$gt_cv_func_ngettext_libc" = "yes" ; then
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in libc" >&5
|
|
+$as_echo_n "checking for dgettext in libc... " >&6; }
|
|
+if test "${gt_cv_func_dgettext_libc+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
- cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
/* end confdefs.h. */
|
|
-#include <sys/types.h>
|
|
-#include <signal.h>
|
|
+
|
|
+#include <libintl.h>
|
|
|
|
int
|
|
main ()
|
|
{
|
|
-return *(signal (0, 0)) (0) == 1;
|
|
+return !dgettext ("","")
|
|
;
|
|
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
|
|
- ac_cv_type_signal=int
|
|
+if ac_fn_c_try_link "$LINENO"; then :
|
|
+ gt_cv_func_dgettext_libc=yes
|
|
else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
- ac_cv_type_signal=void
|
|
+ gt_cv_func_dgettext_libc=no
|
|
fi
|
|
+rm -f core conftest.err conftest.$ac_objext \
|
|
+ conftest$ac_exeext conftest.$ac_ext
|
|
|
|
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
fi
|
|
-{ echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5
|
|
-echo "${ECHO_T}$ac_cv_type_signal" >&6; }
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_dgettext_libc" >&5
|
|
+$as_echo "$gt_cv_func_dgettext_libc" >&6; }
|
|
+ fi
|
|
|
|
-cat >>confdefs.h <<_ACEOF
|
|
-#define RETSIGTYPE $ac_cv_type_signal
|
|
+ if test "$gt_cv_func_ngettext_libc" = "yes" ; then
|
|
+ for ac_func in bind_textdomain_codeset
|
|
+do :
|
|
+ ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
|
|
+if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
|
|
+ cat >>confdefs.h <<_ACEOF
|
|
+#define HAVE_BIND_TEXTDOMAIN_CODESET 1
|
|
_ACEOF
|
|
|
|
+fi
|
|
+done
|
|
|
|
+ fi
|
|
|
|
-for ac_func in strftime
|
|
-do
|
|
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
|
|
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
|
|
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
|
|
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+ #
|
|
+ # If we don't have everything we want, check in libintl
|
|
+ #
|
|
+ if test "$gt_cv_func_dgettext_libc" != "yes" \
|
|
+ || test "$gt_cv_func_ngettext_libc" != "yes" \
|
|
+ || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
|
|
+
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bindtextdomain in -lintl" >&5
|
|
+$as_echo_n "checking for bindtextdomain in -lintl... " >&6; }
|
|
+if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
- cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
+ ac_check_lib_save_LIBS=$LIBS
|
|
+LIBS="-lintl $LIBS"
|
|
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
/* end confdefs.h. */
|
|
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
|
|
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
|
|
-#define $ac_func innocuous_$ac_func
|
|
-
|
|
-/* System header to define __stub macros and hopefully few prototypes,
|
|
- which can conflict with char $ac_func (); below.
|
|
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
|
|
- <limits.h> exists even on freestanding compilers. */
|
|
-
|
|
-#ifdef __STDC__
|
|
-# include <limits.h>
|
|
-#else
|
|
-# include <assert.h>
|
|
-#endif
|
|
-
|
|
-#undef $ac_func
|
|
|
|
/* Override any GCC internal prototype to avoid an error.
|
|
Use char because int might match the return type of a GCC
|
|
@@ -17669,73 +14668,35 @@ cat >>conftest.$ac_ext <<_ACEOF
|
|
#ifdef __cplusplus
|
|
extern "C"
|
|
#endif
|
|
-char $ac_func ();
|
|
-/* The GNU C library defines this for functions which it implements
|
|
- to always fail with ENOSYS. Some functions are actually named
|
|
- something starting with __ and the normal name is an alias. */
|
|
-#if defined __stub_$ac_func || defined __stub___$ac_func
|
|
-choke me
|
|
-#endif
|
|
-
|
|
+char bindtextdomain ();
|
|
int
|
|
main ()
|
|
{
|
|
-return $ac_func ();
|
|
+return bindtextdomain ();
|
|
;
|
|
return 0;
|
|
}
|
|
_ACEOF
|
|
-rm -f conftest.$ac_objext conftest$ac_exeext
|
|
-if { (ac_try="$ac_link"
|
|
-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_link") 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_exeext &&
|
|
- $as_test_x conftest$ac_exeext; then
|
|
- eval "$as_ac_var=yes"
|
|
+if ac_fn_c_try_link "$LINENO"; then :
|
|
+ ac_cv_lib_intl_bindtextdomain=yes
|
|
else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
- eval "$as_ac_var=no"
|
|
+ ac_cv_lib_intl_bindtextdomain=no
|
|
fi
|
|
-
|
|
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
- conftest$ac_exeext conftest.$ac_ext
|
|
+rm -f core conftest.err conftest.$ac_objext \
|
|
+ conftest$ac_exeext conftest.$ac_ext
|
|
+LIBS=$ac_check_lib_save_LIBS
|
|
fi
|
|
-ac_res=`eval echo '${'$as_ac_var'}'`
|
|
- { echo "$as_me:$LINENO: result: $ac_res" >&5
|
|
-echo "${ECHO_T}$ac_res" >&6; }
|
|
-if test `eval echo '${'$as_ac_var'}'` = yes; then
|
|
- cat >>confdefs.h <<_ACEOF
|
|
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
|
|
-_ACEOF
|
|
-
|
|
-else
|
|
- # strftime is in -lintl on SCO UNIX.
|
|
-{ echo "$as_me:$LINENO: checking for strftime in -lintl" >&5
|
|
-echo $ECHO_N "checking for strftime in -lintl... $ECHO_C" >&6; }
|
|
-if test "${ac_cv_lib_intl_strftime+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_bindtextdomain" >&5
|
|
+$as_echo "$ac_cv_lib_intl_bindtextdomain" >&6; }
|
|
+if test "x$ac_cv_lib_intl_bindtextdomain" = x""yes; then :
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5
|
|
+$as_echo_n "checking for ngettext in -lintl... " >&6; }
|
|
+if test "${ac_cv_lib_intl_ngettext+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
ac_check_lib_save_LIBS=$LIBS
|
|
LIBS="-lintl $LIBS"
|
|
-cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
/* end confdefs.h. */
|
|
|
|
/* Override any GCC internal prototype to avoid an error.
|
|
@@ -17744,95 +14705,36 @@ cat >>conftest.$ac_ext <<_ACEOF
|
|
#ifdef __cplusplus
|
|
extern "C"
|
|
#endif
|
|
-char strftime ();
|
|
+char ngettext ();
|
|
int
|
|
main ()
|
|
{
|
|
-return strftime ();
|
|
+return ngettext ();
|
|
;
|
|
return 0;
|
|
}
|
|
_ACEOF
|
|
-rm -f conftest.$ac_objext conftest$ac_exeext
|
|
-if { (ac_try="$ac_link"
|
|
-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_link") 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_exeext &&
|
|
- $as_test_x conftest$ac_exeext; then
|
|
- ac_cv_lib_intl_strftime=yes
|
|
+if ac_fn_c_try_link "$LINENO"; then :
|
|
+ ac_cv_lib_intl_ngettext=yes
|
|
else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
- ac_cv_lib_intl_strftime=no
|
|
+ ac_cv_lib_intl_ngettext=no
|
|
fi
|
|
-
|
|
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
- conftest$ac_exeext conftest.$ac_ext
|
|
+rm -f core conftest.err conftest.$ac_objext \
|
|
+ conftest$ac_exeext conftest.$ac_ext
|
|
LIBS=$ac_check_lib_save_LIBS
|
|
fi
|
|
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_strftime" >&5
|
|
-echo "${ECHO_T}$ac_cv_lib_intl_strftime" >&6; }
|
|
-if test $ac_cv_lib_intl_strftime = yes; then
|
|
- cat >>confdefs.h <<\_ACEOF
|
|
-#define HAVE_STRFTIME 1
|
|
-_ACEOF
|
|
-
|
|
-LIBS="-lintl $LIBS"
|
|
-fi
|
|
-
|
|
-fi
|
|
-done
|
|
-
|
|
-
|
|
-
|
|
-
|
|
-
|
|
-
|
|
-
|
|
-
|
|
-for ac_func in getcwd gettimeofday getwd putenv strdup strtoul uname
|
|
-do
|
|
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
|
|
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
|
|
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
|
|
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&5
|
|
+$as_echo "$ac_cv_lib_intl_ngettext" >&6; }
|
|
+if test "x$ac_cv_lib_intl_ngettext" = x""yes; then :
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in -lintl" >&5
|
|
+$as_echo_n "checking for dgettext in -lintl... " >&6; }
|
|
+if test "${ac_cv_lib_intl_dgettext+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
- cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
+ ac_check_lib_save_LIBS=$LIBS
|
|
+LIBS="-lintl $LIBS"
|
|
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
/* end confdefs.h. */
|
|
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
|
|
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
|
|
-#define $ac_func innocuous_$ac_func
|
|
-
|
|
-/* System header to define __stub macros and hopefully few prototypes,
|
|
- which can conflict with char $ac_func (); below.
|
|
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
|
|
- <limits.h> exists even on freestanding compilers. */
|
|
-
|
|
-#ifdef __STDC__
|
|
-# include <limits.h>
|
|
-#else
|
|
-# include <assert.h>
|
|
-#endif
|
|
-
|
|
-#undef $ac_func
|
|
|
|
/* Override any GCC internal prototype to avoid an error.
|
|
Use char because int might match the return type of a GCC
|
|
@@ -17840,140 +14742,260 @@ cat >>conftest.$ac_ext <<_ACEOF
|
|
#ifdef __cplusplus
|
|
extern "C"
|
|
#endif
|
|
-char $ac_func ();
|
|
-/* The GNU C library defines this for functions which it implements
|
|
- to always fail with ENOSYS. Some functions are actually named
|
|
- something starting with __ and the normal name is an alias. */
|
|
-#if defined __stub_$ac_func || defined __stub___$ac_func
|
|
-choke me
|
|
-#endif
|
|
+char dgettext ();
|
|
+int
|
|
+main ()
|
|
+{
|
|
+return dgettext ();
|
|
+ ;
|
|
+ return 0;
|
|
+}
|
|
+_ACEOF
|
|
+if ac_fn_c_try_link "$LINENO"; then :
|
|
+ ac_cv_lib_intl_dgettext=yes
|
|
+else
|
|
+ ac_cv_lib_intl_dgettext=no
|
|
+fi
|
|
+rm -f core conftest.err conftest.$ac_objext \
|
|
+ conftest$ac_exeext conftest.$ac_ext
|
|
+LIBS=$ac_check_lib_save_LIBS
|
|
+fi
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dgettext" >&5
|
|
+$as_echo "$ac_cv_lib_intl_dgettext" >&6; }
|
|
+if test "x$ac_cv_lib_intl_dgettext" = x""yes; then :
|
|
+ gt_cv_func_dgettext_libintl=yes
|
|
+fi
|
|
|
|
+fi
|
|
+
|
|
+fi
|
|
+
|
|
+
|
|
+ if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if -liconv is needed to use gettext" >&5
|
|
+$as_echo_n "checking if -liconv is needed to use gettext... " >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
|
|
+$as_echo "" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5
|
|
+$as_echo_n "checking for ngettext in -lintl... " >&6; }
|
|
+if test "${ac_cv_lib_intl_ngettext+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
+else
|
|
+ ac_check_lib_save_LIBS=$LIBS
|
|
+LIBS="-lintl -liconv $LIBS"
|
|
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
+/* end confdefs.h. */
|
|
+
|
|
+/* Override any GCC internal prototype to avoid an error.
|
|
+ Use char because int might match the return type of a GCC
|
|
+ builtin and then its argument prototype would still apply. */
|
|
+#ifdef __cplusplus
|
|
+extern "C"
|
|
+#endif
|
|
+char ngettext ();
|
|
int
|
|
main ()
|
|
{
|
|
-return $ac_func ();
|
|
+return ngettext ();
|
|
;
|
|
return 0;
|
|
}
|
|
_ACEOF
|
|
-rm -f conftest.$ac_objext conftest$ac_exeext
|
|
-if { (ac_try="$ac_link"
|
|
-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_link") 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_exeext &&
|
|
- $as_test_x conftest$ac_exeext; then
|
|
- eval "$as_ac_var=yes"
|
|
+if ac_fn_c_try_link "$LINENO"; then :
|
|
+ ac_cv_lib_intl_ngettext=yes
|
|
else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
+ ac_cv_lib_intl_ngettext=no
|
|
+fi
|
|
+rm -f core conftest.err conftest.$ac_objext \
|
|
+ conftest$ac_exeext conftest.$ac_ext
|
|
+LIBS=$ac_check_lib_save_LIBS
|
|
+fi
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&5
|
|
+$as_echo "$ac_cv_lib_intl_ngettext" >&6; }
|
|
+if test "x$ac_cv_lib_intl_ngettext" = x""yes; then :
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dcgettext in -lintl" >&5
|
|
+$as_echo_n "checking for dcgettext in -lintl... " >&6; }
|
|
+if test "${ac_cv_lib_intl_dcgettext+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
+else
|
|
+ ac_check_lib_save_LIBS=$LIBS
|
|
+LIBS="-lintl -liconv $LIBS"
|
|
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
+/* end confdefs.h. */
|
|
|
|
- eval "$as_ac_var=no"
|
|
+/* Override any GCC internal prototype to avoid an error.
|
|
+ Use char because int might match the return type of a GCC
|
|
+ builtin and then its argument prototype would still apply. */
|
|
+#ifdef __cplusplus
|
|
+extern "C"
|
|
+#endif
|
|
+char dcgettext ();
|
|
+int
|
|
+main ()
|
|
+{
|
|
+return dcgettext ();
|
|
+ ;
|
|
+ return 0;
|
|
+}
|
|
+_ACEOF
|
|
+if ac_fn_c_try_link "$LINENO"; then :
|
|
+ ac_cv_lib_intl_dcgettext=yes
|
|
+else
|
|
+ ac_cv_lib_intl_dcgettext=no
|
|
+fi
|
|
+rm -f core conftest.err conftest.$ac_objext \
|
|
+ conftest$ac_exeext conftest.$ac_ext
|
|
+LIBS=$ac_check_lib_save_LIBS
|
|
+fi
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dcgettext" >&5
|
|
+$as_echo "$ac_cv_lib_intl_dcgettext" >&6; }
|
|
+if test "x$ac_cv_lib_intl_dcgettext" = x""yes; then :
|
|
+ gt_cv_func_dgettext_libintl=yes
|
|
+ libintl_extra_libs=-liconv
|
|
+else
|
|
+ :
|
|
fi
|
|
|
|
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
- conftest$ac_exeext conftest.$ac_ext
|
|
+else
|
|
+ :
|
|
fi
|
|
-ac_res=`eval echo '${'$as_ac_var'}'`
|
|
- { echo "$as_me:$LINENO: result: $ac_res" >&5
|
|
-echo "${ECHO_T}$ac_res" >&6; }
|
|
-if test `eval echo '${'$as_ac_var'}'` = yes; then
|
|
+
|
|
+ fi
|
|
+
|
|
+ #
|
|
+ # If we found libintl, then check in it for bind_textdomain_codeset();
|
|
+ # we'll prefer libc if neither have bind_textdomain_codeset(),
|
|
+ # and both have dgettext and ngettext
|
|
+ #
|
|
+ if test "$gt_cv_func_dgettext_libintl" = "yes" ; then
|
|
+ glib_save_LIBS="$LIBS"
|
|
+ LIBS="$LIBS -lintl $libintl_extra_libs"
|
|
+ unset ac_cv_func_bind_textdomain_codeset
|
|
+ for ac_func in bind_textdomain_codeset
|
|
+do :
|
|
+ ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
|
|
+if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
|
|
cat >>confdefs.h <<_ACEOF
|
|
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
|
|
+#define HAVE_BIND_TEXTDOMAIN_CODESET 1
|
|
_ACEOF
|
|
|
|
fi
|
|
done
|
|
|
|
+ LIBS="$glib_save_LIBS"
|
|
|
|
+ if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then
|
|
+ gt_cv_func_dgettext_libc=no
|
|
+ else
|
|
+ if test "$gt_cv_func_dgettext_libc" = "yes" \
|
|
+ && test "$gt_cv_func_ngettext_libc" = "yes"; then
|
|
+ gt_cv_func_dgettext_libintl=no
|
|
+ fi
|
|
+ fi
|
|
+ fi
|
|
+ fi
|
|
|
|
-case "$am__api_version" in
|
|
- 1.01234)
|
|
- { { echo "$as_me:$LINENO: error: Automake 1.5 or newer is required to use intltool" >&5
|
|
-echo "$as_me: error: Automake 1.5 or newer is required to use intltool" >&2;}
|
|
- { (exit 1); exit 1; }; }
|
|
- ;;
|
|
- *)
|
|
- ;;
|
|
-esac
|
|
+ if test "$gt_cv_func_dgettext_libc" = "yes" \
|
|
+ || test "$gt_cv_func_dgettext_libintl" = "yes"; then
|
|
+ gt_cv_have_gettext=yes
|
|
+ fi
|
|
|
|
-if test -n "0.35.0"; then
|
|
- { echo "$as_me:$LINENO: checking for intltool >= 0.35.0" >&5
|
|
-echo $ECHO_N "checking for intltool >= 0.35.0... $ECHO_C" >&6; }
|
|
+ if test "$gt_cv_func_dgettext_libintl" = "yes"; then
|
|
+ INTLLIBS="-lintl $libintl_extra_libs"
|
|
+ fi
|
|
|
|
- INTLTOOL_REQUIRED_VERSION_AS_INT=`echo 0.35.0 | 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; }'`
|
|
+ if test "$gt_cv_have_gettext" = "yes"; then
|
|
|
|
- { echo "$as_me:$LINENO: result: $INTLTOOL_APPLIED_VERSION found" >&5
|
|
-echo "${ECHO_T}$INTLTOOL_APPLIED_VERSION found" >&6; }
|
|
- test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
|
|
- { { echo "$as_me:$LINENO: error: Your intltool is too old. You need intltool 0.35.0 or later." >&5
|
|
-echo "$as_me: error: Your intltool is too old. You need intltool 0.35.0 or later." >&2;}
|
|
- { (exit 1); exit 1; }; }
|
|
-fi
|
|
+$as_echo "#define HAVE_GETTEXT 1" >>confdefs.h
|
|
|
|
-# Extract the first word of "intltool-update", so it can be a program name with args.
|
|
-set dummy intltool-update; 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_UPDATE+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+ # Extract the first word of "msgfmt", so it can be a program name with args.
|
|
+set dummy msgfmt; ac_word=$2
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
|
+$as_echo_n "checking for $ac_word... " >&6; }
|
|
+if test "${ac_cv_path_MSGFMT+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.
|
|
+ case "$MSGFMT" in
|
|
+ /*)
|
|
+ ac_cv_path_MSGFMT="$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_UPDATE="$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
|
|
-
|
|
+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
|
|
+ for ac_dir in $PATH; do
|
|
+ test -z "$ac_dir" && ac_dir=.
|
|
+ if test -f $ac_dir/$ac_word; then
|
|
+ if test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"; then
|
|
+ ac_cv_path_MSGFMT="$ac_dir/$ac_word"
|
|
+ break
|
|
+ fi
|
|
+ fi
|
|
+ done
|
|
+ IFS="$ac_save_ifs"
|
|
+ test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT="no"
|
|
;;
|
|
esac
|
|
fi
|
|
-INTLTOOL_UPDATE=$ac_cv_path_INTLTOOL_UPDATE
|
|
-if test -n "$INTLTOOL_UPDATE"; then
|
|
- { echo "$as_me:$LINENO: result: $INTLTOOL_UPDATE" >&5
|
|
-echo "${ECHO_T}$INTLTOOL_UPDATE" >&6; }
|
|
+MSGFMT="$ac_cv_path_MSGFMT"
|
|
+if test "$MSGFMT" != "no"; then
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5
|
|
+$as_echo "$MSGFMT" >&6; }
|
|
else
|
|
- { echo "$as_me:$LINENO: result: no" >&5
|
|
-echo "${ECHO_T}no" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
+$as_echo "no" >&6; }
|
|
fi
|
|
+ if test "$MSGFMT" != "no"; then
|
|
+ glib_save_LIBS="$LIBS"
|
|
+ LIBS="$LIBS $INTLLIBS"
|
|
+ for ac_func in dcgettext
|
|
+do :
|
|
+ ac_fn_c_check_func "$LINENO" "dcgettext" "ac_cv_func_dcgettext"
|
|
+if test "x$ac_cv_func_dcgettext" = x""yes; then :
|
|
+ cat >>confdefs.h <<_ACEOF
|
|
+#define HAVE_DCGETTEXT 1
|
|
+_ACEOF
|
|
|
|
+fi
|
|
+done
|
|
|
|
-# Extract the first word of "intltool-merge", so it can be a program name with args.
|
|
-set dummy intltool-merge; 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_MERGE+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+ MSGFMT_OPTS=
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if msgfmt accepts -c" >&5
|
|
+$as_echo_n "checking if msgfmt accepts -c... " >&6; }
|
|
+ cat >conftest.foo <<_ACEOF
|
|
+
|
|
+msgid ""
|
|
+msgstr ""
|
|
+"Content-Type: text/plain; charset=UTF-8\n"
|
|
+"Project-Id-Version: test 1.0\n"
|
|
+"PO-Revision-Date: 2007-02-15 12:01+0100\n"
|
|
+"Last-Translator: test <foo@bar.xx>\n"
|
|
+"Language-Team: C <LL@li.org>\n"
|
|
+"MIME-Version: 1.0\n"
|
|
+"Content-Transfer-Encoding: 8bit\n"
|
|
+
|
|
+_ACEOF
|
|
+if { { $as_echo "$as_me:${as_lineno-$LINENO}: \$MSGFMT -c -o /dev/null conftest.foo"; } >&5
|
|
+ ($MSGFMT -c -o /dev/null conftest.foo) 2>&5
|
|
+ ac_status=$?
|
|
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
|
+ test $ac_status = 0; }; then
|
|
+ MSGFMT_OPTS=-c; { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
|
+$as_echo "yes" >&6; }
|
|
+else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
+$as_echo "no" >&6; }
|
|
+echo "$as_me: failed input was:" >&5
|
|
+sed 's/^/| /' conftest.foo >&5
|
|
+fi
|
|
+
|
|
+ # Extract the first word of "gmsgfmt", so it can be a program name with args.
|
|
+set dummy gmsgfmt; ac_word=$2
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
|
+$as_echo_n "checking for $ac_word... " >&6; }
|
|
+if test "${ac_cv_path_GMSGFMT+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
- case $INTLTOOL_MERGE in
|
|
+ case $GMSGFMT in
|
|
[\\/]* | ?:[\\/]*)
|
|
- ac_cv_path_INTLTOOL_MERGE="$INTLTOOL_MERGE" # Let the user override the test with a path.
|
|
+ ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path.
|
|
;;
|
|
*)
|
|
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
|
@@ -17981,108 +15003,139 @@ 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
|
|
+ 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"
|
|
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
+ ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
|
|
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
break 2
|
|
fi
|
|
done
|
|
-done
|
|
+ done
|
|
IFS=$as_save_IFS
|
|
|
|
+ test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
|
|
;;
|
|
esac
|
|
fi
|
|
-INTLTOOL_MERGE=$ac_cv_path_INTLTOOL_MERGE
|
|
-if test -n "$INTLTOOL_MERGE"; then
|
|
- { echo "$as_me:$LINENO: result: $INTLTOOL_MERGE" >&5
|
|
-echo "${ECHO_T}$INTLTOOL_MERGE" >&6; }
|
|
+GMSGFMT=$ac_cv_path_GMSGFMT
|
|
+if test -n "$GMSGFMT"; then
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5
|
|
+$as_echo "$GMSGFMT" >&6; }
|
|
else
|
|
- { echo "$as_me:$LINENO: result: no" >&5
|
|
-echo "${ECHO_T}no" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$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
|
|
-{ 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_EXTRACT+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+ # Extract the first word of "xgettext", so it can be a program name with args.
|
|
+set dummy xgettext; ac_word=$2
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
|
+$as_echo_n "checking for $ac_word... " >&6; }
|
|
+if test "${ac_cv_path_XGETTEXT+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.
|
|
+ case "$XGETTEXT" in
|
|
+ /*)
|
|
+ ac_cv_path_XGETTEXT="$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_EXTRACT="$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
|
|
-
|
|
+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
|
|
+ for ac_dir in $PATH; do
|
|
+ test -z "$ac_dir" && ac_dir=.
|
|
+ if test -f $ac_dir/$ac_word; then
|
|
+ if test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"; then
|
|
+ ac_cv_path_XGETTEXT="$ac_dir/$ac_word"
|
|
+ break
|
|
+ fi
|
|
+ fi
|
|
+ done
|
|
+ IFS="$ac_save_ifs"
|
|
+ test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":"
|
|
;;
|
|
esac
|
|
fi
|
|
-INTLTOOL_EXTRACT=$ac_cv_path_INTLTOOL_EXTRACT
|
|
-if test -n "$INTLTOOL_EXTRACT"; then
|
|
- { echo "$as_me:$LINENO: result: $INTLTOOL_EXTRACT" >&5
|
|
-echo "${ECHO_T}$INTLTOOL_EXTRACT" >&6; }
|
|
+XGETTEXT="$ac_cv_path_XGETTEXT"
|
|
+if test "$XGETTEXT" != ":"; then
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5
|
|
+$as_echo "$XGETTEXT" >&6; }
|
|
else
|
|
- { echo "$as_me:$LINENO: result: no" >&5
|
|
-echo "${ECHO_T}no" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
+$as_echo "no" >&6; }
|
|
fi
|
|
|
|
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
+/* end confdefs.h. */
|
|
|
|
-if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then
|
|
- { { echo "$as_me:$LINENO: error: The intltool scripts were not found. Please install intltool." >&5
|
|
-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 $< $@'
|
|
-
|
|
-
|
|
+int
|
|
+main ()
|
|
+{
|
|
+extern int _nl_msg_cat_cntr;
|
|
+ return _nl_msg_cat_cntr
|
|
+ ;
|
|
+ return 0;
|
|
+}
|
|
+_ACEOF
|
|
+if ac_fn_c_try_link "$LINENO"; then :
|
|
+ CATOBJEXT=.gmo
|
|
+ DATADIRNAME=share
|
|
+else
|
|
+ case $host in
|
|
+ *-*-solaris*)
|
|
+ ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
|
|
+if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
|
|
+ CATOBJEXT=.gmo
|
|
+ DATADIRNAME=share
|
|
+else
|
|
+ CATOBJEXT=.mo
|
|
+ DATADIRNAME=lib
|
|
+fi
|
|
|
|
+ ;;
|
|
+ *)
|
|
+ CATOBJEXT=.mo
|
|
+ DATADIRNAME=lib
|
|
+ ;;
|
|
+ esac
|
|
+fi
|
|
+rm -f core conftest.err conftest.$ac_objext \
|
|
+ conftest$ac_exeext conftest.$ac_ext
|
|
+ LIBS="$glib_save_LIBS"
|
|
+ INSTOBJEXT=.mo
|
|
+ else
|
|
+ gt_cv_have_gettext=no
|
|
+ fi
|
|
+ fi
|
|
|
|
+fi
|
|
|
|
|
|
|
|
+ if test "$gt_cv_have_gettext" = "yes" ; then
|
|
|
|
+$as_echo "#define ENABLE_NLS 1" >>confdefs.h
|
|
|
|
+ fi
|
|
|
|
+ if test "$XGETTEXT" != ":"; then
|
|
+ if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
|
|
+ : ;
|
|
+ else
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: found xgettext program is not GNU xgettext; ignore it" >&5
|
|
+$as_echo "found xgettext program is not GNU xgettext; ignore it" >&6; }
|
|
+ XGETTEXT=":"
|
|
+ fi
|
|
+ fi
|
|
|
|
+ # We need to process the po/ directory.
|
|
+ POSUB=po
|
|
|
|
+ ac_config_commands="$ac_config_commands default-1"
|
|
|
|
|
|
+ for lang in $ALL_LINGUAS; do
|
|
+ GMOFILES="$GMOFILES $lang.gmo"
|
|
+ POFILES="$POFILES $lang.po"
|
|
+ done
|
|
|
|
|
|
|
|
@@ -18090,2870 +15143,366 @@ INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.
|
|
|
|
|
|
|
|
-# Check the gettext tools to make sure they are GNU
|
|
-# 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_XGETTEXT+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
-else
|
|
- case $XGETTEXT in
|
|
- [\\/]* | ?:[\\/]*)
|
|
- ac_cv_path_XGETTEXT="$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_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
|
|
|
|
- ;;
|
|
-esac
|
|
-fi
|
|
-XGETTEXT=$ac_cv_path_XGETTEXT
|
|
-if test -n "$XGETTEXT"; then
|
|
- { echo "$as_me:$LINENO: result: $XGETTEXT" >&5
|
|
-echo "${ECHO_T}$XGETTEXT" >&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_MSGMERGE+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
-else
|
|
- case $MSGMERGE in
|
|
- [\\/]* | ?:[\\/]*)
|
|
- ac_cv_path_MSGMERGE="$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_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
|
|
|
|
- ;;
|
|
-esac
|
|
-fi
|
|
-MSGMERGE=$ac_cv_path_MSGMERGE
|
|
-if test -n "$MSGMERGE"; then
|
|
- { echo "$as_me:$LINENO: result: $MSGMERGE" >&5
|
|
-echo "${ECHO_T}$MSGMERGE" >&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_MSGFMT+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
-else
|
|
- case $MSGFMT in
|
|
- [\\/]* | ?:[\\/]*)
|
|
- ac_cv_path_MSGFMT="$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_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
|
|
+ if test "$gt_cv_have_gettext" = "yes"; then
|
|
+ if test "x$ALL_LINGUAS" = "x"; then
|
|
+ LINGUAS=
|
|
+ else
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for catalogs to be installed" >&5
|
|
+$as_echo_n "checking for catalogs to be installed... " >&6; }
|
|
+ NEW_LINGUAS=
|
|
+ for presentlang in $ALL_LINGUAS; do
|
|
+ useit=no
|
|
+ if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then
|
|
+ desiredlanguages="$LINGUAS"
|
|
+ else
|
|
+ desiredlanguages="$ALL_LINGUAS"
|
|
+ fi
|
|
+ for desiredlang in $desiredlanguages; do
|
|
+ # Use the presentlang catalog if desiredlang is
|
|
+ # a. equal to presentlang, or
|
|
+ # b. a variant of presentlang (because in this case,
|
|
+ # presentlang can be used as a fallback for messages
|
|
+ # which are not translated in the desiredlang catalog).
|
|
+ case "$desiredlang" in
|
|
+ "$presentlang"*) useit=yes;;
|
|
+ esac
|
|
+ done
|
|
+ if test $useit = yes; then
|
|
+ NEW_LINGUAS="$NEW_LINGUAS $presentlang"
|
|
+ fi
|
|
+ done
|
|
+ LINGUAS=$NEW_LINGUAS
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LINGUAS" >&5
|
|
+$as_echo "$LINGUAS" >&6; }
|
|
+ fi
|
|
|
|
- ;;
|
|
-esac
|
|
-fi
|
|
-MSGFMT=$ac_cv_path_MSGFMT
|
|
-if test -n "$MSGFMT"; then
|
|
- { echo "$as_me:$LINENO: result: $MSGFMT" >&5
|
|
-echo "${ECHO_T}$MSGFMT" >&6; }
|
|
-else
|
|
- { echo "$as_me:$LINENO: result: no" >&5
|
|
-echo "${ECHO_T}no" >&6; }
|
|
-fi
|
|
+ if test -n "$LINGUAS"; then
|
|
+ for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
|
|
+ fi
|
|
+ fi
|
|
|
|
+ MKINSTALLDIRS=
|
|
+ if test -n "$ac_aux_dir"; then
|
|
+ MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
|
|
+ fi
|
|
+ if test -z "$MKINSTALLDIRS"; then
|
|
+ MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
|
|
+ fi
|
|
|
|
-if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then
|
|
- { { echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5
|
|
-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
|
|
- { { echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5
|
|
-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
|
|
-{ 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_PERL+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&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"
|
|
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
- break 2
|
|
- fi
|
|
-done
|
|
-done
|
|
-IFS=$as_save_IFS
|
|
+ test -d po || mkdir po
|
|
+ if test "x$srcdir" != "x."; then
|
|
+ if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
|
|
+ posrcprefix="$srcdir/"
|
|
+ else
|
|
+ posrcprefix="../$srcdir/"
|
|
+ fi
|
|
+ else
|
|
+ posrcprefix="../"
|
|
+ fi
|
|
+ rm -f po/POTFILES
|
|
+ sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
|
|
+ < $srcdir/po/POTFILES.in > po/POTFILES
|
|
|
|
- ;;
|
|
-esac
|
|
-fi
|
|
-INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL
|
|
-if test -n "$INTLTOOL_PERL"; then
|
|
- { echo "$as_me:$LINENO: result: $INTLTOOL_PERL" >&5
|
|
-echo "${ECHO_T}$INTLTOOL_PERL" >&6; }
|
|
+glib_save_prefix="$prefix"
|
|
+glib_save_exec_prefix="$exec_prefix"
|
|
+glib_save_datarootdir="$datarootdir"
|
|
+test "x$prefix" = xNONE && prefix=$ac_default_prefix
|
|
+test "x$exec_prefix" = xNONE && exec_prefix=$prefix
|
|
+datarootdir=`eval echo "${datarootdir}"`
|
|
+if test "x$CATOBJEXT" = "x.mo" ; then
|
|
+ localedir=`eval echo "${libdir}/locale"`
|
|
else
|
|
- { echo "$as_me:$LINENO: result: no" >&5
|
|
-echo "${ECHO_T}no" >&6; }
|
|
+ localedir=`eval echo "${datadir}/locale"`
|
|
fi
|
|
+prefix="$glib_save_prefix"
|
|
+exec_prefix="$glib_save_exec_prefix"
|
|
+datarootdir="$glib_save_datarootdir"
|
|
|
|
+cat >>confdefs.h <<_ACEOF
|
|
+#define GTOPLOCALEDIR "$localedir"
|
|
+_ACEOF
|
|
|
|
-if test -z "$INTLTOOL_PERL"; then
|
|
- { { echo "$as_me:$LINENO: error: perl not found; required for intltool" >&5
|
|
-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
|
|
- { { echo "$as_me:$LINENO: error: perl 5.x required for intltool" >&5
|
|
-echo "$as_me: error: perl 5.x required for intltool" >&2;}
|
|
- { (exit 1); exit 1; }; }
|
|
-fi
|
|
-if test "x" != "xno-xml"; then
|
|
- { echo "$as_me:$LINENO: checking for XML::Parser" >&5
|
|
-echo $ECHO_N "checking for XML::Parser... $ECHO_C" >&6; }
|
|
- if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
|
|
- { echo "$as_me:$LINENO: result: ok" >&5
|
|
-echo "${ECHO_T}ok" >&6; }
|
|
- else
|
|
- { { echo "$as_me:$LINENO: error: XML::Parser perl module is required for intltool" >&5
|
|
-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
|
|
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for X" >&5
|
|
+$as_echo_n "checking for X... " >&6; }
|
|
|
|
-# Set DATADIRNAME correctly if it is not set yet
|
|
-# (copied from glib-gettext.m4)
|
|
-if test -z "$DATADIRNAME"; then
|
|
- cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
-/* end confdefs.h. */
|
|
|
|
-int
|
|
-main ()
|
|
-{
|
|
-extern int _nl_msg_cat_cntr;
|
|
- return _nl_msg_cat_cntr
|
|
- ;
|
|
- return 0;
|
|
-}
|
|
-_ACEOF
|
|
-rm -f conftest.$ac_objext conftest$ac_exeext
|
|
-if { (ac_try="$ac_link"
|
|
-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_link") 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_exeext &&
|
|
- $as_test_x conftest$ac_exeext; then
|
|
- DATADIRNAME=share
|
|
-else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
- case $host in
|
|
- *-*-solaris*)
|
|
- { echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5
|
|
-echo $ECHO_N "checking for bind_textdomain_codeset... $ECHO_C" >&6; }
|
|
-if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
-else
|
|
- cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
-/* end confdefs.h. */
|
|
-/* Define bind_textdomain_codeset to an innocuous variant, in case <limits.h> declares bind_textdomain_codeset.
|
|
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
|
|
-#define bind_textdomain_codeset innocuous_bind_textdomain_codeset
|
|
-
|
|
-/* System header to define __stub macros and hopefully few prototypes,
|
|
- which can conflict with char bind_textdomain_codeset (); below.
|
|
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
|
|
- <limits.h> exists even on freestanding compilers. */
|
|
-
|
|
-#ifdef __STDC__
|
|
-# include <limits.h>
|
|
-#else
|
|
-# include <assert.h>
|
|
-#endif
|
|
-
|
|
-#undef bind_textdomain_codeset
|
|
-
|
|
-/* Override any GCC internal prototype to avoid an error.
|
|
- Use char because int might match the return type of a GCC
|
|
- builtin and then its argument prototype would still apply. */
|
|
-#ifdef __cplusplus
|
|
-extern "C"
|
|
-#endif
|
|
-char bind_textdomain_codeset ();
|
|
-/* The GNU C library defines this for functions which it implements
|
|
- to always fail with ENOSYS. Some functions are actually named
|
|
- something starting with __ and the normal name is an alias. */
|
|
-#if defined __stub_bind_textdomain_codeset || defined __stub___bind_textdomain_codeset
|
|
-choke me
|
|
-#endif
|
|
-
|
|
-int
|
|
-main ()
|
|
-{
|
|
-return bind_textdomain_codeset ();
|
|
- ;
|
|
- return 0;
|
|
-}
|
|
-_ACEOF
|
|
-rm -f conftest.$ac_objext conftest$ac_exeext
|
|
-if { (ac_try="$ac_link"
|
|
-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_link") 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_exeext &&
|
|
- $as_test_x conftest$ac_exeext; then
|
|
- ac_cv_func_bind_textdomain_codeset=yes
|
|
-else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
- ac_cv_func_bind_textdomain_codeset=no
|
|
-fi
|
|
-
|
|
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
- conftest$ac_exeext conftest.$ac_ext
|
|
-fi
|
|
-{ echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
|
|
-echo "${ECHO_T}$ac_cv_func_bind_textdomain_codeset" >&6; }
|
|
-if test $ac_cv_func_bind_textdomain_codeset = yes; then
|
|
- DATADIRNAME=share
|
|
-else
|
|
- DATADIRNAME=lib
|
|
-fi
|
|
-
|
|
- ;;
|
|
- *)
|
|
- DATADIRNAME=lib
|
|
- ;;
|
|
- esac
|
|
-fi
|
|
-
|
|
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
- conftest$ac_exeext conftest.$ac_ext
|
|
-fi
|
|
-
|
|
-
|
|
-
|
|
-
|
|
-
|
|
-
|
|
-GETTEXT_PACKAGE=libgtop-2.0
|
|
-
|
|
-
|
|
-cat >>confdefs.h <<_ACEOF
|
|
-#define GETTEXT_PACKAGE "$GETTEXT_PACKAGE"
|
|
-_ACEOF
|
|
-
|
|
-
|
|
-
|
|
-
|
|
-for ac_header in locale.h
|
|
-do
|
|
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
|
|
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
|
|
- { echo "$as_me:$LINENO: checking for $ac_header" >&5
|
|
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
|
|
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
-fi
|
|
-ac_res=`eval echo '${'$as_ac_Header'}'`
|
|
- { echo "$as_me:$LINENO: result: $ac_res" >&5
|
|
-echo "${ECHO_T}$ac_res" >&6; }
|
|
-else
|
|
- # Is the header compilable?
|
|
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
|
|
-echo $ECHO_N "checking $ac_header usability... $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. */
|
|
-$ac_includes_default
|
|
-#include <$ac_header>
|
|
-_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
|
|
- ac_header_compiler=yes
|
|
-else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
- ac_header_compiler=no
|
|
-fi
|
|
-
|
|
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
|
|
-echo "${ECHO_T}$ac_header_compiler" >&6; }
|
|
-
|
|
-# Is the header present?
|
|
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
|
|
-echo $ECHO_N "checking $ac_header presence... $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. */
|
|
-#include <$ac_header>
|
|
-_ACEOF
|
|
-if { (ac_try="$ac_cpp conftest.$ac_ext"
|
|
-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_cpp conftest.$ac_ext") 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); } >/dev/null && {
|
|
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
|
|
- test ! -s conftest.err
|
|
- }; then
|
|
- ac_header_preproc=yes
|
|
-else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
- ac_header_preproc=no
|
|
-fi
|
|
-
|
|
-rm -f conftest.err conftest.$ac_ext
|
|
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
|
|
-echo "${ECHO_T}$ac_header_preproc" >&6; }
|
|
-
|
|
-# So? What about this header?
|
|
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
|
|
- yes:no: )
|
|
- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
|
|
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
|
|
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
|
|
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
|
|
- ac_header_preproc=yes
|
|
- ;;
|
|
- no:yes:* )
|
|
- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
|
|
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
|
|
- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
|
|
-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
|
|
- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
|
|
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
|
|
- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
|
|
-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
|
|
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
|
|
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
|
|
- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
|
|
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
|
|
- ( cat <<\_ASBOX
|
|
-## ---------------------------------------------------------------------- ##
|
|
-## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=libgtop ##
|
|
-## ---------------------------------------------------------------------- ##
|
|
-_ASBOX
|
|
- ) | sed "s/^/$as_me: WARNING: /" >&2
|
|
- ;;
|
|
-esac
|
|
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
|
|
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
|
|
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
-else
|
|
- eval "$as_ac_Header=\$ac_header_preproc"
|
|
-fi
|
|
-ac_res=`eval echo '${'$as_ac_Header'}'`
|
|
- { echo "$as_me:$LINENO: result: $ac_res" >&5
|
|
-echo "${ECHO_T}$ac_res" >&6; }
|
|
-
|
|
-fi
|
|
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
|
|
- cat >>confdefs.h <<_ACEOF
|
|
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
|
|
-_ACEOF
|
|
-
|
|
-fi
|
|
-
|
|
-done
|
|
-
|
|
- if test $ac_cv_header_locale_h = yes; then
|
|
- { echo "$as_me:$LINENO: checking for LC_MESSAGES" >&5
|
|
-echo $ECHO_N "checking for LC_MESSAGES... $ECHO_C" >&6; }
|
|
-if test "${am_cv_val_LC_MESSAGES+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
-else
|
|
- cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
-/* end confdefs.h. */
|
|
-#include <locale.h>
|
|
-int
|
|
-main ()
|
|
-{
|
|
-return LC_MESSAGES
|
|
- ;
|
|
- return 0;
|
|
-}
|
|
-_ACEOF
|
|
-rm -f conftest.$ac_objext conftest$ac_exeext
|
|
-if { (ac_try="$ac_link"
|
|
-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_link") 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_exeext &&
|
|
- $as_test_x conftest$ac_exeext; then
|
|
- am_cv_val_LC_MESSAGES=yes
|
|
-else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
- am_cv_val_LC_MESSAGES=no
|
|
-fi
|
|
-
|
|
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
- conftest$ac_exeext conftest.$ac_ext
|
|
-fi
|
|
-{ echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5
|
|
-echo "${ECHO_T}$am_cv_val_LC_MESSAGES" >&6; }
|
|
- if test $am_cv_val_LC_MESSAGES = yes; then
|
|
-
|
|
-cat >>confdefs.h <<\_ACEOF
|
|
-#define HAVE_LC_MESSAGES 1
|
|
-_ACEOF
|
|
-
|
|
- fi
|
|
- fi
|
|
- USE_NLS=yes
|
|
-
|
|
-
|
|
- gt_cv_have_gettext=no
|
|
-
|
|
- CATOBJEXT=NONE
|
|
- XGETTEXT=:
|
|
- INTLLIBS=
|
|
-
|
|
- if test "${ac_cv_header_libintl_h+set}" = set; then
|
|
- { echo "$as_me:$LINENO: checking for libintl.h" >&5
|
|
-echo $ECHO_N "checking for libintl.h... $ECHO_C" >&6; }
|
|
-if test "${ac_cv_header_libintl_h+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
-fi
|
|
-{ echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5
|
|
-echo "${ECHO_T}$ac_cv_header_libintl_h" >&6; }
|
|
-else
|
|
- # Is the header compilable?
|
|
-{ echo "$as_me:$LINENO: checking libintl.h usability" >&5
|
|
-echo $ECHO_N "checking libintl.h usability... $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. */
|
|
-$ac_includes_default
|
|
-#include <libintl.h>
|
|
-_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
|
|
- ac_header_compiler=yes
|
|
-else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
- ac_header_compiler=no
|
|
-fi
|
|
-
|
|
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
|
|
-echo "${ECHO_T}$ac_header_compiler" >&6; }
|
|
-
|
|
-# Is the header present?
|
|
-{ echo "$as_me:$LINENO: checking libintl.h presence" >&5
|
|
-echo $ECHO_N "checking libintl.h presence... $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. */
|
|
-#include <libintl.h>
|
|
-_ACEOF
|
|
-if { (ac_try="$ac_cpp conftest.$ac_ext"
|
|
-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_cpp conftest.$ac_ext") 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); } >/dev/null && {
|
|
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
|
|
- test ! -s conftest.err
|
|
- }; then
|
|
- ac_header_preproc=yes
|
|
-else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
- ac_header_preproc=no
|
|
-fi
|
|
-
|
|
-rm -f conftest.err conftest.$ac_ext
|
|
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
|
|
-echo "${ECHO_T}$ac_header_preproc" >&6; }
|
|
-
|
|
-# So? What about this header?
|
|
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
|
|
- yes:no: )
|
|
- { echo "$as_me:$LINENO: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&5
|
|
-echo "$as_me: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
|
|
- { echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the compiler's result" >&5
|
|
-echo "$as_me: WARNING: libintl.h: proceeding with the compiler's result" >&2;}
|
|
- ac_header_preproc=yes
|
|
- ;;
|
|
- no:yes:* )
|
|
- { echo "$as_me:$LINENO: WARNING: libintl.h: present but cannot be compiled" >&5
|
|
-echo "$as_me: WARNING: libintl.h: present but cannot be compiled" >&2;}
|
|
- { echo "$as_me:$LINENO: WARNING: libintl.h: check for missing prerequisite headers?" >&5
|
|
-echo "$as_me: WARNING: libintl.h: check for missing prerequisite headers?" >&2;}
|
|
- { echo "$as_me:$LINENO: WARNING: libintl.h: see the Autoconf documentation" >&5
|
|
-echo "$as_me: WARNING: libintl.h: see the Autoconf documentation" >&2;}
|
|
- { echo "$as_me:$LINENO: WARNING: libintl.h: section \"Present But Cannot Be Compiled\"" >&5
|
|
-echo "$as_me: WARNING: libintl.h: section \"Present But Cannot Be Compiled\"" >&2;}
|
|
- { echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the preprocessor's result" >&5
|
|
-echo "$as_me: WARNING: libintl.h: proceeding with the preprocessor's result" >&2;}
|
|
- { echo "$as_me:$LINENO: WARNING: libintl.h: in the future, the compiler will take precedence" >&5
|
|
-echo "$as_me: WARNING: libintl.h: in the future, the compiler will take precedence" >&2;}
|
|
- ( cat <<\_ASBOX
|
|
-## ---------------------------------------------------------------------- ##
|
|
-## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=libgtop ##
|
|
-## ---------------------------------------------------------------------- ##
|
|
-_ASBOX
|
|
- ) | sed "s/^/$as_me: WARNING: /" >&2
|
|
- ;;
|
|
-esac
|
|
-{ echo "$as_me:$LINENO: checking for libintl.h" >&5
|
|
-echo $ECHO_N "checking for libintl.h... $ECHO_C" >&6; }
|
|
-if test "${ac_cv_header_libintl_h+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
-else
|
|
- ac_cv_header_libintl_h=$ac_header_preproc
|
|
-fi
|
|
-{ echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5
|
|
-echo "${ECHO_T}$ac_cv_header_libintl_h" >&6; }
|
|
-
|
|
-fi
|
|
-if test $ac_cv_header_libintl_h = yes; then
|
|
- gt_cv_func_dgettext_libintl="no"
|
|
- libintl_extra_libs=""
|
|
-
|
|
- #
|
|
- # First check in libc
|
|
- #
|
|
- { echo "$as_me:$LINENO: checking for ngettext in libc" >&5
|
|
-echo $ECHO_N "checking for ngettext in libc... $ECHO_C" >&6; }
|
|
-if test "${gt_cv_func_ngettext_libc+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
-else
|
|
- cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
-/* end confdefs.h. */
|
|
-
|
|
-#include <libintl.h>
|
|
-
|
|
-int
|
|
-main ()
|
|
-{
|
|
-return !ngettext ("","", 1)
|
|
- ;
|
|
- return 0;
|
|
-}
|
|
-_ACEOF
|
|
-rm -f conftest.$ac_objext conftest$ac_exeext
|
|
-if { (ac_try="$ac_link"
|
|
-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_link") 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_exeext &&
|
|
- $as_test_x conftest$ac_exeext; then
|
|
- gt_cv_func_ngettext_libc=yes
|
|
-else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
- gt_cv_func_ngettext_libc=no
|
|
-fi
|
|
-
|
|
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
- conftest$ac_exeext conftest.$ac_ext
|
|
-
|
|
-fi
|
|
-{ echo "$as_me:$LINENO: result: $gt_cv_func_ngettext_libc" >&5
|
|
-echo "${ECHO_T}$gt_cv_func_ngettext_libc" >&6; }
|
|
-
|
|
- if test "$gt_cv_func_ngettext_libc" = "yes" ; then
|
|
- { echo "$as_me:$LINENO: checking for dgettext in libc" >&5
|
|
-echo $ECHO_N "checking for dgettext in libc... $ECHO_C" >&6; }
|
|
-if test "${gt_cv_func_dgettext_libc+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
-else
|
|
- cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
-/* end confdefs.h. */
|
|
-
|
|
-#include <libintl.h>
|
|
-
|
|
-int
|
|
-main ()
|
|
-{
|
|
-return !dgettext ("","")
|
|
- ;
|
|
- return 0;
|
|
-}
|
|
-_ACEOF
|
|
-rm -f conftest.$ac_objext conftest$ac_exeext
|
|
-if { (ac_try="$ac_link"
|
|
-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_link") 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_exeext &&
|
|
- $as_test_x conftest$ac_exeext; then
|
|
- gt_cv_func_dgettext_libc=yes
|
|
-else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
- gt_cv_func_dgettext_libc=no
|
|
-fi
|
|
-
|
|
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
- conftest$ac_exeext conftest.$ac_ext
|
|
-
|
|
-fi
|
|
-{ echo "$as_me:$LINENO: result: $gt_cv_func_dgettext_libc" >&5
|
|
-echo "${ECHO_T}$gt_cv_func_dgettext_libc" >&6; }
|
|
- fi
|
|
-
|
|
- if test "$gt_cv_func_ngettext_libc" = "yes" ; then
|
|
-
|
|
-for ac_func in bind_textdomain_codeset
|
|
-do
|
|
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
|
|
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
|
|
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
|
|
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
-else
|
|
- cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
-/* end confdefs.h. */
|
|
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
|
|
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
|
|
-#define $ac_func innocuous_$ac_func
|
|
-
|
|
-/* System header to define __stub macros and hopefully few prototypes,
|
|
- which can conflict with char $ac_func (); below.
|
|
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
|
|
- <limits.h> exists even on freestanding compilers. */
|
|
-
|
|
-#ifdef __STDC__
|
|
-# include <limits.h>
|
|
-#else
|
|
-# include <assert.h>
|
|
-#endif
|
|
-
|
|
-#undef $ac_func
|
|
-
|
|
-/* Override any GCC internal prototype to avoid an error.
|
|
- Use char because int might match the return type of a GCC
|
|
- builtin and then its argument prototype would still apply. */
|
|
-#ifdef __cplusplus
|
|
-extern "C"
|
|
-#endif
|
|
-char $ac_func ();
|
|
-/* The GNU C library defines this for functions which it implements
|
|
- to always fail with ENOSYS. Some functions are actually named
|
|
- something starting with __ and the normal name is an alias. */
|
|
-#if defined __stub_$ac_func || defined __stub___$ac_func
|
|
-choke me
|
|
-#endif
|
|
-
|
|
-int
|
|
-main ()
|
|
-{
|
|
-return $ac_func ();
|
|
- ;
|
|
- return 0;
|
|
-}
|
|
-_ACEOF
|
|
-rm -f conftest.$ac_objext conftest$ac_exeext
|
|
-if { (ac_try="$ac_link"
|
|
-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_link") 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_exeext &&
|
|
- $as_test_x conftest$ac_exeext; then
|
|
- eval "$as_ac_var=yes"
|
|
-else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
- eval "$as_ac_var=no"
|
|
-fi
|
|
-
|
|
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
- conftest$ac_exeext conftest.$ac_ext
|
|
-fi
|
|
-ac_res=`eval echo '${'$as_ac_var'}'`
|
|
- { echo "$as_me:$LINENO: result: $ac_res" >&5
|
|
-echo "${ECHO_T}$ac_res" >&6; }
|
|
-if test `eval echo '${'$as_ac_var'}'` = yes; then
|
|
- cat >>confdefs.h <<_ACEOF
|
|
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
|
|
-_ACEOF
|
|
-
|
|
-fi
|
|
-done
|
|
-
|
|
- fi
|
|
-
|
|
- #
|
|
- # If we don't have everything we want, check in libintl
|
|
- #
|
|
- if test "$gt_cv_func_dgettext_libc" != "yes" \
|
|
- || test "$gt_cv_func_ngettext_libc" != "yes" \
|
|
- || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
|
|
-
|
|
- { echo "$as_me:$LINENO: checking for bindtextdomain in -lintl" >&5
|
|
-echo $ECHO_N "checking for bindtextdomain in -lintl... $ECHO_C" >&6; }
|
|
-if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
-else
|
|
- ac_check_lib_save_LIBS=$LIBS
|
|
-LIBS="-lintl $LIBS"
|
|
-cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
-/* end confdefs.h. */
|
|
-
|
|
-/* Override any GCC internal prototype to avoid an error.
|
|
- Use char because int might match the return type of a GCC
|
|
- builtin and then its argument prototype would still apply. */
|
|
-#ifdef __cplusplus
|
|
-extern "C"
|
|
-#endif
|
|
-char bindtextdomain ();
|
|
-int
|
|
-main ()
|
|
-{
|
|
-return bindtextdomain ();
|
|
- ;
|
|
- return 0;
|
|
-}
|
|
-_ACEOF
|
|
-rm -f conftest.$ac_objext conftest$ac_exeext
|
|
-if { (ac_try="$ac_link"
|
|
-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_link") 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_exeext &&
|
|
- $as_test_x conftest$ac_exeext; then
|
|
- ac_cv_lib_intl_bindtextdomain=yes
|
|
-else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
- ac_cv_lib_intl_bindtextdomain=no
|
|
-fi
|
|
-
|
|
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
- conftest$ac_exeext conftest.$ac_ext
|
|
-LIBS=$ac_check_lib_save_LIBS
|
|
-fi
|
|
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_bindtextdomain" >&5
|
|
-echo "${ECHO_T}$ac_cv_lib_intl_bindtextdomain" >&6; }
|
|
-if test $ac_cv_lib_intl_bindtextdomain = yes; then
|
|
- { echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5
|
|
-echo $ECHO_N "checking for ngettext in -lintl... $ECHO_C" >&6; }
|
|
-if test "${ac_cv_lib_intl_ngettext+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
-else
|
|
- ac_check_lib_save_LIBS=$LIBS
|
|
-LIBS="-lintl $LIBS"
|
|
-cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
-/* end confdefs.h. */
|
|
-
|
|
-/* Override any GCC internal prototype to avoid an error.
|
|
- Use char because int might match the return type of a GCC
|
|
- builtin and then its argument prototype would still apply. */
|
|
-#ifdef __cplusplus
|
|
-extern "C"
|
|
-#endif
|
|
-char ngettext ();
|
|
-int
|
|
-main ()
|
|
-{
|
|
-return ngettext ();
|
|
- ;
|
|
- return 0;
|
|
-}
|
|
-_ACEOF
|
|
-rm -f conftest.$ac_objext conftest$ac_exeext
|
|
-if { (ac_try="$ac_link"
|
|
-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_link") 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_exeext &&
|
|
- $as_test_x conftest$ac_exeext; then
|
|
- ac_cv_lib_intl_ngettext=yes
|
|
-else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
- ac_cv_lib_intl_ngettext=no
|
|
-fi
|
|
-
|
|
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
- conftest$ac_exeext conftest.$ac_ext
|
|
-LIBS=$ac_check_lib_save_LIBS
|
|
-fi
|
|
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5
|
|
-echo "${ECHO_T}$ac_cv_lib_intl_ngettext" >&6; }
|
|
-if test $ac_cv_lib_intl_ngettext = yes; then
|
|
- { echo "$as_me:$LINENO: checking for dgettext in -lintl" >&5
|
|
-echo $ECHO_N "checking for dgettext in -lintl... $ECHO_C" >&6; }
|
|
-if test "${ac_cv_lib_intl_dgettext+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
-else
|
|
- ac_check_lib_save_LIBS=$LIBS
|
|
-LIBS="-lintl $LIBS"
|
|
-cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
-/* end confdefs.h. */
|
|
-
|
|
-/* Override any GCC internal prototype to avoid an error.
|
|
- Use char because int might match the return type of a GCC
|
|
- builtin and then its argument prototype would still apply. */
|
|
-#ifdef __cplusplus
|
|
-extern "C"
|
|
-#endif
|
|
-char dgettext ();
|
|
-int
|
|
-main ()
|
|
-{
|
|
-return dgettext ();
|
|
- ;
|
|
- return 0;
|
|
-}
|
|
-_ACEOF
|
|
-rm -f conftest.$ac_objext conftest$ac_exeext
|
|
-if { (ac_try="$ac_link"
|
|
-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_link") 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_exeext &&
|
|
- $as_test_x conftest$ac_exeext; then
|
|
- ac_cv_lib_intl_dgettext=yes
|
|
-else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
- ac_cv_lib_intl_dgettext=no
|
|
-fi
|
|
-
|
|
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
- conftest$ac_exeext conftest.$ac_ext
|
|
-LIBS=$ac_check_lib_save_LIBS
|
|
-fi
|
|
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dgettext" >&5
|
|
-echo "${ECHO_T}$ac_cv_lib_intl_dgettext" >&6; }
|
|
-if test $ac_cv_lib_intl_dgettext = yes; then
|
|
- gt_cv_func_dgettext_libintl=yes
|
|
-fi
|
|
-
|
|
-fi
|
|
-
|
|
-fi
|
|
-
|
|
-
|
|
- if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
|
|
- { echo "$as_me:$LINENO: checking if -liconv is needed to use gettext" >&5
|
|
-echo $ECHO_N "checking if -liconv is needed to use gettext... $ECHO_C" >&6; }
|
|
- { echo "$as_me:$LINENO: result: " >&5
|
|
-echo "${ECHO_T}" >&6; }
|
|
- { echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5
|
|
-echo $ECHO_N "checking for ngettext in -lintl... $ECHO_C" >&6; }
|
|
-if test "${ac_cv_lib_intl_ngettext+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
-else
|
|
- ac_check_lib_save_LIBS=$LIBS
|
|
-LIBS="-lintl -liconv $LIBS"
|
|
-cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
-/* end confdefs.h. */
|
|
-
|
|
-/* Override any GCC internal prototype to avoid an error.
|
|
- Use char because int might match the return type of a GCC
|
|
- builtin and then its argument prototype would still apply. */
|
|
-#ifdef __cplusplus
|
|
-extern "C"
|
|
-#endif
|
|
-char ngettext ();
|
|
-int
|
|
-main ()
|
|
-{
|
|
-return ngettext ();
|
|
- ;
|
|
- return 0;
|
|
-}
|
|
-_ACEOF
|
|
-rm -f conftest.$ac_objext conftest$ac_exeext
|
|
-if { (ac_try="$ac_link"
|
|
-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_link") 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_exeext &&
|
|
- $as_test_x conftest$ac_exeext; then
|
|
- ac_cv_lib_intl_ngettext=yes
|
|
-else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
- ac_cv_lib_intl_ngettext=no
|
|
-fi
|
|
-
|
|
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
- conftest$ac_exeext conftest.$ac_ext
|
|
-LIBS=$ac_check_lib_save_LIBS
|
|
-fi
|
|
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5
|
|
-echo "${ECHO_T}$ac_cv_lib_intl_ngettext" >&6; }
|
|
-if test $ac_cv_lib_intl_ngettext = yes; then
|
|
- { echo "$as_me:$LINENO: checking for dcgettext in -lintl" >&5
|
|
-echo $ECHO_N "checking for dcgettext in -lintl... $ECHO_C" >&6; }
|
|
-if test "${ac_cv_lib_intl_dcgettext+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
-else
|
|
- ac_check_lib_save_LIBS=$LIBS
|
|
-LIBS="-lintl -liconv $LIBS"
|
|
-cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
-/* end confdefs.h. */
|
|
-
|
|
-/* Override any GCC internal prototype to avoid an error.
|
|
- Use char because int might match the return type of a GCC
|
|
- builtin and then its argument prototype would still apply. */
|
|
-#ifdef __cplusplus
|
|
-extern "C"
|
|
-#endif
|
|
-char dcgettext ();
|
|
-int
|
|
-main ()
|
|
-{
|
|
-return dcgettext ();
|
|
- ;
|
|
- return 0;
|
|
-}
|
|
-_ACEOF
|
|
-rm -f conftest.$ac_objext conftest$ac_exeext
|
|
-if { (ac_try="$ac_link"
|
|
-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_link") 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_exeext &&
|
|
- $as_test_x conftest$ac_exeext; then
|
|
- ac_cv_lib_intl_dcgettext=yes
|
|
-else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
- ac_cv_lib_intl_dcgettext=no
|
|
-fi
|
|
-
|
|
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
- conftest$ac_exeext conftest.$ac_ext
|
|
-LIBS=$ac_check_lib_save_LIBS
|
|
-fi
|
|
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dcgettext" >&5
|
|
-echo "${ECHO_T}$ac_cv_lib_intl_dcgettext" >&6; }
|
|
-if test $ac_cv_lib_intl_dcgettext = yes; then
|
|
- gt_cv_func_dgettext_libintl=yes
|
|
- libintl_extra_libs=-liconv
|
|
-else
|
|
- :
|
|
-fi
|
|
-
|
|
-else
|
|
- :
|
|
-fi
|
|
-
|
|
- fi
|
|
-
|
|
- #
|
|
- # If we found libintl, then check in it for bind_textdomain_codeset();
|
|
- # we'll prefer libc if neither have bind_textdomain_codeset(),
|
|
- # and both have dgettext and ngettext
|
|
- #
|
|
- if test "$gt_cv_func_dgettext_libintl" = "yes" ; then
|
|
- glib_save_LIBS="$LIBS"
|
|
- LIBS="$LIBS -lintl $libintl_extra_libs"
|
|
- unset ac_cv_func_bind_textdomain_codeset
|
|
-
|
|
-for ac_func in bind_textdomain_codeset
|
|
-do
|
|
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
|
|
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
|
|
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
|
|
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
-else
|
|
- cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
-/* end confdefs.h. */
|
|
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
|
|
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
|
|
-#define $ac_func innocuous_$ac_func
|
|
-
|
|
-/* System header to define __stub macros and hopefully few prototypes,
|
|
- which can conflict with char $ac_func (); below.
|
|
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
|
|
- <limits.h> exists even on freestanding compilers. */
|
|
-
|
|
-#ifdef __STDC__
|
|
-# include <limits.h>
|
|
-#else
|
|
-# include <assert.h>
|
|
-#endif
|
|
-
|
|
-#undef $ac_func
|
|
-
|
|
-/* Override any GCC internal prototype to avoid an error.
|
|
- Use char because int might match the return type of a GCC
|
|
- builtin and then its argument prototype would still apply. */
|
|
-#ifdef __cplusplus
|
|
-extern "C"
|
|
-#endif
|
|
-char $ac_func ();
|
|
-/* The GNU C library defines this for functions which it implements
|
|
- to always fail with ENOSYS. Some functions are actually named
|
|
- something starting with __ and the normal name is an alias. */
|
|
-#if defined __stub_$ac_func || defined __stub___$ac_func
|
|
-choke me
|
|
-#endif
|
|
-
|
|
-int
|
|
-main ()
|
|
-{
|
|
-return $ac_func ();
|
|
- ;
|
|
- return 0;
|
|
-}
|
|
-_ACEOF
|
|
-rm -f conftest.$ac_objext conftest$ac_exeext
|
|
-if { (ac_try="$ac_link"
|
|
-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_link") 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_exeext &&
|
|
- $as_test_x conftest$ac_exeext; then
|
|
- eval "$as_ac_var=yes"
|
|
-else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
- eval "$as_ac_var=no"
|
|
-fi
|
|
-
|
|
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
- conftest$ac_exeext conftest.$ac_ext
|
|
-fi
|
|
-ac_res=`eval echo '${'$as_ac_var'}'`
|
|
- { echo "$as_me:$LINENO: result: $ac_res" >&5
|
|
-echo "${ECHO_T}$ac_res" >&6; }
|
|
-if test `eval echo '${'$as_ac_var'}'` = yes; then
|
|
- cat >>confdefs.h <<_ACEOF
|
|
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
|
|
-_ACEOF
|
|
-
|
|
-fi
|
|
-done
|
|
-
|
|
- LIBS="$glib_save_LIBS"
|
|
-
|
|
- if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then
|
|
- gt_cv_func_dgettext_libc=no
|
|
- else
|
|
- if test "$gt_cv_func_dgettext_libc" = "yes" \
|
|
- && test "$gt_cv_func_ngettext_libc" = "yes"; then
|
|
- gt_cv_func_dgettext_libintl=no
|
|
- fi
|
|
- fi
|
|
- fi
|
|
- fi
|
|
-
|
|
- if test "$gt_cv_func_dgettext_libc" = "yes" \
|
|
- || test "$gt_cv_func_dgettext_libintl" = "yes"; then
|
|
- gt_cv_have_gettext=yes
|
|
- fi
|
|
-
|
|
- if test "$gt_cv_func_dgettext_libintl" = "yes"; then
|
|
- INTLLIBS="-lintl $libintl_extra_libs"
|
|
- fi
|
|
-
|
|
- if test "$gt_cv_have_gettext" = "yes"; then
|
|
-
|
|
-cat >>confdefs.h <<\_ACEOF
|
|
-#define HAVE_GETTEXT 1
|
|
-_ACEOF
|
|
-
|
|
- # 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_MSGFMT+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
-else
|
|
- case "$MSGFMT" in
|
|
- /*)
|
|
- ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path.
|
|
- ;;
|
|
- *)
|
|
- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
|
|
- for ac_dir in $PATH; do
|
|
- test -z "$ac_dir" && ac_dir=.
|
|
- if test -f $ac_dir/$ac_word; then
|
|
- if test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"; then
|
|
- ac_cv_path_MSGFMT="$ac_dir/$ac_word"
|
|
- break
|
|
- fi
|
|
- fi
|
|
- done
|
|
- IFS="$ac_save_ifs"
|
|
- test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT="no"
|
|
- ;;
|
|
-esac
|
|
-fi
|
|
-MSGFMT="$ac_cv_path_MSGFMT"
|
|
-if test "$MSGFMT" != "no"; then
|
|
- { echo "$as_me:$LINENO: result: $MSGFMT" >&5
|
|
-echo "${ECHO_T}$MSGFMT" >&6; }
|
|
-else
|
|
- { echo "$as_me:$LINENO: result: no" >&5
|
|
-echo "${ECHO_T}no" >&6; }
|
|
-fi
|
|
- if test "$MSGFMT" != "no"; then
|
|
- glib_save_LIBS="$LIBS"
|
|
- LIBS="$LIBS $INTLLIBS"
|
|
-
|
|
-for ac_func in dcgettext
|
|
-do
|
|
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
|
|
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
|
|
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
|
|
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
-else
|
|
- cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
-/* end confdefs.h. */
|
|
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
|
|
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
|
|
-#define $ac_func innocuous_$ac_func
|
|
-
|
|
-/* System header to define __stub macros and hopefully few prototypes,
|
|
- which can conflict with char $ac_func (); below.
|
|
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
|
|
- <limits.h> exists even on freestanding compilers. */
|
|
-
|
|
-#ifdef __STDC__
|
|
-# include <limits.h>
|
|
-#else
|
|
-# include <assert.h>
|
|
-#endif
|
|
-
|
|
-#undef $ac_func
|
|
-
|
|
-/* Override any GCC internal prototype to avoid an error.
|
|
- Use char because int might match the return type of a GCC
|
|
- builtin and then its argument prototype would still apply. */
|
|
-#ifdef __cplusplus
|
|
-extern "C"
|
|
-#endif
|
|
-char $ac_func ();
|
|
-/* The GNU C library defines this for functions which it implements
|
|
- to always fail with ENOSYS. Some functions are actually named
|
|
- something starting with __ and the normal name is an alias. */
|
|
-#if defined __stub_$ac_func || defined __stub___$ac_func
|
|
-choke me
|
|
-#endif
|
|
-
|
|
-int
|
|
-main ()
|
|
-{
|
|
-return $ac_func ();
|
|
- ;
|
|
- return 0;
|
|
-}
|
|
-_ACEOF
|
|
-rm -f conftest.$ac_objext conftest$ac_exeext
|
|
-if { (ac_try="$ac_link"
|
|
-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_link") 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_exeext &&
|
|
- $as_test_x conftest$ac_exeext; then
|
|
- eval "$as_ac_var=yes"
|
|
-else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
- eval "$as_ac_var=no"
|
|
-fi
|
|
-
|
|
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
- conftest$ac_exeext conftest.$ac_ext
|
|
-fi
|
|
-ac_res=`eval echo '${'$as_ac_var'}'`
|
|
- { echo "$as_me:$LINENO: result: $ac_res" >&5
|
|
-echo "${ECHO_T}$ac_res" >&6; }
|
|
-if test `eval echo '${'$as_ac_var'}'` = yes; then
|
|
- cat >>confdefs.h <<_ACEOF
|
|
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
|
|
-_ACEOF
|
|
-
|
|
-fi
|
|
-done
|
|
-
|
|
- MSGFMT_OPTS=
|
|
- { echo "$as_me:$LINENO: checking if msgfmt accepts -c" >&5
|
|
-echo $ECHO_N "checking if msgfmt accepts -c... $ECHO_C" >&6; }
|
|
- cat >conftest.foo <<_ACEOF
|
|
-
|
|
-msgid ""
|
|
-msgstr ""
|
|
-"Content-Type: text/plain; charset=UTF-8\n"
|
|
-"Project-Id-Version: test 1.0\n"
|
|
-"PO-Revision-Date: 2007-02-15 12:01+0100\n"
|
|
-"Last-Translator: test <foo@bar.xx>\n"
|
|
-"Language-Team: C <LL@li.org>\n"
|
|
-"MIME-Version: 1.0\n"
|
|
-"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
|
|
- ac_status=$?
|
|
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
- (exit $ac_status); }; then
|
|
- MSGFMT_OPTS=-c; { echo "$as_me:$LINENO: result: yes" >&5
|
|
-echo "${ECHO_T}yes" >&6; }
|
|
-else { echo "$as_me:$LINENO: result: no" >&5
|
|
-echo "${ECHO_T}no" >&6; }
|
|
-echo "$as_me: failed input was:" >&5
|
|
-sed 's/^/| /' conftest.foo >&5
|
|
-fi
|
|
-
|
|
- # Extract the first word of "gmsgfmt", so it can be a program name with args.
|
|
-set dummy gmsgfmt; 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_GMSGFMT+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
-else
|
|
- case $GMSGFMT in
|
|
- [\\/]* | ?:[\\/]*)
|
|
- ac_cv_path_GMSGFMT="$GMSGFMT" # 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_GMSGFMT="$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_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
|
|
- ;;
|
|
-esac
|
|
-fi
|
|
-GMSGFMT=$ac_cv_path_GMSGFMT
|
|
-if test -n "$GMSGFMT"; then
|
|
- { echo "$as_me:$LINENO: result: $GMSGFMT" >&5
|
|
-echo "${ECHO_T}$GMSGFMT" >&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_XGETTEXT+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
-else
|
|
- case "$XGETTEXT" in
|
|
- /*)
|
|
- ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path.
|
|
- ;;
|
|
- *)
|
|
- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
|
|
- for ac_dir in $PATH; do
|
|
- test -z "$ac_dir" && ac_dir=.
|
|
- if test -f $ac_dir/$ac_word; then
|
|
- if test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"; then
|
|
- ac_cv_path_XGETTEXT="$ac_dir/$ac_word"
|
|
- break
|
|
- fi
|
|
- fi
|
|
- done
|
|
- IFS="$ac_save_ifs"
|
|
- test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":"
|
|
- ;;
|
|
-esac
|
|
-fi
|
|
-XGETTEXT="$ac_cv_path_XGETTEXT"
|
|
-if test "$XGETTEXT" != ":"; then
|
|
- { echo "$as_me:$LINENO: result: $XGETTEXT" >&5
|
|
-echo "${ECHO_T}$XGETTEXT" >&6; }
|
|
-else
|
|
- { echo "$as_me:$LINENO: result: no" >&5
|
|
-echo "${ECHO_T}no" >&6; }
|
|
-fi
|
|
-
|
|
- cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
-/* end confdefs.h. */
|
|
-
|
|
-int
|
|
-main ()
|
|
-{
|
|
-extern int _nl_msg_cat_cntr;
|
|
- return _nl_msg_cat_cntr
|
|
- ;
|
|
- return 0;
|
|
-}
|
|
-_ACEOF
|
|
-rm -f conftest.$ac_objext conftest$ac_exeext
|
|
-if { (ac_try="$ac_link"
|
|
-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_link") 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_exeext &&
|
|
- $as_test_x conftest$ac_exeext; then
|
|
- CATOBJEXT=.gmo
|
|
- DATADIRNAME=share
|
|
-else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
- case $host in
|
|
- *-*-solaris*)
|
|
- { echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5
|
|
-echo $ECHO_N "checking for bind_textdomain_codeset... $ECHO_C" >&6; }
|
|
-if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
-else
|
|
- cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
-/* end confdefs.h. */
|
|
-/* Define bind_textdomain_codeset to an innocuous variant, in case <limits.h> declares bind_textdomain_codeset.
|
|
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
|
|
-#define bind_textdomain_codeset innocuous_bind_textdomain_codeset
|
|
-
|
|
-/* System header to define __stub macros and hopefully few prototypes,
|
|
- which can conflict with char bind_textdomain_codeset (); below.
|
|
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
|
|
- <limits.h> exists even on freestanding compilers. */
|
|
-
|
|
-#ifdef __STDC__
|
|
-# include <limits.h>
|
|
-#else
|
|
-# include <assert.h>
|
|
-#endif
|
|
-
|
|
-#undef bind_textdomain_codeset
|
|
-
|
|
-/* Override any GCC internal prototype to avoid an error.
|
|
- Use char because int might match the return type of a GCC
|
|
- builtin and then its argument prototype would still apply. */
|
|
-#ifdef __cplusplus
|
|
-extern "C"
|
|
-#endif
|
|
-char bind_textdomain_codeset ();
|
|
-/* The GNU C library defines this for functions which it implements
|
|
- to always fail with ENOSYS. Some functions are actually named
|
|
- something starting with __ and the normal name is an alias. */
|
|
-#if defined __stub_bind_textdomain_codeset || defined __stub___bind_textdomain_codeset
|
|
-choke me
|
|
-#endif
|
|
-
|
|
-int
|
|
-main ()
|
|
-{
|
|
-return bind_textdomain_codeset ();
|
|
- ;
|
|
- return 0;
|
|
-}
|
|
-_ACEOF
|
|
-rm -f conftest.$ac_objext conftest$ac_exeext
|
|
-if { (ac_try="$ac_link"
|
|
-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_link") 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_exeext &&
|
|
- $as_test_x conftest$ac_exeext; then
|
|
- ac_cv_func_bind_textdomain_codeset=yes
|
|
-else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
- ac_cv_func_bind_textdomain_codeset=no
|
|
-fi
|
|
-
|
|
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
- conftest$ac_exeext conftest.$ac_ext
|
|
-fi
|
|
-{ echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
|
|
-echo "${ECHO_T}$ac_cv_func_bind_textdomain_codeset" >&6; }
|
|
-if test $ac_cv_func_bind_textdomain_codeset = yes; then
|
|
- CATOBJEXT=.gmo
|
|
- DATADIRNAME=share
|
|
-else
|
|
- CATOBJEXT=.mo
|
|
- DATADIRNAME=lib
|
|
-fi
|
|
-
|
|
- ;;
|
|
- *)
|
|
- CATOBJEXT=.mo
|
|
- DATADIRNAME=lib
|
|
- ;;
|
|
- esac
|
|
-fi
|
|
-
|
|
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
- conftest$ac_exeext conftest.$ac_ext
|
|
- LIBS="$glib_save_LIBS"
|
|
- INSTOBJEXT=.mo
|
|
- else
|
|
- gt_cv_have_gettext=no
|
|
- fi
|
|
- fi
|
|
-
|
|
-fi
|
|
-
|
|
-
|
|
-
|
|
- if test "$gt_cv_have_gettext" = "yes" ; then
|
|
-
|
|
-cat >>confdefs.h <<\_ACEOF
|
|
-#define ENABLE_NLS 1
|
|
-_ACEOF
|
|
-
|
|
- fi
|
|
-
|
|
- if test "$XGETTEXT" != ":"; then
|
|
- if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
|
|
- : ;
|
|
- else
|
|
- { echo "$as_me:$LINENO: result: found xgettext program is not GNU xgettext; ignore it" >&5
|
|
-echo "${ECHO_T}found xgettext program is not GNU xgettext; ignore it" >&6; }
|
|
- XGETTEXT=":"
|
|
- fi
|
|
- fi
|
|
-
|
|
- # We need to process the po/ directory.
|
|
- POSUB=po
|
|
-
|
|
- ac_config_commands="$ac_config_commands default-1"
|
|
-
|
|
-
|
|
- for lang in $ALL_LINGUAS; do
|
|
- GMOFILES="$GMOFILES $lang.gmo"
|
|
- POFILES="$POFILES $lang.po"
|
|
- done
|
|
-
|
|
-
|
|
-
|
|
-
|
|
-
|
|
-
|
|
-
|
|
-
|
|
-
|
|
-
|
|
-
|
|
-
|
|
-
|
|
- if test "$gt_cv_have_gettext" = "yes"; then
|
|
- if test "x$ALL_LINGUAS" = "x"; then
|
|
- LINGUAS=
|
|
- else
|
|
- { echo "$as_me:$LINENO: checking for catalogs to be installed" >&5
|
|
-echo $ECHO_N "checking for catalogs to be installed... $ECHO_C" >&6; }
|
|
- NEW_LINGUAS=
|
|
- for presentlang in $ALL_LINGUAS; do
|
|
- useit=no
|
|
- if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then
|
|
- desiredlanguages="$LINGUAS"
|
|
- else
|
|
- desiredlanguages="$ALL_LINGUAS"
|
|
- fi
|
|
- for desiredlang in $desiredlanguages; do
|
|
- # Use the presentlang catalog if desiredlang is
|
|
- # a. equal to presentlang, or
|
|
- # b. a variant of presentlang (because in this case,
|
|
- # presentlang can be used as a fallback for messages
|
|
- # which are not translated in the desiredlang catalog).
|
|
- case "$desiredlang" in
|
|
- "$presentlang"*) useit=yes;;
|
|
- esac
|
|
- done
|
|
- if test $useit = yes; then
|
|
- NEW_LINGUAS="$NEW_LINGUAS $presentlang"
|
|
- fi
|
|
- done
|
|
- LINGUAS=$NEW_LINGUAS
|
|
- { echo "$as_me:$LINENO: result: $LINGUAS" >&5
|
|
-echo "${ECHO_T}$LINGUAS" >&6; }
|
|
- fi
|
|
-
|
|
- if test -n "$LINGUAS"; then
|
|
- for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
|
|
- fi
|
|
- fi
|
|
-
|
|
- MKINSTALLDIRS=
|
|
- if test -n "$ac_aux_dir"; then
|
|
- MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
|
|
- fi
|
|
- if test -z "$MKINSTALLDIRS"; then
|
|
- MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
|
|
- fi
|
|
-
|
|
-
|
|
- test -d po || mkdir po
|
|
- if test "x$srcdir" != "x."; then
|
|
- if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
|
|
- posrcprefix="$srcdir/"
|
|
- else
|
|
- posrcprefix="../$srcdir/"
|
|
- fi
|
|
- else
|
|
- posrcprefix="../"
|
|
- fi
|
|
- rm -f po/POTFILES
|
|
- sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
|
|
- < $srcdir/po/POTFILES.in > po/POTFILES
|
|
-
|
|
-glib_save_prefix="$prefix"
|
|
-glib_save_exec_prefix="$exec_prefix"
|
|
-glib_save_datarootdir="$datarootdir"
|
|
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
|
|
-test "x$exec_prefix" = xNONE && exec_prefix=$prefix
|
|
-datarootdir=`eval echo "${datarootdir}"`
|
|
-if test "x$CATOBJEXT" = "x.mo" ; then
|
|
- localedir=`eval echo "${libdir}/locale"`
|
|
-else
|
|
- localedir=`eval echo "${datadir}/locale"`
|
|
-fi
|
|
-prefix="$glib_save_prefix"
|
|
-exec_prefix="$glib_save_exec_prefix"
|
|
-datarootdir="$glib_save_datarootdir"
|
|
-
|
|
-cat >>confdefs.h <<_ACEOF
|
|
-#define GTOPLOCALEDIR "$localedir"
|
|
-_ACEOF
|
|
-
|
|
-
|
|
-
|
|
-{ echo "$as_me:$LINENO: checking for X" >&5
|
|
-echo $ECHO_N "checking for X... $ECHO_C" >&6; }
|
|
-
|
|
-
|
|
-# Check whether --with-x was given.
|
|
-if test "${with_x+set}" = set; then
|
|
- withval=$with_x;
|
|
-fi
|
|
-
|
|
-# $have_x is `yes', `no', `disabled', or empty when we do not yet know.
|
|
-if test "x$with_x" = xno; then
|
|
- # The user explicitly disabled X.
|
|
- have_x=disabled
|
|
-else
|
|
- case $x_includes,$x_libraries in #(
|
|
- *\'*) { { echo "$as_me:$LINENO: error: Cannot use X directory names containing '" >&5
|
|
-echo "$as_me: error: Cannot use X directory names containing '" >&2;}
|
|
- { (exit 1); exit 1; }; };; #(
|
|
- *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
-else
|
|
- # One or both of the vars are not set, and there is no cached value.
|
|
-ac_x_includes=no ac_x_libraries=no
|
|
-rm -f -r conftest.dir
|
|
-if mkdir conftest.dir; then
|
|
- cd conftest.dir
|
|
- cat >Imakefile <<'_ACEOF'
|
|
-incroot:
|
|
- @echo incroot='${INCROOT}'
|
|
-usrlibdir:
|
|
- @echo usrlibdir='${USRLIBDIR}'
|
|
-libdir:
|
|
- @echo libdir='${LIBDIR}'
|
|
-_ACEOF
|
|
- if (export CC; ${XMKMF-xmkmf}) >/dev/null 2>/dev/null && test -f Makefile; then
|
|
- # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
|
|
- for ac_var in incroot usrlibdir libdir; do
|
|
- eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`"
|
|
- done
|
|
- # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR.
|
|
- for ac_extension in a so sl; do
|
|
- if test ! -f "$ac_im_usrlibdir/libX11.$ac_extension" &&
|
|
- test -f "$ac_im_libdir/libX11.$ac_extension"; then
|
|
- ac_im_usrlibdir=$ac_im_libdir; break
|
|
- fi
|
|
- done
|
|
- # Screen out bogus values from the imake configuration. They are
|
|
- # bogus both because they are the default anyway, and because
|
|
- # using them would break gcc on systems where it needs fixed includes.
|
|
- case $ac_im_incroot in
|
|
- /usr/include) ac_x_includes= ;;
|
|
- *) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;;
|
|
- esac
|
|
- case $ac_im_usrlibdir in
|
|
- /usr/lib | /lib) ;;
|
|
- *) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;;
|
|
- esac
|
|
- fi
|
|
- cd ..
|
|
- rm -f -r conftest.dir
|
|
-fi
|
|
-
|
|
-# Standard set of common directories for X headers.
|
|
-# Check X11 before X11Rn because it is often a symlink to the current release.
|
|
-ac_x_header_dirs='
|
|
-/usr/X11/include
|
|
-/usr/X11R6/include
|
|
-/usr/X11R5/include
|
|
-/usr/X11R4/include
|
|
-
|
|
-/usr/include/X11
|
|
-/usr/include/X11R6
|
|
-/usr/include/X11R5
|
|
-/usr/include/X11R4
|
|
-
|
|
-/usr/local/X11/include
|
|
-/usr/local/X11R6/include
|
|
-/usr/local/X11R5/include
|
|
-/usr/local/X11R4/include
|
|
-
|
|
-/usr/local/include/X11
|
|
-/usr/local/include/X11R6
|
|
-/usr/local/include/X11R5
|
|
-/usr/local/include/X11R4
|
|
-
|
|
-/usr/X386/include
|
|
-/usr/x386/include
|
|
-/usr/XFree86/include/X11
|
|
-
|
|
-/usr/include
|
|
-/usr/local/include
|
|
-/usr/unsupported/include
|
|
-/usr/athena/include
|
|
-/usr/local/x11r5/include
|
|
-/usr/lpp/Xamples/include
|
|
-
|
|
-/usr/openwin/include
|
|
-/usr/openwin/share/include'
|
|
-
|
|
-if test "$ac_x_includes" = no; then
|
|
- # Guess where to find include files, by looking for Xlib.h.
|
|
- # First, try using that file with no special directory specified.
|
|
- cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
-/* end confdefs.h. */
|
|
-#include <X11/Xlib.h>
|
|
-_ACEOF
|
|
-if { (ac_try="$ac_cpp conftest.$ac_ext"
|
|
-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_cpp conftest.$ac_ext") 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); } >/dev/null && {
|
|
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
|
|
- test ! -s conftest.err
|
|
- }; then
|
|
- # We can compile using X headers with no special include directory.
|
|
-ac_x_includes=
|
|
-else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
- for ac_dir in $ac_x_header_dirs; do
|
|
- if test -r "$ac_dir/X11/Xlib.h"; then
|
|
- ac_x_includes=$ac_dir
|
|
- break
|
|
- fi
|
|
-done
|
|
-fi
|
|
-
|
|
-rm -f conftest.err conftest.$ac_ext
|
|
-fi # $ac_x_includes = no
|
|
-
|
|
-if test "$ac_x_libraries" = no; then
|
|
- # Check for the libraries.
|
|
- # See if we find them without any special options.
|
|
- # Don't add to $LIBS permanently.
|
|
- ac_save_LIBS=$LIBS
|
|
- LIBS="-lX11 $LIBS"
|
|
- cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
-/* end confdefs.h. */
|
|
-#include <X11/Xlib.h>
|
|
-int
|
|
-main ()
|
|
-{
|
|
-XrmInitialize ()
|
|
- ;
|
|
- return 0;
|
|
-}
|
|
-_ACEOF
|
|
-rm -f conftest.$ac_objext conftest$ac_exeext
|
|
-if { (ac_try="$ac_link"
|
|
-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_link") 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_exeext &&
|
|
- $as_test_x conftest$ac_exeext; then
|
|
- LIBS=$ac_save_LIBS
|
|
-# We can link X programs with no special library path.
|
|
-ac_x_libraries=
|
|
-else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
- LIBS=$ac_save_LIBS
|
|
-for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g`
|
|
-do
|
|
- # Don't even attempt the hair of trying to link an X program!
|
|
- for ac_extension in a so sl; do
|
|
- if test -r "$ac_dir/libX11.$ac_extension"; then
|
|
- ac_x_libraries=$ac_dir
|
|
- break 2
|
|
- fi
|
|
- done
|
|
-done
|
|
-fi
|
|
-
|
|
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
- conftest$ac_exeext conftest.$ac_ext
|
|
-fi # $ac_x_libraries = no
|
|
-
|
|
-case $ac_x_includes,$ac_x_libraries in #(
|
|
- no,* | *,no | *\'*)
|
|
- # Didn't find X, or a directory has "'" in its name.
|
|
- ac_cv_have_x="have_x=no";; #(
|
|
- *)
|
|
- # Record where we found X for the cache.
|
|
- ac_cv_have_x="have_x=yes\
|
|
- ac_x_includes='$ac_x_includes'\
|
|
- ac_x_libraries='$ac_x_libraries'"
|
|
-esac
|
|
-fi
|
|
-;; #(
|
|
- *) have_x=yes;;
|
|
- esac
|
|
- eval "$ac_cv_have_x"
|
|
-fi # $with_x != no
|
|
-
|
|
-if test "$have_x" != yes; then
|
|
- { echo "$as_me:$LINENO: result: $have_x" >&5
|
|
-echo "${ECHO_T}$have_x" >&6; }
|
|
- no_x=yes
|
|
-else
|
|
- # If each of the values was on the command line, it overrides each guess.
|
|
- test "x$x_includes" = xNONE && x_includes=$ac_x_includes
|
|
- test "x$x_libraries" = xNONE && x_libraries=$ac_x_libraries
|
|
- # Update the cache value to reflect the command line values.
|
|
- ac_cv_have_x="have_x=yes\
|
|
- ac_x_includes='$x_includes'\
|
|
- ac_x_libraries='$x_libraries'"
|
|
- { echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5
|
|
-echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6; }
|
|
-fi
|
|
-
|
|
-if test "$no_x" = yes; then
|
|
- # Not all programs may use this symbol, but it does not hurt to define it.
|
|
-
|
|
-cat >>confdefs.h <<\_ACEOF
|
|
-#define X_DISPLAY_MISSING 1
|
|
-_ACEOF
|
|
-
|
|
- X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS=
|
|
-else
|
|
- if test -n "$x_includes"; then
|
|
- X_CFLAGS="$X_CFLAGS -I$x_includes"
|
|
- fi
|
|
-
|
|
- # It would also be nice to do this for all -L options, not just this one.
|
|
- if test -n "$x_libraries"; then
|
|
- X_LIBS="$X_LIBS -L$x_libraries"
|
|
- # For Solaris; some versions of Sun CC require a space after -R and
|
|
- # others require no space. Words are not sufficient . . . .
|
|
- { echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5
|
|
-echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6; }
|
|
- ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
|
|
- ac_xsave_c_werror_flag=$ac_c_werror_flag
|
|
- ac_c_werror_flag=yes
|
|
- 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 conftest$ac_exeext
|
|
-if { (ac_try="$ac_link"
|
|
-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_link") 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_exeext &&
|
|
- $as_test_x conftest$ac_exeext; then
|
|
- { echo "$as_me:$LINENO: result: no" >&5
|
|
-echo "${ECHO_T}no" >&6; }
|
|
- X_LIBS="$X_LIBS -R$x_libraries"
|
|
-else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
- LIBS="$ac_xsave_LIBS -R $x_libraries"
|
|
- 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 conftest$ac_exeext
|
|
-if { (ac_try="$ac_link"
|
|
-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_link") 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_exeext &&
|
|
- $as_test_x conftest$ac_exeext; then
|
|
- { echo "$as_me:$LINENO: result: yes" >&5
|
|
-echo "${ECHO_T}yes" >&6; }
|
|
- X_LIBS="$X_LIBS -R $x_libraries"
|
|
-else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
- { echo "$as_me:$LINENO: result: neither works" >&5
|
|
-echo "${ECHO_T}neither works" >&6; }
|
|
-fi
|
|
-
|
|
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
- conftest$ac_exeext conftest.$ac_ext
|
|
+# Check whether --with-x was given.
|
|
+if test "${with_x+set}" = set; then :
|
|
+ withval=$with_x;
|
|
fi
|
|
|
|
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
- conftest$ac_exeext conftest.$ac_ext
|
|
- ac_c_werror_flag=$ac_xsave_c_werror_flag
|
|
- LIBS=$ac_xsave_LIBS
|
|
- fi
|
|
-
|
|
- # Check for system-dependent libraries X programs must link with.
|
|
- # Do this before checking for the system-independent R6 libraries
|
|
- # (-lICE), since we may need -lsocket or whatever for X linking.
|
|
-
|
|
- if test "$ISC" = yes; then
|
|
- X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl_s -linet"
|
|
- else
|
|
- # Martyn Johnson says this is needed for Ultrix, if the X
|
|
- # libraries were built with DECnet support. And Karl Berry says
|
|
- # the Alpha needs dnet_stub (dnet does not exist).
|
|
- ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
|
|
- cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
-/* end confdefs.h. */
|
|
-
|
|
-/* Override any GCC internal prototype to avoid an error.
|
|
- Use char because int might match the return type of a GCC
|
|
- builtin and then its argument prototype would still apply. */
|
|
-#ifdef __cplusplus
|
|
-extern "C"
|
|
-#endif
|
|
-char XOpenDisplay ();
|
|
-int
|
|
-main ()
|
|
-{
|
|
-return XOpenDisplay ();
|
|
- ;
|
|
- return 0;
|
|
-}
|
|
-_ACEOF
|
|
-rm -f conftest.$ac_objext conftest$ac_exeext
|
|
-if { (ac_try="$ac_link"
|
|
-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_link") 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_exeext &&
|
|
- $as_test_x conftest$ac_exeext; then
|
|
- :
|
|
-else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
- { echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5
|
|
-echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6; }
|
|
-if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
-else
|
|
- ac_check_lib_save_LIBS=$LIBS
|
|
-LIBS="-ldnet $LIBS"
|
|
-cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
-/* end confdefs.h. */
|
|
-
|
|
-/* Override any GCC internal prototype to avoid an error.
|
|
- Use char because int might match the return type of a GCC
|
|
- builtin and then its argument prototype would still apply. */
|
|
-#ifdef __cplusplus
|
|
-extern "C"
|
|
-#endif
|
|
-char dnet_ntoa ();
|
|
-int
|
|
-main ()
|
|
-{
|
|
-return dnet_ntoa ();
|
|
- ;
|
|
- return 0;
|
|
-}
|
|
-_ACEOF
|
|
-rm -f conftest.$ac_objext conftest$ac_exeext
|
|
-if { (ac_try="$ac_link"
|
|
-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_link") 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_exeext &&
|
|
- $as_test_x conftest$ac_exeext; then
|
|
- ac_cv_lib_dnet_dnet_ntoa=yes
|
|
+# $have_x is `yes', `no', `disabled', or empty when we do not yet know.
|
|
+if test "x$with_x" = xno; then
|
|
+ # The user explicitly disabled X.
|
|
+ have_x=disabled
|
|
else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
- ac_cv_lib_dnet_dnet_ntoa=no
|
|
-fi
|
|
-
|
|
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
- conftest$ac_exeext conftest.$ac_ext
|
|
-LIBS=$ac_check_lib_save_LIBS
|
|
-fi
|
|
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
|
|
-echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6; }
|
|
-if test $ac_cv_lib_dnet_dnet_ntoa = yes; then
|
|
- X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
|
|
-fi
|
|
-
|
|
- if test $ac_cv_lib_dnet_dnet_ntoa = no; then
|
|
- { echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet_stub" >&5
|
|
-echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6; }
|
|
-if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+ case $x_includes,$x_libraries in #(
|
|
+ *\'*) as_fn_error "cannot use X directory names containing '" "$LINENO" 5;; #(
|
|
+ *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
- ac_check_lib_save_LIBS=$LIBS
|
|
-LIBS="-ldnet_stub $LIBS"
|
|
-cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
-/* end confdefs.h. */
|
|
-
|
|
-/* Override any GCC internal prototype to avoid an error.
|
|
- Use char because int might match the return type of a GCC
|
|
- builtin and then its argument prototype would still apply. */
|
|
-#ifdef __cplusplus
|
|
-extern "C"
|
|
-#endif
|
|
-char dnet_ntoa ();
|
|
-int
|
|
-main ()
|
|
-{
|
|
-return dnet_ntoa ();
|
|
- ;
|
|
- return 0;
|
|
-}
|
|
+ # One or both of the vars are not set, and there is no cached value.
|
|
+ac_x_includes=no ac_x_libraries=no
|
|
+rm -f -r conftest.dir
|
|
+if mkdir conftest.dir; then
|
|
+ cd conftest.dir
|
|
+ cat >Imakefile <<'_ACEOF'
|
|
+incroot:
|
|
+ @echo incroot='${INCROOT}'
|
|
+usrlibdir:
|
|
+ @echo usrlibdir='${USRLIBDIR}'
|
|
+libdir:
|
|
+ @echo libdir='${LIBDIR}'
|
|
_ACEOF
|
|
-rm -f conftest.$ac_objext conftest$ac_exeext
|
|
-if { (ac_try="$ac_link"
|
|
-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_link") 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_exeext &&
|
|
- $as_test_x conftest$ac_exeext; then
|
|
- ac_cv_lib_dnet_stub_dnet_ntoa=yes
|
|
-else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
- ac_cv_lib_dnet_stub_dnet_ntoa=no
|
|
-fi
|
|
-
|
|
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
- conftest$ac_exeext conftest.$ac_ext
|
|
-LIBS=$ac_check_lib_save_LIBS
|
|
-fi
|
|
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
|
|
-echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; }
|
|
-if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then
|
|
- X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
|
|
-fi
|
|
-
|
|
- fi
|
|
+ if (export CC; ${XMKMF-xmkmf}) >/dev/null 2>/dev/null && test -f Makefile; then
|
|
+ # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
|
|
+ for ac_var in incroot usrlibdir libdir; do
|
|
+ eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`"
|
|
+ done
|
|
+ # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR.
|
|
+ for ac_extension in a so sl dylib la dll; do
|
|
+ if test ! -f "$ac_im_usrlibdir/libX11.$ac_extension" &&
|
|
+ test -f "$ac_im_libdir/libX11.$ac_extension"; then
|
|
+ ac_im_usrlibdir=$ac_im_libdir; break
|
|
+ fi
|
|
+ done
|
|
+ # Screen out bogus values from the imake configuration. They are
|
|
+ # bogus both because they are the default anyway, and because
|
|
+ # using them would break gcc on systems where it needs fixed includes.
|
|
+ case $ac_im_incroot in
|
|
+ /usr/include) ac_x_includes= ;;
|
|
+ *) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;;
|
|
+ esac
|
|
+ case $ac_im_usrlibdir in
|
|
+ /usr/lib | /usr/lib64 | /lib | /lib64) ;;
|
|
+ *) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;;
|
|
+ esac
|
|
+ fi
|
|
+ cd ..
|
|
+ rm -f -r conftest.dir
|
|
fi
|
|
|
|
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
- conftest$ac_exeext conftest.$ac_ext
|
|
- LIBS="$ac_xsave_LIBS"
|
|
-
|
|
- # msh@cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT,
|
|
- # to get the SysV transport functions.
|
|
- # Chad R. Larson says the Pyramis MIS-ES running DC/OSx (SVR4)
|
|
- # needs -lnsl.
|
|
- # The nsl library prevents programs from opening the X display
|
|
- # on Irix 5.2, according to T.E. Dickey.
|
|
- # The functions gethostbyname, getservbyname, and inet_addr are
|
|
- # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
|
|
- { echo "$as_me:$LINENO: checking for gethostbyname" >&5
|
|
-echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6; }
|
|
-if test "${ac_cv_func_gethostbyname+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
-else
|
|
- cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
-/* end confdefs.h. */
|
|
-/* Define gethostbyname to an innocuous variant, in case <limits.h> declares gethostbyname.
|
|
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
|
|
-#define gethostbyname innocuous_gethostbyname
|
|
-
|
|
-/* System header to define __stub macros and hopefully few prototypes,
|
|
- which can conflict with char gethostbyname (); below.
|
|
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
|
|
- <limits.h> exists even on freestanding compilers. */
|
|
+# Standard set of common directories for X headers.
|
|
+# Check X11 before X11Rn because it is often a symlink to the current release.
|
|
+ac_x_header_dirs='
|
|
+/usr/X11/include
|
|
+/usr/X11R7/include
|
|
+/usr/X11R6/include
|
|
+/usr/X11R5/include
|
|
+/usr/X11R4/include
|
|
|
|
-#ifdef __STDC__
|
|
-# include <limits.h>
|
|
-#else
|
|
-# include <assert.h>
|
|
-#endif
|
|
+/usr/include/X11
|
|
+/usr/include/X11R7
|
|
+/usr/include/X11R6
|
|
+/usr/include/X11R5
|
|
+/usr/include/X11R4
|
|
|
|
-#undef gethostbyname
|
|
+/usr/local/X11/include
|
|
+/usr/local/X11R7/include
|
|
+/usr/local/X11R6/include
|
|
+/usr/local/X11R5/include
|
|
+/usr/local/X11R4/include
|
|
|
|
-/* Override any GCC internal prototype to avoid an error.
|
|
- Use char because int might match the return type of a GCC
|
|
- builtin and then its argument prototype would still apply. */
|
|
-#ifdef __cplusplus
|
|
-extern "C"
|
|
-#endif
|
|
-char gethostbyname ();
|
|
-/* The GNU C library defines this for functions which it implements
|
|
- to always fail with ENOSYS. Some functions are actually named
|
|
- something starting with __ and the normal name is an alias. */
|
|
-#if defined __stub_gethostbyname || defined __stub___gethostbyname
|
|
-choke me
|
|
-#endif
|
|
+/usr/local/include/X11
|
|
+/usr/local/include/X11R7
|
|
+/usr/local/include/X11R6
|
|
+/usr/local/include/X11R5
|
|
+/usr/local/include/X11R4
|
|
|
|
-int
|
|
-main ()
|
|
-{
|
|
-return gethostbyname ();
|
|
- ;
|
|
- return 0;
|
|
-}
|
|
-_ACEOF
|
|
-rm -f conftest.$ac_objext conftest$ac_exeext
|
|
-if { (ac_try="$ac_link"
|
|
-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_link") 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_exeext &&
|
|
- $as_test_x conftest$ac_exeext; then
|
|
- ac_cv_func_gethostbyname=yes
|
|
-else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
+/usr/X386/include
|
|
+/usr/x386/include
|
|
+/usr/XFree86/include/X11
|
|
|
|
- ac_cv_func_gethostbyname=no
|
|
-fi
|
|
+/usr/include
|
|
+/usr/local/include
|
|
+/usr/unsupported/include
|
|
+/usr/athena/include
|
|
+/usr/local/x11r5/include
|
|
+/usr/lpp/Xamples/include
|
|
|
|
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
- conftest$ac_exeext conftest.$ac_ext
|
|
-fi
|
|
-{ echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5
|
|
-echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6; }
|
|
+/usr/openwin/include
|
|
+/usr/openwin/share/include'
|
|
|
|
- if test $ac_cv_func_gethostbyname = no; then
|
|
- { echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5
|
|
-echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6; }
|
|
-if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
-else
|
|
- ac_check_lib_save_LIBS=$LIBS
|
|
-LIBS="-lnsl $LIBS"
|
|
-cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
+if test "$ac_x_includes" = no; then
|
|
+ # Guess where to find include files, by looking for Xlib.h.
|
|
+ # First, try using that file with no special directory specified.
|
|
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
/* end confdefs.h. */
|
|
-
|
|
-/* Override any GCC internal prototype to avoid an error.
|
|
- Use char because int might match the return type of a GCC
|
|
- builtin and then its argument prototype would still apply. */
|
|
-#ifdef __cplusplus
|
|
-extern "C"
|
|
-#endif
|
|
-char gethostbyname ();
|
|
-int
|
|
-main ()
|
|
-{
|
|
-return gethostbyname ();
|
|
- ;
|
|
- return 0;
|
|
-}
|
|
+#include <X11/Xlib.h>
|
|
_ACEOF
|
|
-rm -f conftest.$ac_objext conftest$ac_exeext
|
|
-if { (ac_try="$ac_link"
|
|
-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_link") 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_exeext &&
|
|
- $as_test_x conftest$ac_exeext; then
|
|
- ac_cv_lib_nsl_gethostbyname=yes
|
|
+if ac_fn_c_try_cpp "$LINENO"; then :
|
|
+ # We can compile using X headers with no special include directory.
|
|
+ac_x_includes=
|
|
else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
- ac_cv_lib_nsl_gethostbyname=no
|
|
-fi
|
|
-
|
|
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
- conftest$ac_exeext conftest.$ac_ext
|
|
-LIBS=$ac_check_lib_save_LIBS
|
|
-fi
|
|
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5
|
|
-echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6; }
|
|
-if test $ac_cv_lib_nsl_gethostbyname = yes; then
|
|
- X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
|
|
+ for ac_dir in $ac_x_header_dirs; do
|
|
+ if test -r "$ac_dir/X11/Xlib.h"; then
|
|
+ ac_x_includes=$ac_dir
|
|
+ break
|
|
+ fi
|
|
+done
|
|
fi
|
|
+rm -f conftest.err conftest.$ac_ext
|
|
+fi # $ac_x_includes = no
|
|
|
|
- if test $ac_cv_lib_nsl_gethostbyname = no; then
|
|
- { echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5
|
|
-echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6; }
|
|
-if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
-else
|
|
- ac_check_lib_save_LIBS=$LIBS
|
|
-LIBS="-lbsd $LIBS"
|
|
-cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
+if test "$ac_x_libraries" = no; then
|
|
+ # Check for the libraries.
|
|
+ # See if we find them without any special options.
|
|
+ # Don't add to $LIBS permanently.
|
|
+ ac_save_LIBS=$LIBS
|
|
+ LIBS="-lX11 $LIBS"
|
|
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
/* end confdefs.h. */
|
|
-
|
|
-/* Override any GCC internal prototype to avoid an error.
|
|
- Use char because int might match the return type of a GCC
|
|
- builtin and then its argument prototype would still apply. */
|
|
-#ifdef __cplusplus
|
|
-extern "C"
|
|
-#endif
|
|
-char gethostbyname ();
|
|
+#include <X11/Xlib.h>
|
|
int
|
|
main ()
|
|
{
|
|
-return gethostbyname ();
|
|
+XrmInitialize ()
|
|
;
|
|
return 0;
|
|
}
|
|
_ACEOF
|
|
-rm -f conftest.$ac_objext conftest$ac_exeext
|
|
-if { (ac_try="$ac_link"
|
|
-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_link") 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_exeext &&
|
|
- $as_test_x conftest$ac_exeext; then
|
|
- ac_cv_lib_bsd_gethostbyname=yes
|
|
+if ac_fn_c_try_link "$LINENO"; then :
|
|
+ LIBS=$ac_save_LIBS
|
|
+# We can link X programs with no special library path.
|
|
+ac_x_libraries=
|
|
else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
- ac_cv_lib_bsd_gethostbyname=no
|
|
+ LIBS=$ac_save_LIBS
|
|
+for ac_dir in `$as_echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g`
|
|
+do
|
|
+ # Don't even attempt the hair of trying to link an X program!
|
|
+ for ac_extension in a so sl dylib la dll; do
|
|
+ if test -r "$ac_dir/libX11.$ac_extension"; then
|
|
+ ac_x_libraries=$ac_dir
|
|
+ break 2
|
|
+ fi
|
|
+ done
|
|
+done
|
|
fi
|
|
+rm -f core conftest.err conftest.$ac_objext \
|
|
+ conftest$ac_exeext conftest.$ac_ext
|
|
+fi # $ac_x_libraries = no
|
|
|
|
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
- conftest$ac_exeext conftest.$ac_ext
|
|
-LIBS=$ac_check_lib_save_LIBS
|
|
-fi
|
|
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5
|
|
-echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6; }
|
|
-if test $ac_cv_lib_bsd_gethostbyname = yes; then
|
|
- X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
|
|
+case $ac_x_includes,$ac_x_libraries in #(
|
|
+ no,* | *,no | *\'*)
|
|
+ # Didn't find X, or a directory has "'" in its name.
|
|
+ ac_cv_have_x="have_x=no";; #(
|
|
+ *)
|
|
+ # Record where we found X for the cache.
|
|
+ ac_cv_have_x="have_x=yes\
|
|
+ ac_x_includes='$ac_x_includes'\
|
|
+ ac_x_libraries='$ac_x_libraries'"
|
|
+esac
|
|
fi
|
|
+;; #(
|
|
+ *) have_x=yes;;
|
|
+ esac
|
|
+ eval "$ac_cv_have_x"
|
|
+fi # $with_x != no
|
|
|
|
- fi
|
|
- fi
|
|
-
|
|
- # lieder@skyler.mavd.honeywell.com says without -lsocket,
|
|
- # socket/setsockopt and other routines are undefined under SCO ODT
|
|
- # 2.0. But -lsocket is broken on IRIX 5.2 (and is not necessary
|
|
- # on later versions), says Simon Leinen: it contains gethostby*
|
|
- # variants that don't use the name server (or something). -lsocket
|
|
- # must be given before -lnsl if both are needed. We assume that
|
|
- # if connect needs -lnsl, so does gethostbyname.
|
|
- { echo "$as_me:$LINENO: checking for connect" >&5
|
|
-echo $ECHO_N "checking for connect... $ECHO_C" >&6; }
|
|
-if test "${ac_cv_func_connect+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+if test "$have_x" != yes; then
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_x" >&5
|
|
+$as_echo "$have_x" >&6; }
|
|
+ no_x=yes
|
|
else
|
|
- cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
-/* end confdefs.h. */
|
|
-/* Define connect to an innocuous variant, in case <limits.h> declares connect.
|
|
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
|
|
-#define connect innocuous_connect
|
|
+ # If each of the values was on the command line, it overrides each guess.
|
|
+ test "x$x_includes" = xNONE && x_includes=$ac_x_includes
|
|
+ test "x$x_libraries" = xNONE && x_libraries=$ac_x_libraries
|
|
+ # Update the cache value to reflect the command line values.
|
|
+ ac_cv_have_x="have_x=yes\
|
|
+ ac_x_includes='$x_includes'\
|
|
+ ac_x_libraries='$x_libraries'"
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: libraries $x_libraries, headers $x_includes" >&5
|
|
+$as_echo "libraries $x_libraries, headers $x_includes" >&6; }
|
|
+fi
|
|
|
|
-/* System header to define __stub macros and hopefully few prototypes,
|
|
- which can conflict with char connect (); below.
|
|
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
|
|
- <limits.h> exists even on freestanding compilers. */
|
|
+if test "$no_x" = yes; then
|
|
+ # Not all programs may use this symbol, but it does not hurt to define it.
|
|
|
|
-#ifdef __STDC__
|
|
-# include <limits.h>
|
|
-#else
|
|
-# include <assert.h>
|
|
-#endif
|
|
+$as_echo "#define X_DISPLAY_MISSING 1" >>confdefs.h
|
|
|
|
-#undef connect
|
|
+ X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS=
|
|
+else
|
|
+ if test -n "$x_includes"; then
|
|
+ X_CFLAGS="$X_CFLAGS -I$x_includes"
|
|
+ fi
|
|
|
|
-/* Override any GCC internal prototype to avoid an error.
|
|
- Use char because int might match the return type of a GCC
|
|
- builtin and then its argument prototype would still apply. */
|
|
-#ifdef __cplusplus
|
|
-extern "C"
|
|
-#endif
|
|
-char connect ();
|
|
-/* The GNU C library defines this for functions which it implements
|
|
- to always fail with ENOSYS. Some functions are actually named
|
|
- something starting with __ and the normal name is an alias. */
|
|
-#if defined __stub_connect || defined __stub___connect
|
|
-choke me
|
|
-#endif
|
|
+ # It would also be nice to do this for all -L options, not just this one.
|
|
+ if test -n "$x_libraries"; then
|
|
+ X_LIBS="$X_LIBS -L$x_libraries"
|
|
+ # For Solaris; some versions of Sun CC require a space after -R and
|
|
+ # others require no space. Words are not sufficient . . . .
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -R must be followed by a space" >&5
|
|
+$as_echo_n "checking whether -R must be followed by a space... " >&6; }
|
|
+ ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
|
|
+ ac_xsave_c_werror_flag=$ac_c_werror_flag
|
|
+ ac_c_werror_flag=yes
|
|
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
+/* end confdefs.h. */
|
|
|
|
int
|
|
main ()
|
|
{
|
|
-return connect ();
|
|
+
|
|
;
|
|
return 0;
|
|
}
|
|
_ACEOF
|
|
-rm -f conftest.$ac_objext conftest$ac_exeext
|
|
-if { (ac_try="$ac_link"
|
|
-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_link") 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_exeext &&
|
|
- $as_test_x conftest$ac_exeext; then
|
|
- ac_cv_func_connect=yes
|
|
-else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
- ac_cv_func_connect=no
|
|
-fi
|
|
-
|
|
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
- conftest$ac_exeext conftest.$ac_ext
|
|
-fi
|
|
-{ echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
|
|
-echo "${ECHO_T}$ac_cv_func_connect" >&6; }
|
|
-
|
|
- if test $ac_cv_func_connect = no; then
|
|
- { echo "$as_me:$LINENO: checking for connect in -lsocket" >&5
|
|
-echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6; }
|
|
-if test "${ac_cv_lib_socket_connect+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+if ac_fn_c_try_link "$LINENO"; then :
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
+$as_echo "no" >&6; }
|
|
+ X_LIBS="$X_LIBS -R$x_libraries"
|
|
else
|
|
- ac_check_lib_save_LIBS=$LIBS
|
|
-LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
|
|
-cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
+ LIBS="$ac_xsave_LIBS -R $x_libraries"
|
|
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
/* end confdefs.h. */
|
|
|
|
-/* Override any GCC internal prototype to avoid an error.
|
|
- Use char because int might match the return type of a GCC
|
|
- builtin and then its argument prototype would still apply. */
|
|
-#ifdef __cplusplus
|
|
-extern "C"
|
|
-#endif
|
|
-char connect ();
|
|
int
|
|
main ()
|
|
{
|
|
-return connect ();
|
|
+
|
|
;
|
|
return 0;
|
|
}
|
|
_ACEOF
|
|
-rm -f conftest.$ac_objext conftest$ac_exeext
|
|
-if { (ac_try="$ac_link"
|
|
-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_link") 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_exeext &&
|
|
- $as_test_x conftest$ac_exeext; then
|
|
- ac_cv_lib_socket_connect=yes
|
|
+if ac_fn_c_try_link "$LINENO"; then :
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
|
+$as_echo "yes" >&6; }
|
|
+ X_LIBS="$X_LIBS -R $x_libraries"
|
|
else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
- ac_cv_lib_socket_connect=no
|
|
-fi
|
|
-
|
|
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
- conftest$ac_exeext conftest.$ac_ext
|
|
-LIBS=$ac_check_lib_save_LIBS
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: neither works" >&5
|
|
+$as_echo "neither works" >&6; }
|
|
fi
|
|
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5
|
|
-echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6; }
|
|
-if test $ac_cv_lib_socket_connect = yes; then
|
|
- X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
|
|
+rm -f core conftest.err conftest.$ac_objext \
|
|
+ conftest$ac_exeext conftest.$ac_ext
|
|
fi
|
|
+rm -f core conftest.err conftest.$ac_objext \
|
|
+ conftest$ac_exeext conftest.$ac_ext
|
|
+ ac_c_werror_flag=$ac_xsave_c_werror_flag
|
|
+ LIBS=$ac_xsave_LIBS
|
|
+ fi
|
|
|
|
- fi
|
|
+ # Check for system-dependent libraries X programs must link with.
|
|
+ # Do this before checking for the system-independent R6 libraries
|
|
+ # (-lICE), since we may need -lsocket or whatever for X linking.
|
|
|
|
- # Guillermo Gomez says -lposix is necessary on A/UX.
|
|
- { echo "$as_me:$LINENO: checking for remove" >&5
|
|
-echo $ECHO_N "checking for remove... $ECHO_C" >&6; }
|
|
-if test "${ac_cv_func_remove+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
-else
|
|
- cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
+ if test "$ISC" = yes; then
|
|
+ X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl_s -linet"
|
|
+ else
|
|
+ # Martyn Johnson says this is needed for Ultrix, if the X
|
|
+ # libraries were built with DECnet support. And Karl Berry says
|
|
+ # the Alpha needs dnet_stub (dnet does not exist).
|
|
+ ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
|
|
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
/* end confdefs.h. */
|
|
-/* Define remove to an innocuous variant, in case <limits.h> declares remove.
|
|
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
|
|
-#define remove innocuous_remove
|
|
-
|
|
-/* System header to define __stub macros and hopefully few prototypes,
|
|
- which can conflict with char remove (); below.
|
|
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
|
|
- <limits.h> exists even on freestanding compilers. */
|
|
-
|
|
-#ifdef __STDC__
|
|
-# include <limits.h>
|
|
-#else
|
|
-# include <assert.h>
|
|
-#endif
|
|
-
|
|
-#undef remove
|
|
|
|
/* Override any GCC internal prototype to avoid an error.
|
|
Use char because int might match the return type of a GCC
|
|
@@ -20961,67 +15510,26 @@ cat >>conftest.$ac_ext <<_ACEOF
|
|
#ifdef __cplusplus
|
|
extern "C"
|
|
#endif
|
|
-char remove ();
|
|
-/* The GNU C library defines this for functions which it implements
|
|
- to always fail with ENOSYS. Some functions are actually named
|
|
- something starting with __ and the normal name is an alias. */
|
|
-#if defined __stub_remove || defined __stub___remove
|
|
-choke me
|
|
-#endif
|
|
-
|
|
+char XOpenDisplay ();
|
|
int
|
|
main ()
|
|
{
|
|
-return remove ();
|
|
+return XOpenDisplay ();
|
|
;
|
|
return 0;
|
|
}
|
|
_ACEOF
|
|
-rm -f conftest.$ac_objext conftest$ac_exeext
|
|
-if { (ac_try="$ac_link"
|
|
-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_link") 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_exeext &&
|
|
- $as_test_x conftest$ac_exeext; then
|
|
- ac_cv_func_remove=yes
|
|
-else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
- ac_cv_func_remove=no
|
|
-fi
|
|
-
|
|
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
- conftest$ac_exeext conftest.$ac_ext
|
|
-fi
|
|
-{ echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5
|
|
-echo "${ECHO_T}$ac_cv_func_remove" >&6; }
|
|
+if ac_fn_c_try_link "$LINENO"; then :
|
|
|
|
- if test $ac_cv_func_remove = no; then
|
|
- { echo "$as_me:$LINENO: checking for remove in -lposix" >&5
|
|
-echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6; }
|
|
-if test "${ac_cv_lib_posix_remove+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+else
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet" >&5
|
|
+$as_echo_n "checking for dnet_ntoa in -ldnet... " >&6; }
|
|
+if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
ac_check_lib_save_LIBS=$LIBS
|
|
-LIBS="-lposix $LIBS"
|
|
-cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
+LIBS="-ldnet $LIBS"
|
|
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
/* end confdefs.h. */
|
|
|
|
/* Override any GCC internal prototype to avoid an error.
|
|
@@ -21030,81 +15538,40 @@ cat >>conftest.$ac_ext <<_ACEOF
|
|
#ifdef __cplusplus
|
|
extern "C"
|
|
#endif
|
|
-char remove ();
|
|
+char dnet_ntoa ();
|
|
int
|
|
main ()
|
|
{
|
|
-return remove ();
|
|
+return dnet_ntoa ();
|
|
;
|
|
return 0;
|
|
}
|
|
_ACEOF
|
|
-rm -f conftest.$ac_objext conftest$ac_exeext
|
|
-if { (ac_try="$ac_link"
|
|
-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_link") 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_exeext &&
|
|
- $as_test_x conftest$ac_exeext; then
|
|
- ac_cv_lib_posix_remove=yes
|
|
+if ac_fn_c_try_link "$LINENO"; then :
|
|
+ ac_cv_lib_dnet_dnet_ntoa=yes
|
|
else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
- ac_cv_lib_posix_remove=no
|
|
+ ac_cv_lib_dnet_dnet_ntoa=no
|
|
fi
|
|
-
|
|
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
- conftest$ac_exeext conftest.$ac_ext
|
|
+rm -f core conftest.err conftest.$ac_objext \
|
|
+ conftest$ac_exeext conftest.$ac_ext
|
|
LIBS=$ac_check_lib_save_LIBS
|
|
fi
|
|
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5
|
|
-echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6; }
|
|
-if test $ac_cv_lib_posix_remove = yes; then
|
|
- X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
|
|
+$as_echo "$ac_cv_lib_dnet_dnet_ntoa" >&6; }
|
|
+if test "x$ac_cv_lib_dnet_dnet_ntoa" = x""yes; then :
|
|
+ X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
|
|
fi
|
|
|
|
- fi
|
|
-
|
|
- # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
|
|
- { echo "$as_me:$LINENO: checking for shmat" >&5
|
|
-echo $ECHO_N "checking for shmat... $ECHO_C" >&6; }
|
|
-if test "${ac_cv_func_shmat+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+ if test $ac_cv_lib_dnet_dnet_ntoa = no; then
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet_stub" >&5
|
|
+$as_echo_n "checking for dnet_ntoa in -ldnet_stub... " >&6; }
|
|
+if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
- cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
+ ac_check_lib_save_LIBS=$LIBS
|
|
+LIBS="-ldnet_stub $LIBS"
|
|
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
/* end confdefs.h. */
|
|
-/* Define shmat to an innocuous variant, in case <limits.h> declares shmat.
|
|
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
|
|
-#define shmat innocuous_shmat
|
|
-
|
|
-/* System header to define __stub macros and hopefully few prototypes,
|
|
- which can conflict with char shmat (); below.
|
|
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
|
|
- <limits.h> exists even on freestanding compilers. */
|
|
-
|
|
-#ifdef __STDC__
|
|
-# include <limits.h>
|
|
-#else
|
|
-# include <assert.h>
|
|
-#endif
|
|
-
|
|
-#undef shmat
|
|
|
|
/* Override any GCC internal prototype to avoid an error.
|
|
Use char because int might match the return type of a GCC
|
|
@@ -21112,67 +15579,58 @@ cat >>conftest.$ac_ext <<_ACEOF
|
|
#ifdef __cplusplus
|
|
extern "C"
|
|
#endif
|
|
-char shmat ();
|
|
-/* The GNU C library defines this for functions which it implements
|
|
- to always fail with ENOSYS. Some functions are actually named
|
|
- something starting with __ and the normal name is an alias. */
|
|
-#if defined __stub_shmat || defined __stub___shmat
|
|
-choke me
|
|
-#endif
|
|
-
|
|
+char dnet_ntoa ();
|
|
int
|
|
main ()
|
|
{
|
|
-return shmat ();
|
|
+return dnet_ntoa ();
|
|
;
|
|
return 0;
|
|
}
|
|
_ACEOF
|
|
-rm -f conftest.$ac_objext conftest$ac_exeext
|
|
-if { (ac_try="$ac_link"
|
|
-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_link") 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_exeext &&
|
|
- $as_test_x conftest$ac_exeext; then
|
|
- ac_cv_func_shmat=yes
|
|
+if ac_fn_c_try_link "$LINENO"; then :
|
|
+ ac_cv_lib_dnet_stub_dnet_ntoa=yes
|
|
else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
+ ac_cv_lib_dnet_stub_dnet_ntoa=no
|
|
+fi
|
|
+rm -f core conftest.err conftest.$ac_objext \
|
|
+ conftest$ac_exeext conftest.$ac_ext
|
|
+LIBS=$ac_check_lib_save_LIBS
|
|
+fi
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
|
|
+$as_echo "$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; }
|
|
+if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = x""yes; then :
|
|
+ X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
|
|
+fi
|
|
|
|
- ac_cv_func_shmat=no
|
|
+ fi
|
|
fi
|
|
+rm -f core conftest.err conftest.$ac_objext \
|
|
+ conftest$ac_exeext conftest.$ac_ext
|
|
+ LIBS="$ac_xsave_LIBS"
|
|
+
|
|
+ # msh@cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT,
|
|
+ # to get the SysV transport functions.
|
|
+ # Chad R. Larson says the Pyramis MIS-ES running DC/OSx (SVR4)
|
|
+ # needs -lnsl.
|
|
+ # The nsl library prevents programs from opening the X display
|
|
+ # on Irix 5.2, according to T.E. Dickey.
|
|
+ # The functions gethostbyname, getservbyname, and inet_addr are
|
|
+ # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
|
|
+ ac_fn_c_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname"
|
|
+if test "x$ac_cv_func_gethostbyname" = x""yes; then :
|
|
|
|
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
- conftest$ac_exeext conftest.$ac_ext
|
|
fi
|
|
-{ echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5
|
|
-echo "${ECHO_T}$ac_cv_func_shmat" >&6; }
|
|
|
|
- if test $ac_cv_func_shmat = no; then
|
|
- { echo "$as_me:$LINENO: checking for shmat in -lipc" >&5
|
|
-echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6; }
|
|
-if test "${ac_cv_lib_ipc_shmat+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+ if test $ac_cv_func_gethostbyname = no; then
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5
|
|
+$as_echo_n "checking for gethostbyname in -lnsl... " >&6; }
|
|
+if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
ac_check_lib_save_LIBS=$LIBS
|
|
-LIBS="-lipc $LIBS"
|
|
-cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
+LIBS="-lnsl $LIBS"
|
|
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
/* end confdefs.h. */
|
|
|
|
/* Override any GCC internal prototype to avoid an error.
|
|
@@ -21181,75 +15639,39 @@ cat >>conftest.$ac_ext <<_ACEOF
|
|
#ifdef __cplusplus
|
|
extern "C"
|
|
#endif
|
|
-char shmat ();
|
|
+char gethostbyname ();
|
|
int
|
|
main ()
|
|
{
|
|
-return shmat ();
|
|
+return gethostbyname ();
|
|
;
|
|
return 0;
|
|
}
|
|
_ACEOF
|
|
-rm -f conftest.$ac_objext conftest$ac_exeext
|
|
-if { (ac_try="$ac_link"
|
|
-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_link") 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_exeext &&
|
|
- $as_test_x conftest$ac_exeext; then
|
|
- ac_cv_lib_ipc_shmat=yes
|
|
+if ac_fn_c_try_link "$LINENO"; then :
|
|
+ ac_cv_lib_nsl_gethostbyname=yes
|
|
else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
- ac_cv_lib_ipc_shmat=no
|
|
+ ac_cv_lib_nsl_gethostbyname=no
|
|
fi
|
|
-
|
|
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
- conftest$ac_exeext conftest.$ac_ext
|
|
+rm -f core conftest.err conftest.$ac_objext \
|
|
+ conftest$ac_exeext conftest.$ac_ext
|
|
LIBS=$ac_check_lib_save_LIBS
|
|
fi
|
|
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5
|
|
-echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6; }
|
|
-if test $ac_cv_lib_ipc_shmat = yes; then
|
|
- X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyname" >&5
|
|
+$as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; }
|
|
+if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then :
|
|
+ X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
|
|
fi
|
|
|
|
- fi
|
|
- fi
|
|
-
|
|
- # Check for libraries that X11R6 Xt/Xaw programs need.
|
|
- ac_save_LDFLAGS=$LDFLAGS
|
|
- test -n "$x_libraries" && LDFLAGS="$LDFLAGS -L$x_libraries"
|
|
- # SM needs ICE to (dynamically) link under SunOS 4.x (so we have to
|
|
- # check for ICE first), but we must link in the order -lSM -lICE or
|
|
- # we get undefined symbols. So assume we have SM if we have ICE.
|
|
- # These have to be linked with before -lX11, unlike the other
|
|
- # libraries we check for below, so use a different variable.
|
|
- # John Interrante, Karl Berry
|
|
- { echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5
|
|
-echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6; }
|
|
-if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+ if test $ac_cv_lib_nsl_gethostbyname = no; then
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lbsd" >&5
|
|
+$as_echo_n "checking for gethostbyname in -lbsd... " >&6; }
|
|
+if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
ac_check_lib_save_LIBS=$LIBS
|
|
-LIBS="-lICE $X_EXTRA_LIBS $LIBS"
|
|
-cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
+LIBS="-lbsd $LIBS"
|
|
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
/* end confdefs.h. */
|
|
|
|
/* Override any GCC internal prototype to avoid an error.
|
|
@@ -21258,83 +15680,55 @@ cat >>conftest.$ac_ext <<_ACEOF
|
|
#ifdef __cplusplus
|
|
extern "C"
|
|
#endif
|
|
-char IceConnectionNumber ();
|
|
+char gethostbyname ();
|
|
int
|
|
main ()
|
|
{
|
|
-return IceConnectionNumber ();
|
|
+return gethostbyname ();
|
|
;
|
|
return 0;
|
|
}
|
|
_ACEOF
|
|
-rm -f conftest.$ac_objext conftest$ac_exeext
|
|
-if { (ac_try="$ac_link"
|
|
-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_link") 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_exeext &&
|
|
- $as_test_x conftest$ac_exeext; then
|
|
- ac_cv_lib_ICE_IceConnectionNumber=yes
|
|
+if ac_fn_c_try_link "$LINENO"; then :
|
|
+ ac_cv_lib_bsd_gethostbyname=yes
|
|
else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
- ac_cv_lib_ICE_IceConnectionNumber=no
|
|
+ ac_cv_lib_bsd_gethostbyname=no
|
|
fi
|
|
-
|
|
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
- conftest$ac_exeext conftest.$ac_ext
|
|
+rm -f core conftest.err conftest.$ac_objext \
|
|
+ conftest$ac_exeext conftest.$ac_ext
|
|
LIBS=$ac_check_lib_save_LIBS
|
|
fi
|
|
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
|
|
-echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6; }
|
|
-if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then
|
|
- X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd_gethostbyname" >&5
|
|
+$as_echo "$ac_cv_lib_bsd_gethostbyname" >&6; }
|
|
+if test "x$ac_cv_lib_bsd_gethostbyname" = x""yes; then :
|
|
+ X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
|
|
fi
|
|
|
|
- LDFLAGS=$ac_save_LDFLAGS
|
|
+ fi
|
|
+ fi
|
|
|
|
-fi
|
|
+ # lieder@skyler.mavd.honeywell.com says without -lsocket,
|
|
+ # socket/setsockopt and other routines are undefined under SCO ODT
|
|
+ # 2.0. But -lsocket is broken on IRIX 5.2 (and is not necessary
|
|
+ # on later versions), says Simon Leinen: it contains gethostby*
|
|
+ # variants that don't use the name server (or something). -lsocket
|
|
+ # must be given before -lnsl if both are needed. We assume that
|
|
+ # if connect needs -lnsl, so does gethostbyname.
|
|
+ ac_fn_c_check_func "$LINENO" "connect" "ac_cv_func_connect"
|
|
+if test "x$ac_cv_func_connect" = x""yes; then :
|
|
|
|
+fi
|
|
|
|
-{ echo "$as_me:$LINENO: checking for gethostbyname" >&5
|
|
-echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6; }
|
|
-if test "${ac_cv_func_gethostbyname+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+ if test $ac_cv_func_connect = no; then
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for connect in -lsocket" >&5
|
|
+$as_echo_n "checking for connect in -lsocket... " >&6; }
|
|
+if test "${ac_cv_lib_socket_connect+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
- cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
+ ac_check_lib_save_LIBS=$LIBS
|
|
+LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
|
|
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
/* end confdefs.h. */
|
|
-/* Define gethostbyname to an innocuous variant, in case <limits.h> declares gethostbyname.
|
|
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
|
|
-#define gethostbyname innocuous_gethostbyname
|
|
-
|
|
-/* System header to define __stub macros and hopefully few prototypes,
|
|
- which can conflict with char gethostbyname (); below.
|
|
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
|
|
- <limits.h> exists even on freestanding compilers. */
|
|
-
|
|
-#ifdef __STDC__
|
|
-# include <limits.h>
|
|
-#else
|
|
-# include <assert.h>
|
|
-#endif
|
|
-
|
|
-#undef gethostbyname
|
|
|
|
/* Override any GCC internal prototype to avoid an error.
|
|
Use char because int might match the return type of a GCC
|
|
@@ -21342,69 +15736,47 @@ cat >>conftest.$ac_ext <<_ACEOF
|
|
#ifdef __cplusplus
|
|
extern "C"
|
|
#endif
|
|
-char gethostbyname ();
|
|
-/* The GNU C library defines this for functions which it implements
|
|
- to always fail with ENOSYS. Some functions are actually named
|
|
- something starting with __ and the normal name is an alias. */
|
|
-#if defined __stub_gethostbyname || defined __stub___gethostbyname
|
|
-choke me
|
|
-#endif
|
|
-
|
|
+char connect ();
|
|
int
|
|
main ()
|
|
{
|
|
-return gethostbyname ();
|
|
+return connect ();
|
|
;
|
|
return 0;
|
|
}
|
|
-_ACEOF
|
|
-rm -f conftest.$ac_objext conftest$ac_exeext
|
|
-if { (ac_try="$ac_link"
|
|
-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_link") 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_exeext &&
|
|
- $as_test_x conftest$ac_exeext; then
|
|
- ac_cv_func_gethostbyname=yes
|
|
+_ACEOF
|
|
+if ac_fn_c_try_link "$LINENO"; then :
|
|
+ ac_cv_lib_socket_connect=yes
|
|
else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
- ac_cv_func_gethostbyname=no
|
|
+ ac_cv_lib_socket_connect=no
|
|
+fi
|
|
+rm -f core conftest.err conftest.$ac_objext \
|
|
+ conftest$ac_exeext conftest.$ac_ext
|
|
+LIBS=$ac_check_lib_save_LIBS
|
|
+fi
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_connect" >&5
|
|
+$as_echo "$ac_cv_lib_socket_connect" >&6; }
|
|
+if test "x$ac_cv_lib_socket_connect" = x""yes; then :
|
|
+ X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
|
|
fi
|
|
|
|
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
- conftest$ac_exeext conftest.$ac_ext
|
|
+ fi
|
|
+
|
|
+ # Guillermo Gomez says -lposix is necessary on A/UX.
|
|
+ ac_fn_c_check_func "$LINENO" "remove" "ac_cv_func_remove"
|
|
+if test "x$ac_cv_func_remove" = x""yes; then :
|
|
+
|
|
fi
|
|
-{ echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5
|
|
-echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6; }
|
|
-if test $ac_cv_func_gethostbyname = yes; then
|
|
- :
|
|
-else
|
|
|
|
-{ echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5
|
|
-echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6; }
|
|
-if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+ if test $ac_cv_func_remove = no; then
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for remove in -lposix" >&5
|
|
+$as_echo_n "checking for remove in -lposix... " >&6; }
|
|
+if test "${ac_cv_lib_posix_remove+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
ac_check_lib_save_LIBS=$LIBS
|
|
-LIBS="-lnsl $LIBS"
|
|
-cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
+LIBS="-lposix $LIBS"
|
|
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
/* end confdefs.h. */
|
|
|
|
/* Override any GCC internal prototype to avoid an error.
|
|
@@ -21413,85 +15785,48 @@ cat >>conftest.$ac_ext <<_ACEOF
|
|
#ifdef __cplusplus
|
|
extern "C"
|
|
#endif
|
|
-char gethostbyname ();
|
|
+char remove ();
|
|
int
|
|
main ()
|
|
{
|
|
-return gethostbyname ();
|
|
+return remove ();
|
|
;
|
|
return 0;
|
|
}
|
|
_ACEOF
|
|
-rm -f conftest.$ac_objext conftest$ac_exeext
|
|
-if { (ac_try="$ac_link"
|
|
-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_link") 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_exeext &&
|
|
- $as_test_x conftest$ac_exeext; then
|
|
- ac_cv_lib_nsl_gethostbyname=yes
|
|
+if ac_fn_c_try_link "$LINENO"; then :
|
|
+ ac_cv_lib_posix_remove=yes
|
|
else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
- ac_cv_lib_nsl_gethostbyname=no
|
|
+ ac_cv_lib_posix_remove=no
|
|
fi
|
|
-
|
|
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
- conftest$ac_exeext conftest.$ac_ext
|
|
+rm -f core conftest.err conftest.$ac_objext \
|
|
+ conftest$ac_exeext conftest.$ac_ext
|
|
LIBS=$ac_check_lib_save_LIBS
|
|
fi
|
|
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5
|
|
-echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6; }
|
|
-if test $ac_cv_lib_nsl_gethostbyname = yes; then
|
|
- cat >>confdefs.h <<_ACEOF
|
|
-#define HAVE_LIBNSL 1
|
|
-_ACEOF
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix_remove" >&5
|
|
+$as_echo "$ac_cv_lib_posix_remove" >&6; }
|
|
+if test "x$ac_cv_lib_posix_remove" = x""yes; then :
|
|
+ X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
|
|
+fi
|
|
|
|
- LIBS="-lnsl $LIBS"
|
|
+ fi
|
|
|
|
-fi
|
|
+ # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
|
|
+ ac_fn_c_check_func "$LINENO" "shmat" "ac_cv_func_shmat"
|
|
+if test "x$ac_cv_func_shmat" = x""yes; then :
|
|
|
|
fi
|
|
|
|
-{ echo "$as_me:$LINENO: checking for connect" >&5
|
|
-echo $ECHO_N "checking for connect... $ECHO_C" >&6; }
|
|
-if test "${ac_cv_func_connect+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+ if test $ac_cv_func_shmat = no; then
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shmat in -lipc" >&5
|
|
+$as_echo_n "checking for shmat in -lipc... " >&6; }
|
|
+if test "${ac_cv_lib_ipc_shmat+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
- cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
+ ac_check_lib_save_LIBS=$LIBS
|
|
+LIBS="-lipc $LIBS"
|
|
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
/* end confdefs.h. */
|
|
-/* Define connect to an innocuous variant, in case <limits.h> declares connect.
|
|
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
|
|
-#define connect innocuous_connect
|
|
-
|
|
-/* System header to define __stub macros and hopefully few prototypes,
|
|
- which can conflict with char connect (); below.
|
|
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
|
|
- <limits.h> exists even on freestanding compilers. */
|
|
-
|
|
-#ifdef __STDC__
|
|
-# include <limits.h>
|
|
-#else
|
|
-# include <assert.h>
|
|
-#endif
|
|
-
|
|
-#undef connect
|
|
|
|
/* Override any GCC internal prototype to avoid an error.
|
|
Use char because int might match the return type of a GCC
|
|
@@ -21499,69 +15834,50 @@ cat >>conftest.$ac_ext <<_ACEOF
|
|
#ifdef __cplusplus
|
|
extern "C"
|
|
#endif
|
|
-char connect ();
|
|
-/* The GNU C library defines this for functions which it implements
|
|
- to always fail with ENOSYS. Some functions are actually named
|
|
- something starting with __ and the normal name is an alias. */
|
|
-#if defined __stub_connect || defined __stub___connect
|
|
-choke me
|
|
-#endif
|
|
-
|
|
+char shmat ();
|
|
int
|
|
main ()
|
|
{
|
|
-return connect ();
|
|
+return shmat ();
|
|
;
|
|
return 0;
|
|
}
|
|
_ACEOF
|
|
-rm -f conftest.$ac_objext conftest$ac_exeext
|
|
-if { (ac_try="$ac_link"
|
|
-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_link") 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_exeext &&
|
|
- $as_test_x conftest$ac_exeext; then
|
|
- ac_cv_func_connect=yes
|
|
+if ac_fn_c_try_link "$LINENO"; then :
|
|
+ ac_cv_lib_ipc_shmat=yes
|
|
else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
- ac_cv_func_connect=no
|
|
+ ac_cv_lib_ipc_shmat=no
|
|
fi
|
|
-
|
|
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
- conftest$ac_exeext conftest.$ac_ext
|
|
+rm -f core conftest.err conftest.$ac_objext \
|
|
+ conftest$ac_exeext conftest.$ac_ext
|
|
+LIBS=$ac_check_lib_save_LIBS
|
|
fi
|
|
-{ echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
|
|
-echo "${ECHO_T}$ac_cv_func_connect" >&6; }
|
|
-if test $ac_cv_func_connect = yes; then
|
|
- :
|
|
-else
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ipc_shmat" >&5
|
|
+$as_echo "$ac_cv_lib_ipc_shmat" >&6; }
|
|
+if test "x$ac_cv_lib_ipc_shmat" = x""yes; then :
|
|
+ X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
|
|
+fi
|
|
+
|
|
+ fi
|
|
+ fi
|
|
|
|
-{ echo "$as_me:$LINENO: checking for connect in -lsocket" >&5
|
|
-echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6; }
|
|
-if test "${ac_cv_lib_socket_connect+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+ # Check for libraries that X11R6 Xt/Xaw programs need.
|
|
+ ac_save_LDFLAGS=$LDFLAGS
|
|
+ test -n "$x_libraries" && LDFLAGS="$LDFLAGS -L$x_libraries"
|
|
+ # SM needs ICE to (dynamically) link under SunOS 4.x (so we have to
|
|
+ # check for ICE first), but we must link in the order -lSM -lICE or
|
|
+ # we get undefined symbols. So assume we have SM if we have ICE.
|
|
+ # These have to be linked with before -lX11, unlike the other
|
|
+ # libraries we check for below, so use a different variable.
|
|
+ # John Interrante, Karl Berry
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for IceConnectionNumber in -lICE" >&5
|
|
+$as_echo_n "checking for IceConnectionNumber in -lICE... " >&6; }
|
|
+if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
ac_check_lib_save_LIBS=$LIBS
|
|
-LIBS="-lsocket $LIBS"
|
|
-cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
+LIBS="-lICE $X_EXTRA_LIBS $LIBS"
|
|
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
/* end confdefs.h. */
|
|
|
|
/* Override any GCC internal prototype to avoid an error.
|
|
@@ -21570,85 +15886,48 @@ cat >>conftest.$ac_ext <<_ACEOF
|
|
#ifdef __cplusplus
|
|
extern "C"
|
|
#endif
|
|
-char connect ();
|
|
+char IceConnectionNumber ();
|
|
int
|
|
main ()
|
|
{
|
|
-return connect ();
|
|
+return IceConnectionNumber ();
|
|
;
|
|
return 0;
|
|
}
|
|
_ACEOF
|
|
-rm -f conftest.$ac_objext conftest$ac_exeext
|
|
-if { (ac_try="$ac_link"
|
|
-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_link") 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_exeext &&
|
|
- $as_test_x conftest$ac_exeext; then
|
|
- ac_cv_lib_socket_connect=yes
|
|
+if ac_fn_c_try_link "$LINENO"; then :
|
|
+ ac_cv_lib_ICE_IceConnectionNumber=yes
|
|
else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
- ac_cv_lib_socket_connect=no
|
|
+ ac_cv_lib_ICE_IceConnectionNumber=no
|
|
fi
|
|
-
|
|
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
- conftest$ac_exeext conftest.$ac_ext
|
|
+rm -f core conftest.err conftest.$ac_objext \
|
|
+ conftest$ac_exeext conftest.$ac_ext
|
|
LIBS=$ac_check_lib_save_LIBS
|
|
fi
|
|
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5
|
|
-echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6; }
|
|
-if test $ac_cv_lib_socket_connect = yes; then
|
|
- cat >>confdefs.h <<_ACEOF
|
|
-#define HAVE_LIBSOCKET 1
|
|
-_ACEOF
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
|
|
+$as_echo "$ac_cv_lib_ICE_IceConnectionNumber" >&6; }
|
|
+if test "x$ac_cv_lib_ICE_IceConnectionNumber" = x""yes; then :
|
|
+ X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
|
|
+fi
|
|
|
|
- LIBS="-lsocket $LIBS"
|
|
+ LDFLAGS=$ac_save_LDFLAGS
|
|
|
|
fi
|
|
|
|
-fi
|
|
|
|
-{ echo "$as_me:$LINENO: checking for inet_aton" >&5
|
|
-echo $ECHO_N "checking for inet_aton... $ECHO_C" >&6; }
|
|
-if test "${ac_cv_func_inet_aton+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+ac_fn_c_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname"
|
|
+if test "x$ac_cv_func_gethostbyname" = x""yes; then :
|
|
+
|
|
else
|
|
- cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5
|
|
+$as_echo_n "checking for gethostbyname in -lnsl... " >&6; }
|
|
+if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
+else
|
|
+ ac_check_lib_save_LIBS=$LIBS
|
|
+LIBS="-lnsl $LIBS"
|
|
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
/* end confdefs.h. */
|
|
-/* Define inet_aton to an innocuous variant, in case <limits.h> declares inet_aton.
|
|
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
|
|
-#define inet_aton innocuous_inet_aton
|
|
-
|
|
-/* System header to define __stub macros and hopefully few prototypes,
|
|
- which can conflict with char inet_aton (); below.
|
|
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
|
|
- <limits.h> exists even on freestanding compilers. */
|
|
-
|
|
-#ifdef __STDC__
|
|
-# include <limits.h>
|
|
-#else
|
|
-# include <assert.h>
|
|
-#endif
|
|
-
|
|
-#undef inet_aton
|
|
|
|
/* Override any GCC internal prototype to avoid an error.
|
|
Use char because int might match the return type of a GCC
|
|
@@ -21656,69 +15935,49 @@ cat >>conftest.$ac_ext <<_ACEOF
|
|
#ifdef __cplusplus
|
|
extern "C"
|
|
#endif
|
|
-char inet_aton ();
|
|
-/* The GNU C library defines this for functions which it implements
|
|
- to always fail with ENOSYS. Some functions are actually named
|
|
- something starting with __ and the normal name is an alias. */
|
|
-#if defined __stub_inet_aton || defined __stub___inet_aton
|
|
-choke me
|
|
-#endif
|
|
-
|
|
+char gethostbyname ();
|
|
int
|
|
main ()
|
|
{
|
|
-return inet_aton ();
|
|
+return gethostbyname ();
|
|
;
|
|
return 0;
|
|
}
|
|
_ACEOF
|
|
-rm -f conftest.$ac_objext conftest$ac_exeext
|
|
-if { (ac_try="$ac_link"
|
|
-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_link") 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_exeext &&
|
|
- $as_test_x conftest$ac_exeext; then
|
|
- ac_cv_func_inet_aton=yes
|
|
+if ac_fn_c_try_link "$LINENO"; then :
|
|
+ ac_cv_lib_nsl_gethostbyname=yes
|
|
else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
+ ac_cv_lib_nsl_gethostbyname=no
|
|
+fi
|
|
+rm -f core conftest.err conftest.$ac_objext \
|
|
+ conftest$ac_exeext conftest.$ac_ext
|
|
+LIBS=$ac_check_lib_save_LIBS
|
|
+fi
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyname" >&5
|
|
+$as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; }
|
|
+if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then :
|
|
+ cat >>confdefs.h <<_ACEOF
|
|
+#define HAVE_LIBNSL 1
|
|
+_ACEOF
|
|
+
|
|
+ LIBS="-lnsl $LIBS"
|
|
|
|
- ac_cv_func_inet_aton=no
|
|
fi
|
|
|
|
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
- conftest$ac_exeext conftest.$ac_ext
|
|
fi
|
|
-{ echo "$as_me:$LINENO: result: $ac_cv_func_inet_aton" >&5
|
|
-echo "${ECHO_T}$ac_cv_func_inet_aton" >&6; }
|
|
-if test $ac_cv_func_inet_aton = yes; then
|
|
- :
|
|
-else
|
|
|
|
-{ echo "$as_me:$LINENO: checking for inet_aton in -lresolv" >&5
|
|
-echo $ECHO_N "checking for inet_aton in -lresolv... $ECHO_C" >&6; }
|
|
-if test "${ac_cv_lib_resolv_inet_aton+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+ac_fn_c_check_func "$LINENO" "connect" "ac_cv_func_connect"
|
|
+if test "x$ac_cv_func_connect" = x""yes; then :
|
|
+
|
|
+else
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for connect in -lsocket" >&5
|
|
+$as_echo_n "checking for connect in -lsocket... " >&6; }
|
|
+if test "${ac_cv_lib_socket_connect+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
ac_check_lib_save_LIBS=$LIBS
|
|
-LIBS="-lresolv $LIBS"
|
|
-cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
+LIBS="-lsocket $LIBS"
|
|
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
/* end confdefs.h. */
|
|
|
|
/* Override any GCC internal prototype to avoid an error.
|
|
@@ -21727,211 +15986,108 @@ cat >>conftest.$ac_ext <<_ACEOF
|
|
#ifdef __cplusplus
|
|
extern "C"
|
|
#endif
|
|
-char inet_aton ();
|
|
+char connect ();
|
|
int
|
|
main ()
|
|
{
|
|
-return inet_aton ();
|
|
+return connect ();
|
|
;
|
|
return 0;
|
|
}
|
|
_ACEOF
|
|
-rm -f conftest.$ac_objext conftest$ac_exeext
|
|
-if { (ac_try="$ac_link"
|
|
-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_link") 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_exeext &&
|
|
- $as_test_x conftest$ac_exeext; then
|
|
- ac_cv_lib_resolv_inet_aton=yes
|
|
+if ac_fn_c_try_link "$LINENO"; then :
|
|
+ ac_cv_lib_socket_connect=yes
|
|
else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
- ac_cv_lib_resolv_inet_aton=no
|
|
+ ac_cv_lib_socket_connect=no
|
|
fi
|
|
-
|
|
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
- conftest$ac_exeext conftest.$ac_ext
|
|
+rm -f core conftest.err conftest.$ac_objext \
|
|
+ conftest$ac_exeext conftest.$ac_ext
|
|
LIBS=$ac_check_lib_save_LIBS
|
|
fi
|
|
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_resolv_inet_aton" >&5
|
|
-echo "${ECHO_T}$ac_cv_lib_resolv_inet_aton" >&6; }
|
|
-if test $ac_cv_lib_resolv_inet_aton = yes; then
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_connect" >&5
|
|
+$as_echo "$ac_cv_lib_socket_connect" >&6; }
|
|
+if test "x$ac_cv_lib_socket_connect" = x""yes; then :
|
|
cat >>confdefs.h <<_ACEOF
|
|
-#define HAVE_LIBRESOLV 1
|
|
+#define HAVE_LIBSOCKET 1
|
|
_ACEOF
|
|
|
|
- LIBS="-lresolv $LIBS"
|
|
+ LIBS="-lsocket $LIBS"
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
+ac_fn_c_check_func "$LINENO" "inet_aton" "ac_cv_func_inet_aton"
|
|
+if test "x$ac_cv_func_inet_aton" = x""yes; then :
|
|
|
|
-
|
|
-saved_CPPFLAGS="$CPPFLAGS"
|
|
-CPPFLAGS="$CPPFLAGS $X_CFLAGS"
|
|
-test -z "$with_xauth" && { if test "${ac_cv_header_X11_Xauth_h+set}" = set; then
|
|
- { echo "$as_me:$LINENO: checking for X11/Xauth.h" >&5
|
|
-echo $ECHO_N "checking for X11/Xauth.h... $ECHO_C" >&6; }
|
|
-if test "${ac_cv_header_X11_Xauth_h+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
-fi
|
|
-{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_Xauth_h" >&5
|
|
-echo "${ECHO_T}$ac_cv_header_X11_Xauth_h" >&6; }
|
|
else
|
|
- # Is the header compilable?
|
|
-{ echo "$as_me:$LINENO: checking X11/Xauth.h usability" >&5
|
|
-echo $ECHO_N "checking X11/Xauth.h usability... $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. */
|
|
-$ac_includes_default
|
|
-#include <X11/Xauth.h>
|
|
-_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
|
|
- ac_header_compiler=yes
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inet_aton in -lresolv" >&5
|
|
+$as_echo_n "checking for inet_aton in -lresolv... " >&6; }
|
|
+if test "${ac_cv_lib_resolv_inet_aton+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
- ac_header_compiler=no
|
|
-fi
|
|
-
|
|
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
|
|
-echo "${ECHO_T}$ac_header_compiler" >&6; }
|
|
-
|
|
-# Is the header present?
|
|
-{ echo "$as_me:$LINENO: checking X11/Xauth.h presence" >&5
|
|
-echo $ECHO_N "checking X11/Xauth.h presence... $ECHO_C" >&6; }
|
|
-cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
+ ac_check_lib_save_LIBS=$LIBS
|
|
+LIBS="-lresolv $LIBS"
|
|
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
/* end confdefs.h. */
|
|
-#include <X11/Xauth.h>
|
|
-_ACEOF
|
|
-if { (ac_try="$ac_cpp conftest.$ac_ext"
|
|
-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_cpp conftest.$ac_ext") 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); } >/dev/null && {
|
|
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
|
|
- test ! -s conftest.err
|
|
- }; then
|
|
- ac_header_preproc=yes
|
|
-else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
|
|
- ac_header_preproc=no
|
|
+/* Override any GCC internal prototype to avoid an error.
|
|
+ Use char because int might match the return type of a GCC
|
|
+ builtin and then its argument prototype would still apply. */
|
|
+#ifdef __cplusplus
|
|
+extern "C"
|
|
+#endif
|
|
+char inet_aton ();
|
|
+int
|
|
+main ()
|
|
+{
|
|
+return inet_aton ();
|
|
+ ;
|
|
+ return 0;
|
|
+}
|
|
+_ACEOF
|
|
+if ac_fn_c_try_link "$LINENO"; then :
|
|
+ ac_cv_lib_resolv_inet_aton=yes
|
|
+else
|
|
+ ac_cv_lib_resolv_inet_aton=no
|
|
+fi
|
|
+rm -f core conftest.err conftest.$ac_objext \
|
|
+ conftest$ac_exeext conftest.$ac_ext
|
|
+LIBS=$ac_check_lib_save_LIBS
|
|
fi
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv_inet_aton" >&5
|
|
+$as_echo "$ac_cv_lib_resolv_inet_aton" >&6; }
|
|
+if test "x$ac_cv_lib_resolv_inet_aton" = x""yes; then :
|
|
+ cat >>confdefs.h <<_ACEOF
|
|
+#define HAVE_LIBRESOLV 1
|
|
+_ACEOF
|
|
|
|
-rm -f conftest.err conftest.$ac_ext
|
|
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
|
|
-echo "${ECHO_T}$ac_header_preproc" >&6; }
|
|
+ LIBS="-lresolv $LIBS"
|
|
|
|
-# So? What about this header?
|
|
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
|
|
- yes:no: )
|
|
- { echo "$as_me:$LINENO: WARNING: X11/Xauth.h: accepted by the compiler, rejected by the preprocessor!" >&5
|
|
-echo "$as_me: WARNING: X11/Xauth.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
|
|
- { echo "$as_me:$LINENO: WARNING: X11/Xauth.h: proceeding with the compiler's result" >&5
|
|
-echo "$as_me: WARNING: X11/Xauth.h: proceeding with the compiler's result" >&2;}
|
|
- ac_header_preproc=yes
|
|
- ;;
|
|
- no:yes:* )
|
|
- { echo "$as_me:$LINENO: WARNING: X11/Xauth.h: present but cannot be compiled" >&5
|
|
-echo "$as_me: WARNING: X11/Xauth.h: present but cannot be compiled" >&2;}
|
|
- { echo "$as_me:$LINENO: WARNING: X11/Xauth.h: check for missing prerequisite headers?" >&5
|
|
-echo "$as_me: WARNING: X11/Xauth.h: check for missing prerequisite headers?" >&2;}
|
|
- { echo "$as_me:$LINENO: WARNING: X11/Xauth.h: see the Autoconf documentation" >&5
|
|
-echo "$as_me: WARNING: X11/Xauth.h: see the Autoconf documentation" >&2;}
|
|
- { echo "$as_me:$LINENO: WARNING: X11/Xauth.h: section \"Present But Cannot Be Compiled\"" >&5
|
|
-echo "$as_me: WARNING: X11/Xauth.h: section \"Present But Cannot Be Compiled\"" >&2;}
|
|
- { echo "$as_me:$LINENO: WARNING: X11/Xauth.h: proceeding with the preprocessor's result" >&5
|
|
-echo "$as_me: WARNING: X11/Xauth.h: proceeding with the preprocessor's result" >&2;}
|
|
- { echo "$as_me:$LINENO: WARNING: X11/Xauth.h: in the future, the compiler will take precedence" >&5
|
|
-echo "$as_me: WARNING: X11/Xauth.h: in the future, the compiler will take precedence" >&2;}
|
|
- ( cat <<\_ASBOX
|
|
-## ---------------------------------------------------------------------- ##
|
|
-## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=libgtop ##
|
|
-## ---------------------------------------------------------------------- ##
|
|
-_ASBOX
|
|
- ) | sed "s/^/$as_me: WARNING: /" >&2
|
|
- ;;
|
|
-esac
|
|
-{ echo "$as_me:$LINENO: checking for X11/Xauth.h" >&5
|
|
-echo $ECHO_N "checking for X11/Xauth.h... $ECHO_C" >&6; }
|
|
-if test "${ac_cv_header_X11_Xauth_h+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
-else
|
|
- ac_cv_header_X11_Xauth_h=$ac_header_preproc
|
|
fi
|
|
-{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_Xauth_h" >&5
|
|
-echo "${ECHO_T}$ac_cv_header_X11_Xauth_h" >&6; }
|
|
|
|
fi
|
|
-if test $ac_cv_header_X11_Xauth_h = yes; then
|
|
- :
|
|
+
|
|
+
|
|
+
|
|
+saved_CPPFLAGS="$CPPFLAGS"
|
|
+CPPFLAGS="$CPPFLAGS $X_CFLAGS"
|
|
+test -z "$with_xauth" && { ac_fn_c_check_header_mongrel "$LINENO" "X11/Xauth.h" "ac_cv_header_X11_Xauth_h" "$ac_includes_default"
|
|
+if test "x$ac_cv_header_X11_Xauth_h" = x""yes; then :
|
|
+
|
|
else
|
|
with_xauth=no
|
|
fi
|
|
|
|
}
|
|
-test -z "$with_xauth" && { { echo "$as_me:$LINENO: checking for XauGetAuthByAddr in -lXau" >&5
|
|
-echo $ECHO_N "checking for XauGetAuthByAddr in -lXau... $ECHO_C" >&6; }
|
|
-if test "${ac_cv_lib_Xau_XauGetAuthByAddr+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+test -z "$with_xauth" && { { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XauGetAuthByAddr in -lXau" >&5
|
|
+$as_echo_n "checking for XauGetAuthByAddr in -lXau... " >&6; }
|
|
+if test "${ac_cv_lib_Xau_XauGetAuthByAddr+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
ac_check_lib_save_LIBS=$LIBS
|
|
LIBS="-lXau $X_LIBS $LIBS"
|
|
-cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
/* end confdefs.h. */
|
|
|
|
/* Override any GCC internal prototype to avoid an error.
|
|
@@ -21949,39 +16105,18 @@ return XauGetAuthByAddr ();
|
|
return 0;
|
|
}
|
|
_ACEOF
|
|
-rm -f conftest.$ac_objext conftest$ac_exeext
|
|
-if { (ac_try="$ac_link"
|
|
-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_link") 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_exeext &&
|
|
- $as_test_x conftest$ac_exeext; then
|
|
+if ac_fn_c_try_link "$LINENO"; then :
|
|
ac_cv_lib_Xau_XauGetAuthByAddr=yes
|
|
else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
- ac_cv_lib_Xau_XauGetAuthByAddr=no
|
|
+ ac_cv_lib_Xau_XauGetAuthByAddr=no
|
|
fi
|
|
-
|
|
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
- conftest$ac_exeext conftest.$ac_ext
|
|
+rm -f core conftest.err conftest.$ac_objext \
|
|
+ conftest$ac_exeext conftest.$ac_ext
|
|
LIBS=$ac_check_lib_save_LIBS
|
|
fi
|
|
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xau_XauGetAuthByAddr" >&5
|
|
-echo "${ECHO_T}$ac_cv_lib_Xau_XauGetAuthByAddr" >&6; }
|
|
-if test $ac_cv_lib_Xau_XauGetAuthByAddr = yes; then
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xau_XauGetAuthByAddr" >&5
|
|
+$as_echo "$ac_cv_lib_Xau_XauGetAuthByAddr" >&6; }
|
|
+if test "x$ac_cv_lib_Xau_XauGetAuthByAddr" = x""yes; then :
|
|
:
|
|
else
|
|
with_xauth=no
|
|
@@ -21990,9 +16125,7 @@ fi
|
|
test -z "$with_xauth" && with_xauth=yes
|
|
if test "$with_xauth" = "yes"; then
|
|
|
|
-cat >>confdefs.h <<\_ACEOF
|
|
-#define HAVE_XAUTH 1
|
|
-_ACEOF
|
|
+$as_echo "#define HAVE_XAUTH 1" >>confdefs.h
|
|
|
|
|
|
T=""
|
|
@@ -22004,158 +16137,16 @@ CPPFLAGS="$saved_CPPFLAGS"
|
|
|
|
|
|
|
|
-
|
|
-
|
|
-
|
|
-
|
|
-
|
|
-
|
|
-
|
|
-
|
|
-
|
|
-
|
|
-
|
|
-
|
|
for ac_header in fcntl.h sys/param.h sys/statfs.h sys/fstyp.h \
|
|
mnttab.h mntent.h sys/statvfs.h sys/vfs.h sys/mount.h \
|
|
sys/filsys.h sys/fs_types.h sys/fs/s5param.h
|
|
-do
|
|
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
|
|
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
|
|
- { echo "$as_me:$LINENO: checking for $ac_header" >&5
|
|
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
|
|
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
-fi
|
|
-ac_res=`eval echo '${'$as_ac_Header'}'`
|
|
- { echo "$as_me:$LINENO: result: $ac_res" >&5
|
|
-echo "${ECHO_T}$ac_res" >&6; }
|
|
-else
|
|
- # Is the header compilable?
|
|
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
|
|
-echo $ECHO_N "checking $ac_header usability... $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. */
|
|
-$ac_includes_default
|
|
-#include <$ac_header>
|
|
-_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
|
|
- ac_header_compiler=yes
|
|
-else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
- ac_header_compiler=no
|
|
-fi
|
|
-
|
|
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
|
|
-echo "${ECHO_T}$ac_header_compiler" >&6; }
|
|
-
|
|
-# Is the header present?
|
|
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
|
|
-echo $ECHO_N "checking $ac_header presence... $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. */
|
|
-#include <$ac_header>
|
|
-_ACEOF
|
|
-if { (ac_try="$ac_cpp conftest.$ac_ext"
|
|
-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_cpp conftest.$ac_ext") 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); } >/dev/null && {
|
|
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
|
|
- test ! -s conftest.err
|
|
- }; then
|
|
- ac_header_preproc=yes
|
|
-else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
- ac_header_preproc=no
|
|
-fi
|
|
-
|
|
-rm -f conftest.err conftest.$ac_ext
|
|
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
|
|
-echo "${ECHO_T}$ac_header_preproc" >&6; }
|
|
-
|
|
-# So? What about this header?
|
|
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
|
|
- yes:no: )
|
|
- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
|
|
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
|
|
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
|
|
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
|
|
- ac_header_preproc=yes
|
|
- ;;
|
|
- no:yes:* )
|
|
- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
|
|
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
|
|
- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
|
|
-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
|
|
- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
|
|
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
|
|
- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
|
|
-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
|
|
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
|
|
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
|
|
- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
|
|
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
|
|
- ( cat <<\_ASBOX
|
|
-## ---------------------------------------------------------------------- ##
|
|
-## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=libgtop ##
|
|
-## ---------------------------------------------------------------------- ##
|
|
-_ASBOX
|
|
- ) | sed "s/^/$as_me: WARNING: /" >&2
|
|
- ;;
|
|
-esac
|
|
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
|
|
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
|
|
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
-else
|
|
- eval "$as_ac_Header=\$ac_header_preproc"
|
|
-fi
|
|
-ac_res=`eval echo '${'$as_ac_Header'}'`
|
|
- { echo "$as_me:$LINENO: result: $ac_res" >&5
|
|
-echo "${ECHO_T}$ac_res" >&6; }
|
|
-
|
|
-fi
|
|
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
|
|
+do :
|
|
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
|
|
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
|
|
+eval as_val=\$$as_ac_Header
|
|
+ if test "x$as_val" = x""yes; then :
|
|
cat >>confdefs.h <<_ACEOF
|
|
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
|
|
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
|
|
_ACEOF
|
|
|
|
fi
|
|
@@ -22163,114 +16154,16 @@ fi
|
|
done
|
|
|
|
|
|
-
|
|
-
|
|
-
|
|
-
|
|
-
|
|
-
|
|
-
|
|
-
|
|
-
|
|
-
|
|
-
|
|
-
|
|
-
|
|
-
|
|
-
|
|
-
|
|
-
|
|
-
|
|
for ac_func in bcopy endgrent endpwent fchdir ftime ftruncate \
|
|
getcwd getmntinfo gettimeofday isascii lchown \
|
|
listmntent memcpy mkfifo strchr strerror strrchr vprintf
|
|
-do
|
|
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
|
|
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
|
|
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
|
|
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
-else
|
|
- cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
-/* end confdefs.h. */
|
|
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
|
|
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
|
|
-#define $ac_func innocuous_$ac_func
|
|
-
|
|
-/* System header to define __stub macros and hopefully few prototypes,
|
|
- which can conflict with char $ac_func (); below.
|
|
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
|
|
- <limits.h> exists even on freestanding compilers. */
|
|
-
|
|
-#ifdef __STDC__
|
|
-# include <limits.h>
|
|
-#else
|
|
-# include <assert.h>
|
|
-#endif
|
|
-
|
|
-#undef $ac_func
|
|
-
|
|
-/* Override any GCC internal prototype to avoid an error.
|
|
- Use char because int might match the return type of a GCC
|
|
- builtin and then its argument prototype would still apply. */
|
|
-#ifdef __cplusplus
|
|
-extern "C"
|
|
-#endif
|
|
-char $ac_func ();
|
|
-/* The GNU C library defines this for functions which it implements
|
|
- to always fail with ENOSYS. Some functions are actually named
|
|
- something starting with __ and the normal name is an alias. */
|
|
-#if defined __stub_$ac_func || defined __stub___$ac_func
|
|
-choke me
|
|
-#endif
|
|
-
|
|
-int
|
|
-main ()
|
|
-{
|
|
-return $ac_func ();
|
|
- ;
|
|
- return 0;
|
|
-}
|
|
-_ACEOF
|
|
-rm -f conftest.$ac_objext conftest$ac_exeext
|
|
-if { (ac_try="$ac_link"
|
|
-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_link") 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_exeext &&
|
|
- $as_test_x conftest$ac_exeext; then
|
|
- eval "$as_ac_var=yes"
|
|
-else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
- eval "$as_ac_var=no"
|
|
-fi
|
|
-
|
|
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
- conftest$ac_exeext conftest.$ac_ext
|
|
-fi
|
|
-ac_res=`eval echo '${'$as_ac_var'}'`
|
|
- { echo "$as_me:$LINENO: result: $ac_res" >&5
|
|
-echo "${ECHO_T}$ac_res" >&6; }
|
|
-if test `eval echo '${'$as_ac_var'}'` = yes; then
|
|
+do :
|
|
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
|
|
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
|
|
+eval as_val=\$$as_ac_var
|
|
+ if test "x$as_val" = x""yes; then :
|
|
cat >>confdefs.h <<_ACEOF
|
|
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
|
|
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
|
|
_ACEOF
|
|
|
|
fi
|
|
@@ -22303,17 +16196,13 @@ list_mounted_fs=
|
|
# make sure LIBS contains -lsun (on Irix4) or -lseq (on PTX).
|
|
# getmntent is in the standard C library on UNICOS, in -lsun on Irix 4,
|
|
# -lseq on Dynix/PTX, -lgen on Unixware.
|
|
-{ echo "$as_me:$LINENO: checking for library containing getmntent" >&5
|
|
-echo $ECHO_N "checking for library containing getmntent... $ECHO_C" >&6; }
|
|
-if test "${ac_cv_search_getmntent+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing getmntent" >&5
|
|
+$as_echo_n "checking for library containing getmntent... " >&6; }
|
|
+if test "${ac_cv_search_getmntent+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
ac_func_search_save_LIBS=$LIBS
|
|
-cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
/* end confdefs.h. */
|
|
|
|
/* Override any GCC internal prototype to avoid an error.
|
|
@@ -22338,56 +16227,31 @@ for ac_lib in '' sun seq gen; do
|
|
ac_res=-l$ac_lib
|
|
LIBS="-l$ac_lib $ac_func_search_save_LIBS"
|
|
fi
|
|
- rm -f conftest.$ac_objext conftest$ac_exeext
|
|
-if { (ac_try="$ac_link"
|
|
-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_link") 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_exeext &&
|
|
- $as_test_x conftest$ac_exeext; then
|
|
+ if ac_fn_c_try_link "$LINENO"; then :
|
|
ac_cv_search_getmntent=$ac_res
|
|
-else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
-
|
|
fi
|
|
-
|
|
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
- conftest$ac_exeext
|
|
- if test "${ac_cv_search_getmntent+set}" = set; then
|
|
+rm -f core conftest.err conftest.$ac_objext \
|
|
+ conftest$ac_exeext
|
|
+ if test "${ac_cv_search_getmntent+set}" = set; then :
|
|
break
|
|
fi
|
|
done
|
|
-if test "${ac_cv_search_getmntent+set}" = set; then
|
|
- :
|
|
+if test "${ac_cv_search_getmntent+set}" = set; then :
|
|
+
|
|
else
|
|
ac_cv_search_getmntent=no
|
|
fi
|
|
rm conftest.$ac_ext
|
|
LIBS=$ac_func_search_save_LIBS
|
|
fi
|
|
-{ echo "$as_me:$LINENO: result: $ac_cv_search_getmntent" >&5
|
|
-echo "${ECHO_T}$ac_cv_search_getmntent" >&6; }
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_getmntent" >&5
|
|
+$as_echo "$ac_cv_search_getmntent" >&6; }
|
|
ac_res=$ac_cv_search_getmntent
|
|
-if test "$ac_res" != no; then
|
|
+if test "$ac_res" != no; then :
|
|
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
|
|
ac_cv_func_getmntent=yes
|
|
|
|
-cat >>confdefs.h <<\_ACEOF
|
|
-#define HAVE_GETMNTENT 1
|
|
-_ACEOF
|
|
+$as_echo "#define HAVE_GETMNTENT 1" >>confdefs.h
|
|
|
|
else
|
|
ac_cv_func_getmntent=no
|
|
@@ -22406,17 +16270,13 @@ fi
|
|
|
|
if test -z "$list_mounted_fs"; then
|
|
# Cray UNICOS 9
|
|
-{ echo "$as_me:$LINENO: checking for listmntent of Cray/Unicos-9" >&5
|
|
-echo $ECHO_N "checking for listmntent of Cray/Unicos-9... $ECHO_C" >&6; }
|
|
-if test "${fu_cv_sys_mounted_cray_listmntent+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for listmntent of Cray/Unicos-9" >&5
|
|
+$as_echo_n "checking for listmntent of Cray/Unicos-9... " >&6; }
|
|
+if test "${fu_cv_sys_mounted_cray_listmntent+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
fu_cv_sys_mounted_cray_listmntent=no
|
|
-cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
/* end confdefs.h. */
|
|
#ifdef _CRAY
|
|
yes
|
|
@@ -22424,7 +16284,7 @@ yes
|
|
|
|
_ACEOF
|
|
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
|
|
- $EGREP "yes" >/dev/null 2>&1; then
|
|
+ $EGREP "yes" >/dev/null 2>&1; then :
|
|
test $ac_cv_func_listmntent = yes \
|
|
&& fu_cv_sys_mounted_cray_listmntent=yes
|
|
|
|
@@ -22435,14 +16295,12 @@ rm -f conftest*
|
|
|
|
fi
|
|
|
|
-{ echo "$as_me:$LINENO: result: $fu_cv_sys_mounted_cray_listmntent" >&5
|
|
-echo "${ECHO_T}$fu_cv_sys_mounted_cray_listmntent" >&6; }
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $fu_cv_sys_mounted_cray_listmntent" >&5
|
|
+$as_echo "$fu_cv_sys_mounted_cray_listmntent" >&6; }
|
|
if test $fu_cv_sys_mounted_cray_listmntent = yes; then
|
|
list_mounted_fs=found
|
|
|
|
-cat >>confdefs.h <<\_ACEOF
|
|
-#define MOUNTED_LISTMNTENT 1
|
|
-_ACEOF
|
|
+$as_echo "#define MOUNTED_LISTMNTENT 1" >>confdefs.h
|
|
|
|
fi
|
|
fi
|
|
@@ -22454,46 +16312,40 @@ if test $ac_cv_func_getmntent = yes; the
|
|
|
|
if test -z "$list_mounted_fs"; then
|
|
# 4.3BSD, SunOS, HP-UX, Dynix, Irix
|
|
-{ echo "$as_me:$LINENO: checking for one-argument getmntent function" >&5
|
|
-echo $ECHO_N "checking for one-argument getmntent function... $ECHO_C" >&6; }
|
|
-if test "${fu_cv_sys_mounted_getmntent1+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for one-argument getmntent function" >&5
|
|
+$as_echo_n "checking for one-argument getmntent function... " >&6; }
|
|
+if test "${fu_cv_sys_mounted_getmntent1+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
test $ac_cv_header_mntent_h = yes \
|
|
&& fu_cv_sys_mounted_getmntent1=yes \
|
|
|| fu_cv_sys_mounted_getmntent1=no
|
|
fi
|
|
|
|
-{ echo "$as_me:$LINENO: result: $fu_cv_sys_mounted_getmntent1" >&5
|
|
-echo "${ECHO_T}$fu_cv_sys_mounted_getmntent1" >&6; }
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $fu_cv_sys_mounted_getmntent1" >&5
|
|
+$as_echo "$fu_cv_sys_mounted_getmntent1" >&6; }
|
|
if test $fu_cv_sys_mounted_getmntent1 = yes; then
|
|
list_mounted_fs=found
|
|
|
|
-cat >>confdefs.h <<\_ACEOF
|
|
-#define MOUNTED_GETMNTENT1 1
|
|
-_ACEOF
|
|
+$as_echo "#define MOUNTED_GETMNTENT1 1" >>confdefs.h
|
|
|
|
fi
|
|
fi
|
|
|
|
if test -z "$list_mounted_fs"; then
|
|
# SVR4
|
|
-{ echo "$as_me:$LINENO: checking for two-argument getmntent function" >&5
|
|
-echo $ECHO_N "checking for two-argument getmntent function... $ECHO_C" >&6; }
|
|
-if test "${fu_cv_sys_mounted_getmntent2+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for two-argument getmntent function" >&5
|
|
+$as_echo_n "checking for two-argument getmntent function... " >&6; }
|
|
+if test "${fu_cv_sys_mounted_getmntent2+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
- cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
/* end confdefs.h. */
|
|
#include <sys/mnttab.h>
|
|
|
|
_ACEOF
|
|
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
|
|
- $EGREP "getmntent" >/dev/null 2>&1; then
|
|
+ $EGREP "getmntent" >/dev/null 2>&1; then :
|
|
fu_cv_sys_mounted_getmntent2=yes
|
|
else
|
|
fu_cv_sys_mounted_getmntent2=no
|
|
@@ -22502,38 +16354,30 @@ rm -f conftest*
|
|
|
|
fi
|
|
|
|
-{ echo "$as_me:$LINENO: result: $fu_cv_sys_mounted_getmntent2" >&5
|
|
-echo "${ECHO_T}$fu_cv_sys_mounted_getmntent2" >&6; }
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $fu_cv_sys_mounted_getmntent2" >&5
|
|
+$as_echo "$fu_cv_sys_mounted_getmntent2" >&6; }
|
|
if test $fu_cv_sys_mounted_getmntent2 = yes; then
|
|
list_mounted_fs=found
|
|
|
|
-cat >>confdefs.h <<\_ACEOF
|
|
-#define MOUNTED_GETMNTENT2 1
|
|
-_ACEOF
|
|
+$as_echo "#define MOUNTED_GETMNTENT2 1" >>confdefs.h
|
|
|
|
fi
|
|
fi
|
|
|
|
if test -z "$list_mounted_fs"; then
|
|
-{ { echo "$as_me:$LINENO: error: could not determine how to read list of mounted filesystems" >&5
|
|
-echo "$as_me: error: could not determine how to read list of mounted filesystems" >&2;}
|
|
- { (exit 1); exit 1; }; }
|
|
+as_fn_error "could not determine how to read list of mounted filesystems" "$LINENO" 5
|
|
fi
|
|
|
|
fi
|
|
|
|
if test -z "$list_mounted_fs"; then
|
|
# DEC Alpha running OSF/1.
|
|
-{ echo "$as_me:$LINENO: checking for getfsstat function" >&5
|
|
-echo $ECHO_N "checking for getfsstat function... $ECHO_C" >&6; }
|
|
-if test "${fu_cv_sys_mounted_getsstat+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for getfsstat function" >&5
|
|
+$as_echo_n "checking for getfsstat function... " >&6; }
|
|
+if test "${fu_cv_sys_mounted_getsstat+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
- cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
/* end confdefs.h. */
|
|
|
|
#include <sys/types.h>
|
|
@@ -22548,180 +16392,103 @@ int numsys = getfsstat ((struct statfs *
|
|
return 0;
|
|
}
|
|
_ACEOF
|
|
-rm -f conftest.$ac_objext conftest$ac_exeext
|
|
-if { (ac_try="$ac_link"
|
|
-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_link") 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_exeext &&
|
|
- $as_test_x conftest$ac_exeext; then
|
|
+if ac_fn_c_try_link "$LINENO"; then :
|
|
fu_cv_sys_mounted_getsstat=yes
|
|
else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
- fu_cv_sys_mounted_getsstat=no
|
|
+ fu_cv_sys_mounted_getsstat=no
|
|
fi
|
|
-
|
|
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
- conftest$ac_exeext conftest.$ac_ext
|
|
+rm -f core conftest.err conftest.$ac_objext \
|
|
+ conftest$ac_exeext conftest.$ac_ext
|
|
fi
|
|
|
|
-{ echo "$as_me:$LINENO: result: $fu_cv_sys_mounted_getsstat" >&5
|
|
-echo "${ECHO_T}$fu_cv_sys_mounted_getsstat" >&6; }
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $fu_cv_sys_mounted_getsstat" >&5
|
|
+$as_echo "$fu_cv_sys_mounted_getsstat" >&6; }
|
|
if test $fu_cv_sys_mounted_getsstat = yes; then
|
|
list_mounted_fs=found
|
|
|
|
-cat >>confdefs.h <<\_ACEOF
|
|
-#define MOUNTED_GETFSSTAT 1
|
|
-_ACEOF
|
|
+$as_echo "#define MOUNTED_GETFSSTAT 1" >>confdefs.h
|
|
|
|
fi
|
|
fi
|
|
|
|
if test -z "$list_mounted_fs"; then
|
|
# AIX.
|
|
-{ echo "$as_me:$LINENO: checking for mntctl function and struct vmount" >&5
|
|
-echo $ECHO_N "checking for mntctl function and struct vmount... $ECHO_C" >&6; }
|
|
-if test "${fu_cv_sys_mounted_vmount+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for mntctl function and struct vmount" >&5
|
|
+$as_echo_n "checking for mntctl function and struct vmount... " >&6; }
|
|
+if test "${fu_cv_sys_mounted_vmount+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
- cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
/* end confdefs.h. */
|
|
#include <fshelp.h>
|
|
_ACEOF
|
|
-if { (ac_try="$ac_cpp conftest.$ac_ext"
|
|
-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_cpp conftest.$ac_ext") 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); } >/dev/null && {
|
|
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
|
|
- test ! -s conftest.err
|
|
- }; then
|
|
+if ac_fn_c_try_cpp "$LINENO"; then :
|
|
fu_cv_sys_mounted_vmount=yes
|
|
else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
fu_cv_sys_mounted_vmount=no
|
|
fi
|
|
-
|
|
rm -f conftest.err conftest.$ac_ext
|
|
fi
|
|
|
|
-{ echo "$as_me:$LINENO: result: $fu_cv_sys_mounted_vmount" >&5
|
|
-echo "${ECHO_T}$fu_cv_sys_mounted_vmount" >&6; }
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $fu_cv_sys_mounted_vmount" >&5
|
|
+$as_echo "$fu_cv_sys_mounted_vmount" >&6; }
|
|
if test $fu_cv_sys_mounted_vmount = yes; then
|
|
list_mounted_fs=found
|
|
|
|
-cat >>confdefs.h <<\_ACEOF
|
|
-#define MOUNTED_VMOUNT 1
|
|
-_ACEOF
|
|
+$as_echo "#define MOUNTED_VMOUNT 1" >>confdefs.h
|
|
|
|
fi
|
|
fi
|
|
|
|
if test -z "$list_mounted_fs"; then
|
|
# SVR3
|
|
-{ echo "$as_me:$LINENO: checking for FIXME existence of three headers" >&5
|
|
-echo $ECHO_N "checking for FIXME existence of three headers... $ECHO_C" >&6; }
|
|
-if test "${fu_cv_sys_mounted_fread_fstyp+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for FIXME existence of three headers" >&5
|
|
+$as_echo_n "checking for FIXME existence of three headers... " >&6; }
|
|
+if test "${fu_cv_sys_mounted_fread_fstyp+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
- cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
/* end confdefs.h. */
|
|
|
|
#include <sys/statfs.h>
|
|
#include <sys/fstyp.h>
|
|
#include <mnttab.h>
|
|
_ACEOF
|
|
-if { (ac_try="$ac_cpp conftest.$ac_ext"
|
|
-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_cpp conftest.$ac_ext") 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); } >/dev/null && {
|
|
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
|
|
- test ! -s conftest.err
|
|
- }; then
|
|
+if ac_fn_c_try_cpp "$LINENO"; then :
|
|
fu_cv_sys_mounted_fread_fstyp=yes
|
|
else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
fu_cv_sys_mounted_fread_fstyp=no
|
|
fi
|
|
-
|
|
rm -f conftest.err conftest.$ac_ext
|
|
fi
|
|
|
|
-{ echo "$as_me:$LINENO: result: $fu_cv_sys_mounted_fread_fstyp" >&5
|
|
-echo "${ECHO_T}$fu_cv_sys_mounted_fread_fstyp" >&6; }
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $fu_cv_sys_mounted_fread_fstyp" >&5
|
|
+$as_echo "$fu_cv_sys_mounted_fread_fstyp" >&6; }
|
|
if test $fu_cv_sys_mounted_fread_fstyp = yes; then
|
|
list_mounted_fs=found
|
|
|
|
-cat >>confdefs.h <<\_ACEOF
|
|
-#define MOUNTED_FREAD_FSTYP 1
|
|
-_ACEOF
|
|
+$as_echo "#define MOUNTED_FREAD_FSTYP 1" >>confdefs.h
|
|
|
|
fi
|
|
fi
|
|
|
|
if test -z "$list_mounted_fs"; then
|
|
# 4.4BSD and DEC OSF/1.
|
|
-{ echo "$as_me:$LINENO: checking for getmntinfo function" >&5
|
|
-echo $ECHO_N "checking for getmntinfo function... $ECHO_C" >&6; }
|
|
-if test "${fu_cv_sys_mounted_getmntinfo+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for getmntinfo function" >&5
|
|
+$as_echo_n "checking for getmntinfo function... " >&6; }
|
|
+if test "${fu_cv_sys_mounted_getmntinfo+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
|
|
ok=
|
|
if test $ac_cv_func_getmntinfo = yes; then
|
|
-cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
/* end confdefs.h. */
|
|
#include <sys/mount.h>
|
|
|
|
_ACEOF
|
|
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
|
|
- $EGREP "f_type;" >/dev/null 2>&1; then
|
|
+ $EGREP "f_type;" >/dev/null 2>&1; then :
|
|
ok=yes
|
|
fi
|
|
rm -f conftest*
|
|
@@ -22733,14 +16500,12 @@ test -n "$ok" \
|
|
|
|
fi
|
|
|
|
-{ echo "$as_me:$LINENO: result: $fu_cv_sys_mounted_getmntinfo" >&5
|
|
-echo "${ECHO_T}$fu_cv_sys_mounted_getmntinfo" >&6; }
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $fu_cv_sys_mounted_getmntinfo" >&5
|
|
+$as_echo "$fu_cv_sys_mounted_getmntinfo" >&6; }
|
|
if test $fu_cv_sys_mounted_getmntinfo = yes; then
|
|
list_mounted_fs=found
|
|
|
|
-cat >>confdefs.h <<\_ACEOF
|
|
-#define MOUNTED_GETMNTINFO 1
|
|
-_ACEOF
|
|
+$as_echo "#define MOUNTED_GETMNTINFO 1" >>confdefs.h
|
|
|
|
fi
|
|
fi
|
|
@@ -22749,124 +16514,72 @@ fi
|
|
|
|
if test -z "$list_mounted_fs"; then
|
|
# Ultrix
|
|
-{ echo "$as_me:$LINENO: checking for getmnt function" >&5
|
|
-echo $ECHO_N "checking for getmnt function... $ECHO_C" >&6; }
|
|
-if test "${fu_cv_sys_mounted_getmnt+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for getmnt function" >&5
|
|
+$as_echo_n "checking for getmnt function... " >&6; }
|
|
+if test "${fu_cv_sys_mounted_getmnt+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
- cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
/* end confdefs.h. */
|
|
|
|
#include <sys/fs_types.h>
|
|
#include <sys/mount.h>
|
|
_ACEOF
|
|
-if { (ac_try="$ac_cpp conftest.$ac_ext"
|
|
-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_cpp conftest.$ac_ext") 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); } >/dev/null && {
|
|
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
|
|
- test ! -s conftest.err
|
|
- }; then
|
|
+if ac_fn_c_try_cpp "$LINENO"; then :
|
|
fu_cv_sys_mounted_getmnt=yes
|
|
else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
fu_cv_sys_mounted_getmnt=no
|
|
fi
|
|
-
|
|
rm -f conftest.err conftest.$ac_ext
|
|
fi
|
|
|
|
-{ echo "$as_me:$LINENO: result: $fu_cv_sys_mounted_getmnt" >&5
|
|
-echo "${ECHO_T}$fu_cv_sys_mounted_getmnt" >&6; }
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $fu_cv_sys_mounted_getmnt" >&5
|
|
+$as_echo "$fu_cv_sys_mounted_getmnt" >&6; }
|
|
if test $fu_cv_sys_mounted_getmnt = yes; then
|
|
list_mounted_fs=found
|
|
|
|
-cat >>confdefs.h <<\_ACEOF
|
|
-#define MOUNTED_GETMNT 1
|
|
-_ACEOF
|
|
+$as_echo "#define MOUNTED_GETMNT 1" >>confdefs.h
|
|
|
|
fi
|
|
fi
|
|
|
|
if test -z "$list_mounted_fs"; then
|
|
# SVR2
|
|
-{ echo "$as_me:$LINENO: checking whether it is possible to resort to fread on /etc/mnttab" >&5
|
|
-echo $ECHO_N "checking whether it is possible to resort to fread on /etc/mnttab... $ECHO_C" >&6; }
|
|
-if test "${fu_cv_sys_mounted_fread+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether it is possible to resort to fread on /etc/mnttab" >&5
|
|
+$as_echo_n "checking whether it is possible to resort to fread on /etc/mnttab... " >&6; }
|
|
+if test "${fu_cv_sys_mounted_fread+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
- cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
/* end confdefs.h. */
|
|
#include <mnttab.h>
|
|
_ACEOF
|
|
-if { (ac_try="$ac_cpp conftest.$ac_ext"
|
|
-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_cpp conftest.$ac_ext") 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); } >/dev/null && {
|
|
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
|
|
- test ! -s conftest.err
|
|
- }; then
|
|
+if ac_fn_c_try_cpp "$LINENO"; then :
|
|
fu_cv_sys_mounted_fread=yes
|
|
else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
fu_cv_sys_mounted_fread=no
|
|
fi
|
|
-
|
|
rm -f conftest.err conftest.$ac_ext
|
|
fi
|
|
|
|
-{ echo "$as_me:$LINENO: result: $fu_cv_sys_mounted_fread" >&5
|
|
-echo "${ECHO_T}$fu_cv_sys_mounted_fread" >&6; }
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $fu_cv_sys_mounted_fread" >&5
|
|
+$as_echo "$fu_cv_sys_mounted_fread" >&6; }
|
|
if test $fu_cv_sys_mounted_fread = yes; then
|
|
list_mounted_fs=found
|
|
|
|
-cat >>confdefs.h <<\_ACEOF
|
|
-#define MOUNTED_FREAD 1
|
|
-_ACEOF
|
|
+$as_echo "#define MOUNTED_FREAD 1" >>confdefs.h
|
|
|
|
fi
|
|
fi
|
|
|
|
if test -z "$list_mounted_fs"; then
|
|
-{ { echo "$as_me:$LINENO: error: could not determine how to read list of mounted filesystems" >&5
|
|
-echo "$as_me: error: could not determine how to read list of mounted filesystems" >&2;}
|
|
- { (exit 1); exit 1; }; }
|
|
+as_fn_error "could not determine how to read list of mounted filesystems" "$LINENO" 5
|
|
# FIXME -- no need to abort building the whole package
|
|
# Cannot build mountlist.c or anything that needs its functions
|
|
fi
|
|
|
|
-{ echo "$as_me:$LINENO: checking how to get filesystem space usage..." >&5
|
|
-echo "$as_me: checking how to get filesystem space usage..." >&6;}
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to get filesystem space usage..." >&5
|
|
+$as_echo "$as_me: checking how to get filesystem space usage..." >&6;}
|
|
space=no
|
|
|
|
# Perform only the link test since it seems there are no variants of the
|
|
@@ -22877,16 +16590,12 @@ space=no
|
|
# is what it gets when this test fails.
|
|
if test $space = no; then
|
|
# SVR4
|
|
-{ echo "$as_me:$LINENO: checking statvfs function (SVR4)" >&5
|
|
-echo $ECHO_N "checking statvfs function (SVR4)... $ECHO_C" >&6; }
|
|
-if test "${fu_cv_sys_stat_statvfs+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking statvfs function (SVR4)" >&5
|
|
+$as_echo_n "checking statvfs function (SVR4)... " >&6; }
|
|
+if test "${fu_cv_sys_stat_statvfs+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
- cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
/* end confdefs.h. */
|
|
#include <sys/types.h>
|
|
#include <sys/statvfs.h>
|
|
@@ -22898,62 +16607,35 @@ struct statvfs fsd; statvfs (0, &fsd);
|
|
return 0;
|
|
}
|
|
_ACEOF
|
|
-rm -f conftest.$ac_objext conftest$ac_exeext
|
|
-if { (ac_try="$ac_link"
|
|
-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_link") 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_exeext &&
|
|
- $as_test_x conftest$ac_exeext; then
|
|
+if ac_fn_c_try_link "$LINENO"; then :
|
|
fu_cv_sys_stat_statvfs=yes
|
|
else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
- fu_cv_sys_stat_statvfs=no
|
|
+ fu_cv_sys_stat_statvfs=no
|
|
fi
|
|
-
|
|
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
- conftest$ac_exeext conftest.$ac_ext
|
|
+rm -f core conftest.err conftest.$ac_objext \
|
|
+ conftest$ac_exeext conftest.$ac_ext
|
|
fi
|
|
-{ echo "$as_me:$LINENO: result: $fu_cv_sys_stat_statvfs" >&5
|
|
-echo "${ECHO_T}$fu_cv_sys_stat_statvfs" >&6; }
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $fu_cv_sys_stat_statvfs" >&5
|
|
+$as_echo "$fu_cv_sys_stat_statvfs" >&6; }
|
|
if test $fu_cv_sys_stat_statvfs = yes; then
|
|
space=yes
|
|
|
|
-cat >>confdefs.h <<\_ACEOF
|
|
-#define STAT_STATVFS 1
|
|
-_ACEOF
|
|
+$as_echo "#define STAT_STATVFS 1" >>confdefs.h
|
|
|
|
fi
|
|
fi
|
|
|
|
if test $space = no; then
|
|
# DEC Alpha running OSF/1
|
|
-{ echo "$as_me:$LINENO: checking for 3-argument statfs function (DEC OSF/1)" >&5
|
|
-echo $ECHO_N "checking for 3-argument statfs function (DEC OSF/1)... $ECHO_C" >&6; }
|
|
-if test "${fu_cv_sys_stat_statfs3_osf1+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for 3-argument statfs function (DEC OSF/1)" >&5
|
|
+$as_echo_n "checking for 3-argument statfs function (DEC OSF/1)... " >&6; }
|
|
+if test "${fu_cv_sys_stat_statfs3_osf1+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
- if test "$cross_compiling" = yes; then
|
|
+ if test "$cross_compiling" = yes; then :
|
|
fu_cv_sys_stat_statfs3_osf1=no
|
|
else
|
|
- cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
/* end confdefs.h. */
|
|
|
|
#include <sys/param.h>
|
|
@@ -22966,68 +16648,38 @@ fsd.f_fsize = 0;
|
|
return (statfs (".", &fsd, sizeof (struct statfs)));
|
|
}
|
|
_ACEOF
|
|
-rm -f conftest$ac_exeext
|
|
-if { (ac_try="$ac_link"
|
|
-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_link") 2>&5
|
|
- ac_status=$?
|
|
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
|
|
- { (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_try") 2>&5
|
|
- ac_status=$?
|
|
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
- (exit $ac_status); }; }; then
|
|
+if ac_fn_c_try_run "$LINENO"; then :
|
|
fu_cv_sys_stat_statfs3_osf1=yes
|
|
else
|
|
- echo "$as_me: program exited with status $ac_status" >&5
|
|
-echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
-( exit $ac_status )
|
|
-fu_cv_sys_stat_statfs3_osf1=no
|
|
+ fu_cv_sys_stat_statfs3_osf1=no
|
|
fi
|
|
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
|
|
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
|
|
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
|
|
fi
|
|
|
|
-
|
|
fi
|
|
|
|
-{ echo "$as_me:$LINENO: result: $fu_cv_sys_stat_statfs3_osf1" >&5
|
|
-echo "${ECHO_T}$fu_cv_sys_stat_statfs3_osf1" >&6; }
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $fu_cv_sys_stat_statfs3_osf1" >&5
|
|
+$as_echo "$fu_cv_sys_stat_statfs3_osf1" >&6; }
|
|
if test $fu_cv_sys_stat_statfs3_osf1 = yes; then
|
|
space=yes
|
|
|
|
-cat >>confdefs.h <<\_ACEOF
|
|
-#define STAT_STATFS3_OSF1 1
|
|
-_ACEOF
|
|
+$as_echo "#define STAT_STATFS3_OSF1 1" >>confdefs.h
|
|
|
|
fi
|
|
fi
|
|
|
|
if test $space = no; then
|
|
# AIX
|
|
-{ echo "$as_me:$LINENO: checking for two-argument statfs with statfs.bsize member (AIX, 4.3BSD)" >&5
|
|
-echo $ECHO_N "checking for two-argument statfs with statfs.bsize member (AIX, 4.3BSD)... $ECHO_C" >&6; }
|
|
-if test "${fu_cv_sys_stat_statfs2_bsize+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for two-argument statfs with statfs.bsize member (AIX, 4.3BSD)" >&5
|
|
+$as_echo_n "checking for two-argument statfs with statfs.bsize member (AIX, 4.3BSD)... " >&6; }
|
|
+if test "${fu_cv_sys_stat_statfs2_bsize+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
- if test "$cross_compiling" = yes; then
|
|
+ if test "$cross_compiling" = yes; then :
|
|
fu_cv_sys_stat_statfs2_bsize=no
|
|
else
|
|
- cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
/* end confdefs.h. */
|
|
|
|
#ifdef HAVE_SYS_PARAM_H
|
|
@@ -23046,68 +16698,38 @@ fsd.f_bsize = 0;
|
|
return (statfs (".", &fsd));
|
|
}
|
|
_ACEOF
|
|
-rm -f conftest$ac_exeext
|
|
-if { (ac_try="$ac_link"
|
|
-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_link") 2>&5
|
|
- ac_status=$?
|
|
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
|
|
- { (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_try") 2>&5
|
|
- ac_status=$?
|
|
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
- (exit $ac_status); }; }; then
|
|
+if ac_fn_c_try_run "$LINENO"; then :
|
|
fu_cv_sys_stat_statfs2_bsize=yes
|
|
else
|
|
- echo "$as_me: program exited with status $ac_status" >&5
|
|
-echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
-( exit $ac_status )
|
|
-fu_cv_sys_stat_statfs2_bsize=no
|
|
+ fu_cv_sys_stat_statfs2_bsize=no
|
|
fi
|
|
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
|
|
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
|
|
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
|
|
fi
|
|
|
|
-
|
|
fi
|
|
|
|
-{ echo "$as_me:$LINENO: result: $fu_cv_sys_stat_statfs2_bsize" >&5
|
|
-echo "${ECHO_T}$fu_cv_sys_stat_statfs2_bsize" >&6; }
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $fu_cv_sys_stat_statfs2_bsize" >&5
|
|
+$as_echo "$fu_cv_sys_stat_statfs2_bsize" >&6; }
|
|
if test $fu_cv_sys_stat_statfs2_bsize = yes; then
|
|
space=yes
|
|
|
|
-cat >>confdefs.h <<\_ACEOF
|
|
-#define STAT_STATFS2_BSIZE 1
|
|
-_ACEOF
|
|
+$as_echo "#define STAT_STATFS2_BSIZE 1" >>confdefs.h
|
|
|
|
fi
|
|
fi
|
|
|
|
if test $space = no; then
|
|
# SVR3
|
|
-{ echo "$as_me:$LINENO: checking for four-argument statfs (AIX-3.2.5, SVR3)" >&5
|
|
-echo $ECHO_N "checking for four-argument statfs (AIX-3.2.5, SVR3)... $ECHO_C" >&6; }
|
|
-if test "${fu_cv_sys_stat_statfs4+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for four-argument statfs (AIX-3.2.5, SVR3)" >&5
|
|
+$as_echo_n "checking for four-argument statfs (AIX-3.2.5, SVR3)... " >&6; }
|
|
+if test "${fu_cv_sys_stat_statfs4+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
- if test "$cross_compiling" = yes; then
|
|
+ if test "$cross_compiling" = yes; then :
|
|
fu_cv_sys_stat_statfs4=no
|
|
else
|
|
- cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
/* end confdefs.h. */
|
|
#include <sys/types.h>
|
|
#include <sys/statfs.h>
|
|
@@ -23117,68 +16739,38 @@ struct statfs fsd;
|
|
return (statfs (".", &fsd, sizeof fsd, 0));
|
|
}
|
|
_ACEOF
|
|
-rm -f conftest$ac_exeext
|
|
-if { (ac_try="$ac_link"
|
|
-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_link") 2>&5
|
|
- ac_status=$?
|
|
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
|
|
- { (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_try") 2>&5
|
|
- ac_status=$?
|
|
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
- (exit $ac_status); }; }; then
|
|
+if ac_fn_c_try_run "$LINENO"; then :
|
|
fu_cv_sys_stat_statfs4=yes
|
|
else
|
|
- echo "$as_me: program exited with status $ac_status" >&5
|
|
-echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
-( exit $ac_status )
|
|
-fu_cv_sys_stat_statfs4=no
|
|
+ fu_cv_sys_stat_statfs4=no
|
|
fi
|
|
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
|
|
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
|
|
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
|
|
fi
|
|
|
|
-
|
|
fi
|
|
|
|
-{ echo "$as_me:$LINENO: result: $fu_cv_sys_stat_statfs4" >&5
|
|
-echo "${ECHO_T}$fu_cv_sys_stat_statfs4" >&6; }
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $fu_cv_sys_stat_statfs4" >&5
|
|
+$as_echo "$fu_cv_sys_stat_statfs4" >&6; }
|
|
if test $fu_cv_sys_stat_statfs4 = yes; then
|
|
space=yes
|
|
|
|
-cat >>confdefs.h <<\_ACEOF
|
|
-#define STAT_STATFS4 1
|
|
-_ACEOF
|
|
+$as_echo "#define STAT_STATFS4 1" >>confdefs.h
|
|
|
|
fi
|
|
fi
|
|
|
|
if test $space = no; then
|
|
# 4.4BSD and NetBSD
|
|
-{ echo "$as_me:$LINENO: checking for two-argument statfs with statfs.fsize member (4.4BSD and NetBSD)" >&5
|
|
-echo $ECHO_N "checking for two-argument statfs with statfs.fsize member (4.4BSD and NetBSD)... $ECHO_C" >&6; }
|
|
-if test "${fu_cv_sys_stat_statfs2_fsize+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for two-argument statfs with statfs.fsize member (4.4BSD and NetBSD)" >&5
|
|
+$as_echo_n "checking for two-argument statfs with statfs.fsize member (4.4BSD and NetBSD)... " >&6; }
|
|
+if test "${fu_cv_sys_stat_statfs2_fsize+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
- if test "$cross_compiling" = yes; then
|
|
+ if test "$cross_compiling" = yes; then :
|
|
fu_cv_sys_stat_statfs2_fsize=no
|
|
else
|
|
- cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
/* end confdefs.h. */
|
|
#include <sys/types.h>
|
|
#ifdef HAVE_SYS_PARAM_H
|
|
@@ -23194,68 +16786,38 @@ fsd.f_fsize = 0;
|
|
return (statfs (".", &fsd));
|
|
}
|
|
_ACEOF
|
|
-rm -f conftest$ac_exeext
|
|
-if { (ac_try="$ac_link"
|
|
-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_link") 2>&5
|
|
- ac_status=$?
|
|
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
|
|
- { (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_try") 2>&5
|
|
- ac_status=$?
|
|
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
- (exit $ac_status); }; }; then
|
|
+if ac_fn_c_try_run "$LINENO"; then :
|
|
fu_cv_sys_stat_statfs2_fsize=yes
|
|
else
|
|
- echo "$as_me: program exited with status $ac_status" >&5
|
|
-echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
-( exit $ac_status )
|
|
-fu_cv_sys_stat_statfs2_fsize=no
|
|
+ fu_cv_sys_stat_statfs2_fsize=no
|
|
fi
|
|
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
|
|
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
|
|
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
|
|
fi
|
|
|
|
-
|
|
fi
|
|
|
|
-{ echo "$as_me:$LINENO: result: $fu_cv_sys_stat_statfs2_fsize" >&5
|
|
-echo "${ECHO_T}$fu_cv_sys_stat_statfs2_fsize" >&6; }
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $fu_cv_sys_stat_statfs2_fsize" >&5
|
|
+$as_echo "$fu_cv_sys_stat_statfs2_fsize" >&6; }
|
|
if test $fu_cv_sys_stat_statfs2_fsize = yes; then
|
|
space=yes
|
|
|
|
-cat >>confdefs.h <<\_ACEOF
|
|
-#define STAT_STATFS2_FSIZE 1
|
|
-_ACEOF
|
|
+$as_echo "#define STAT_STATFS2_FSIZE 1" >>confdefs.h
|
|
|
|
fi
|
|
fi
|
|
|
|
if test $space = no; then
|
|
# Ultrix
|
|
-{ echo "$as_me:$LINENO: checking for two-argument statfs with struct fs_data (Ultrix)" >&5
|
|
-echo $ECHO_N "checking for two-argument statfs with struct fs_data (Ultrix)... $ECHO_C" >&6; }
|
|
-if test "${fu_cv_sys_stat_fs_data+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for two-argument statfs with struct fs_data (Ultrix)" >&5
|
|
+$as_echo_n "checking for two-argument statfs with struct fs_data (Ultrix)... " >&6; }
|
|
+if test "${fu_cv_sys_stat_fs_data+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
- if test "$cross_compiling" = yes; then
|
|
+ if test "$cross_compiling" = yes; then :
|
|
fu_cv_sys_stat_fs_data=no
|
|
else
|
|
- cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
/* end confdefs.h. */
|
|
#include <sys/types.h>
|
|
#ifdef HAVE_SYS_PARAM_H
|
|
@@ -23275,92 +16837,39 @@ struct fs_data fsd;
|
|
return (statfs (".", &fsd) != 1);
|
|
}
|
|
_ACEOF
|
|
-rm -f conftest$ac_exeext
|
|
-if { (ac_try="$ac_link"
|
|
-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_link") 2>&5
|
|
- ac_status=$?
|
|
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
|
|
- { (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_try") 2>&5
|
|
- ac_status=$?
|
|
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
- (exit $ac_status); }; }; then
|
|
+if ac_fn_c_try_run "$LINENO"; then :
|
|
fu_cv_sys_stat_fs_data=yes
|
|
else
|
|
- echo "$as_me: program exited with status $ac_status" >&5
|
|
-echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
-( exit $ac_status )
|
|
-fu_cv_sys_stat_fs_data=no
|
|
+ fu_cv_sys_stat_fs_data=no
|
|
fi
|
|
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
|
|
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
|
|
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
|
|
fi
|
|
|
|
-
|
|
fi
|
|
|
|
-{ echo "$as_me:$LINENO: result: $fu_cv_sys_stat_fs_data" >&5
|
|
-echo "${ECHO_T}$fu_cv_sys_stat_fs_data" >&6; }
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $fu_cv_sys_stat_fs_data" >&5
|
|
+$as_echo "$fu_cv_sys_stat_fs_data" >&6; }
|
|
if test $fu_cv_sys_stat_fs_data = yes; then
|
|
space=yes
|
|
|
|
-cat >>confdefs.h <<\_ACEOF
|
|
-#define STAT_STATFS2_FS_DATA 1
|
|
-_ACEOF
|
|
+$as_echo "#define STAT_STATFS2_FS_DATA 1" >>confdefs.h
|
|
|
|
fi
|
|
fi
|
|
|
|
if test $space = no; then
|
|
# SVR2
|
|
-cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
/* end confdefs.h. */
|
|
#include <sys/filsys.h>
|
|
_ACEOF
|
|
-if { (ac_try="$ac_cpp conftest.$ac_ext"
|
|
-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_cpp conftest.$ac_ext") 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); } >/dev/null && {
|
|
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
|
|
- test ! -s conftest.err
|
|
- }; then
|
|
+if ac_fn_c_try_cpp "$LINENO"; then :
|
|
|
|
-cat >>confdefs.h <<\_ACEOF
|
|
-#define STAT_READ_FILSYS 1
|
|
-_ACEOF
|
|
+$as_echo "#define STAT_READ_FILSYS 1" >>confdefs.h
|
|
|
|
space=yes
|
|
-else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
-
|
|
fi
|
|
-
|
|
rm -f conftest.err conftest.$ac_ext
|
|
fi
|
|
|
|
@@ -23373,16 +16882,12 @@ fi
|
|
# Check for SunOS statfs brokenness wrt partitions 2GB and larger.
|
|
# If <sys/vfs.h> exists and struct statfs has a member named f_spare,
|
|
# enable the work-around code in fsusage.c.
|
|
-{ echo "$as_me:$LINENO: checking for statfs that truncates block counts" >&5
|
|
-echo $ECHO_N "checking for statfs that truncates block counts... $ECHO_C" >&6; }
|
|
-if test "${fu_cv_sys_truncating_statfs+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for statfs that truncates block counts" >&5
|
|
+$as_echo_n "checking for statfs that truncates block counts... " >&6; }
|
|
+if test "${fu_cv_sys_truncating_statfs+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
- cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
/* end confdefs.h. */
|
|
|
|
#if !defined(sun) && !defined(__sun)
|
|
@@ -23398,68 +16903,40 @@ struct statfs t; long c = *(t.f_spare);
|
|
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
|
|
+if ac_fn_c_try_compile "$LINENO"; then :
|
|
fu_cv_sys_truncating_statfs=yes
|
|
else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
- fu_cv_sys_truncating_statfs=no
|
|
+ fu_cv_sys_truncating_statfs=no
|
|
fi
|
|
-
|
|
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
fi
|
|
|
|
if test $fu_cv_sys_truncating_statfs = yes; then
|
|
|
|
-cat >>confdefs.h <<\_ACEOF
|
|
-#define STATFS_TRUNCATES_BLOCK_COUNTS 1
|
|
-_ACEOF
|
|
+$as_echo "#define STATFS_TRUNCATES_BLOCK_COUNTS 1" >>confdefs.h
|
|
|
|
fi
|
|
-{ echo "$as_me:$LINENO: result: $fu_cv_sys_truncating_statfs" >&5
|
|
-echo "${ECHO_T}$fu_cv_sys_truncating_statfs" >&6; }
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $fu_cv_sys_truncating_statfs" >&5
|
|
+$as_echo "$fu_cv_sys_truncating_statfs" >&6; }
|
|
|
|
-{ echo "$as_me:$LINENO: checking for AFS..." >&5
|
|
-echo "$as_me: checking for AFS..." >&6;}
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for AFS..." >&5
|
|
+$as_echo "$as_me: checking for AFS..." >&6;}
|
|
test -d /afs &&
|
|
-cat >>confdefs.h <<\_ACEOF
|
|
-#define AFS 1
|
|
-_ACEOF
|
|
+$as_echo "#define AFS 1" >>confdefs.h
|
|
|
|
|
|
|
|
# Check whether --enable-debug was given.
|
|
-if test "${enable_debug+set}" = set; then
|
|
+if test "${enable_debug+set}" = set; then :
|
|
enableval=$enable_debug;
|
|
-cat >>confdefs.h <<\_ACEOF
|
|
-#define LIBGTOP_ENABLE_DEBUG 1
|
|
-_ACEOF
|
|
+$as_echo "#define LIBGTOP_ENABLE_DEBUG 1" >>confdefs.h
|
|
|
|
fi
|
|
|
|
# Check whether --enable-fatal-warnings was given.
|
|
-if test "${enable_fatal_warnings+set}" = set; then
|
|
+if test "${enable_fatal_warnings+set}" = set; then :
|
|
enableval=$enable_fatal_warnings;
|
|
-cat >>confdefs.h <<\_ACEOF
|
|
-#define LIBGTOP_FATAL_WARNINGS 1
|
|
-_ACEOF
|
|
+$as_echo "#define LIBGTOP_FATAL_WARNINGS 1" >>confdefs.h
|
|
|
|
fi
|
|
|
|
@@ -23485,8 +16962,8 @@ libgtop_save_prefix="$prefix"
|
|
libgtop_save_exec_prefix="$exec_prefix"
|
|
test "x$prefix" = xNONE && prefix=$ac_default_prefix
|
|
test "x$exec_prefix" = xNONE && exec_prefix=$prefix
|
|
-LIBGTOP_BINDIR=`eval echo "${bindir}"`
|
|
-LIBGTOP_SERVER=`eval echo "${bindir}/libgtop_server2"`
|
|
+LIBGTOP_BINDIR=`eval echo "${libexecdir}"`
|
|
+LIBGTOP_SERVER=`eval echo "${libexecdir}/libgtop_server2"`
|
|
prefix="$libgtop_save_prefix"
|
|
exec_prefix="$libgtop_save_exec_prefix"
|
|
|
|
@@ -23525,25 +17002,16 @@ INCLUDES="-I\$(top_builddir) -I\$(top_sr
|
|
# Add various defines to the config.h file ...
|
|
|
|
|
|
-
|
|
-cat >>confdefs.h <<\_ACEOF
|
|
-#define _IN_LIBGTOP 1
|
|
-_ACEOF
|
|
+$as_echo "#define _IN_LIBGTOP 1" >>confdefs.h
|
|
|
|
|
|
-cat >>confdefs.h <<\_ACEOF
|
|
-#define LIBGTOP_VERSION "2.28.0"
|
|
-_ACEOF
|
|
+$as_echo "#define LIBGTOP_VERSION \"2.28.0\"" >>confdefs.h
|
|
|
|
|
|
-cat >>confdefs.h <<\_ACEOF
|
|
-#define LIBGTOP_SERVER_VERSION "5"
|
|
-_ACEOF
|
|
+$as_echo "#define LIBGTOP_SERVER_VERSION \"5\"" >>confdefs.h
|
|
|
|
|
|
-cat >>confdefs.h <<\_ACEOF
|
|
-#define LIBGTOP_VERSION_CODE 2028000
|
|
-_ACEOF
|
|
+$as_echo "#define LIBGTOP_VERSION_CODE 2028000" >>confdefs.h
|
|
|
|
|
|
cat >>confdefs.h <<_ACEOF
|
|
@@ -23573,7 +17041,7 @@ fi
|
|
|
|
|
|
# Check whether --with-html-dir was given.
|
|
-if test "${with_html_dir+set}" = set; then
|
|
+if test "${with_html_dir+set}" = set; then :
|
|
withval=$with_html_dir;
|
|
else
|
|
with_html_dir='${datadir}/gtk-doc/html'
|
|
@@ -23583,7 +17051,7 @@ fi
|
|
|
|
|
|
# Check whether --enable-gtk-doc was given.
|
|
-if test "${enable_gtk_doc+set}" = set; then
|
|
+if test "${enable_gtk_doc+set}" = set; then :
|
|
enableval=$enable_gtk_doc;
|
|
else
|
|
enable_gtk_doc=no
|
|
@@ -23592,32 +17060,30 @@ fi
|
|
|
|
if test x$enable_gtk_doc = xyes; then
|
|
if test -n "$PKG_CONFIG" && \
|
|
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk-doc >= 1.4\"") >&5
|
|
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk-doc >= 1.4\""; } >&5
|
|
($PKG_CONFIG --exists --print-errors "gtk-doc >= 1.4") 2>&5
|
|
ac_status=$?
|
|
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
- (exit $ac_status); }; then
|
|
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
|
+ test $ac_status = 0; }; then
|
|
:
|
|
else
|
|
- { { echo "$as_me:$LINENO: error: You need to have gtk-doc >= 1.4 installed to build gtk-doc" >&5
|
|
-echo "$as_me: error: You need to have gtk-doc >= 1.4 installed to build gtk-doc" >&2;}
|
|
- { (exit 1); exit 1; }; }
|
|
+ as_fn_error "You need to have gtk-doc >= 1.4 installed to build gtk-doc" "$LINENO" 5
|
|
fi
|
|
fi
|
|
|
|
- { echo "$as_me:$LINENO: checking whether to build gtk-doc documentation" >&5
|
|
-echo $ECHO_N "checking whether to build gtk-doc documentation... $ECHO_C" >&6; }
|
|
- { echo "$as_me:$LINENO: result: $enable_gtk_doc" >&5
|
|
-echo "${ECHO_T}$enable_gtk_doc" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build gtk-doc documentation" >&5
|
|
+$as_echo_n "checking whether to build gtk-doc documentation... " >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_gtk_doc" >&5
|
|
+$as_echo "$enable_gtk_doc" >&6; }
|
|
|
|
for ac_prog in gtkdoc-check
|
|
do
|
|
# Extract the first word of "$ac_prog", so it can be a program name with args.
|
|
set dummy $ac_prog; 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_GTKDOC_CHECK+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
|
+$as_echo_n "checking for $ac_word... " >&6; }
|
|
+if test "${ac_cv_path_GTKDOC_CHECK+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
case $GTKDOC_CHECK in
|
|
[\\/]* | ?:[\\/]*)
|
|
@@ -23629,14 +17095,14 @@ 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
|
|
+ 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_GTKDOC_CHECK="$as_dir/$ac_word$ac_exec_ext"
|
|
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
break 2
|
|
fi
|
|
done
|
|
-done
|
|
+ done
|
|
IFS=$as_save_IFS
|
|
|
|
;;
|
|
@@ -23644,11 +17110,11 @@ esac
|
|
fi
|
|
GTKDOC_CHECK=$ac_cv_path_GTKDOC_CHECK
|
|
if test -n "$GTKDOC_CHECK"; then
|
|
- { echo "$as_me:$LINENO: result: $GTKDOC_CHECK" >&5
|
|
-echo "${ECHO_T}$GTKDOC_CHECK" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_CHECK" >&5
|
|
+$as_echo "$GTKDOC_CHECK" >&6; }
|
|
else
|
|
- { echo "$as_me:$LINENO: result: no" >&5
|
|
-echo "${ECHO_T}no" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
+$as_echo "no" >&6; }
|
|
fi
|
|
|
|
|
|
@@ -23704,12 +17170,13 @@ _ACEOF
|
|
case $ac_val in #(
|
|
*${as_nl}*)
|
|
case $ac_var in #(
|
|
- *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
|
|
-echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
|
|
+ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
|
|
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
|
|
esac
|
|
case $ac_var in #(
|
|
_ | IFS | as_nl) ;; #(
|
|
- *) $as_unset $ac_var ;;
|
|
+ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
|
|
+ *) { eval $ac_var=; unset $ac_var;} ;;
|
|
esac ;;
|
|
esac
|
|
done
|
|
@@ -23717,8 +17184,8 @@ echo "$as_me: WARNING: Cache variable $a
|
|
(set) 2>&1 |
|
|
case $as_nl`(ac_space=' '; set) 2>&1` in #(
|
|
*${as_nl}ac_space=\ *)
|
|
- # `set' does not quote correctly, so add quotes (double-quote
|
|
- # substitution turns \\\\ into \\, and sed turns \\ into \).
|
|
+ # `set' does not quote correctly, so add quotes: double-quote
|
|
+ # substitution turns \\\\ into \\, and sed turns \\ into \.
|
|
sed -n \
|
|
"s/'/'\\\\''/g;
|
|
s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
|
|
@@ -23741,12 +17208,12 @@ echo "$as_me: WARNING: Cache variable $a
|
|
if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
|
|
if test -w "$cache_file"; then
|
|
test "x$cache_file" != "x/dev/null" &&
|
|
- { echo "$as_me:$LINENO: updating cache $cache_file" >&5
|
|
-echo "$as_me: updating cache $cache_file" >&6;}
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
|
|
+$as_echo "$as_me: updating cache $cache_file" >&6;}
|
|
cat confcache >$cache_file
|
|
else
|
|
- { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
|
|
-echo "$as_me: not updating unwritable cache $cache_file" >&6;}
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
|
|
+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
|
|
fi
|
|
fi
|
|
rm -f confcache
|
|
@@ -23762,112 +17229,86 @@ ac_ltlibobjs=
|
|
for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
|
|
# 1. Remove the extension, and $U if already installed.
|
|
ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
|
|
- ac_i=`echo "$ac_i" | sed "$ac_script"`
|
|
+ ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
|
|
# 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR
|
|
# will be set to the directory where LIBOBJS objects are built.
|
|
- ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
|
|
- ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
|
|
+ as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
|
|
+ as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo'
|
|
done
|
|
LIBOBJS=$ac_libobjs
|
|
|
|
LTLIBOBJS=$ac_ltlibobjs
|
|
|
|
|
|
+ if test -n "$EXEEXT"; then
|
|
+ am__EXEEXT_TRUE=
|
|
+ am__EXEEXT_FALSE='#'
|
|
+else
|
|
+ am__EXEEXT_TRUE='#'
|
|
+ am__EXEEXT_FALSE=
|
|
+fi
|
|
+
|
|
if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
|
|
- { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
|
|
-Usually this means the macro was only invoked conditionally." >&5
|
|
-echo "$as_me: error: conditional \"AMDEP\" was never defined.
|
|
-Usually this means the macro was only invoked conditionally." >&2;}
|
|
- { (exit 1); exit 1; }; }
|
|
+ as_fn_error "conditional \"AMDEP\" was never defined.
|
|
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
|
|
fi
|
|
if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
|
|
- { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
|
|
-Usually this means the macro was only invoked conditionally." >&5
|
|
-echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
|
|
-Usually this means the macro was only invoked conditionally." >&2;}
|
|
- { (exit 1); exit 1; }; }
|
|
+ as_fn_error "conditional \"am__fastdepCC\" was never defined.
|
|
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
|
|
fi
|
|
if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
|
|
- { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
|
|
-Usually this means the macro was only invoked conditionally." >&5
|
|
-echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
|
|
-Usually this means the macro was only invoked conditionally." >&2;}
|
|
- { (exit 1); exit 1; }; }
|
|
+ as_fn_error "conditional \"am__fastdepCC\" was never defined.
|
|
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
|
|
fi
|
|
if test -z "${CROSS_COMPILING_TRUE}" && test -z "${CROSS_COMPILING_FALSE}"; then
|
|
- { { echo "$as_me:$LINENO: error: conditional \"CROSS_COMPILING\" was never defined.
|
|
-Usually this means the macro was only invoked conditionally." >&5
|
|
-echo "$as_me: error: conditional \"CROSS_COMPILING\" was never defined.
|
|
-Usually this means the macro was only invoked conditionally." >&2;}
|
|
- { (exit 1); exit 1; }; }
|
|
+ as_fn_error "conditional \"CROSS_COMPILING\" was never defined.
|
|
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
|
|
fi
|
|
if test -z "${EXAMPLES_TRUE}" && test -z "${EXAMPLES_FALSE}"; then
|
|
- { { echo "$as_me:$LINENO: error: conditional \"EXAMPLES\" was never defined.
|
|
-Usually this means the macro was only invoked conditionally." >&5
|
|
-echo "$as_me: error: conditional \"EXAMPLES\" was never defined.
|
|
-Usually this means the macro was only invoked conditionally." >&2;}
|
|
- { (exit 1); exit 1; }; }
|
|
+ as_fn_error "conditional \"EXAMPLES\" was never defined.
|
|
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
|
|
fi
|
|
if test -z "${HACKER_MODE_TRUE}" && test -z "${HACKER_MODE_FALSE}"; then
|
|
- { { echo "$as_me:$LINENO: error: conditional \"HACKER_MODE\" was never defined.
|
|
-Usually this means the macro was only invoked conditionally." >&5
|
|
-echo "$as_me: error: conditional \"HACKER_MODE\" was never defined.
|
|
-Usually this means the macro was only invoked conditionally." >&2;}
|
|
- { (exit 1); exit 1; }; }
|
|
+ as_fn_error "conditional \"HACKER_MODE\" was never defined.
|
|
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
|
|
fi
|
|
if test -z "${LIBGTOP_SMP_TRUE}" && test -z "${LIBGTOP_SMP_FALSE}"; then
|
|
- { { echo "$as_me:$LINENO: error: conditional \"LIBGTOP_SMP\" was never defined.
|
|
-Usually this means the macro was only invoked conditionally." >&5
|
|
-echo "$as_me: error: conditional \"LIBGTOP_SMP\" was never defined.
|
|
-Usually this means the macro was only invoked conditionally." >&2;}
|
|
- { (exit 1); exit 1; }; }
|
|
+ as_fn_error "conditional \"LIBGTOP_SMP\" was never defined.
|
|
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
|
|
fi
|
|
if test -z "${NEED_LIBGTOP_TRUE}" && test -z "${NEED_LIBGTOP_FALSE}"; then
|
|
- { { echo "$as_me:$LINENO: error: conditional \"NEED_LIBGTOP\" was never defined.
|
|
-Usually this means the macro was only invoked conditionally." >&5
|
|
-echo "$as_me: error: conditional \"NEED_LIBGTOP\" was never defined.
|
|
-Usually this means the macro was only invoked conditionally." >&2;}
|
|
- { (exit 1); exit 1; }; }
|
|
+ as_fn_error "conditional \"NEED_LIBGTOP\" was never defined.
|
|
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
|
|
fi
|
|
if test -z "${LIBGTOP_SYSDEPS_PRIVATE_MOUNTLIST_TRUE}" && test -z "${LIBGTOP_SYSDEPS_PRIVATE_MOUNTLIST_FALSE}"; then
|
|
- { { echo "$as_me:$LINENO: error: conditional \"LIBGTOP_SYSDEPS_PRIVATE_MOUNTLIST\" was never defined.
|
|
-Usually this means the macro was only invoked conditionally." >&5
|
|
-echo "$as_me: error: conditional \"LIBGTOP_SYSDEPS_PRIVATE_MOUNTLIST\" was never defined.
|
|
-Usually this means the macro was only invoked conditionally." >&2;}
|
|
- { (exit 1); exit 1; }; }
|
|
+ as_fn_error "conditional \"LIBGTOP_SYSDEPS_PRIVATE_MOUNTLIST\" was never defined.
|
|
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
|
|
fi
|
|
if test -z "${LIBGTOP_SYSDEPS_PRIVATE_FSUSAGE_TRUE}" && test -z "${LIBGTOP_SYSDEPS_PRIVATE_FSUSAGE_FALSE}"; then
|
|
- { { echo "$as_me:$LINENO: error: conditional \"LIBGTOP_SYSDEPS_PRIVATE_FSUSAGE\" was never defined.
|
|
-Usually this means the macro was only invoked conditionally." >&5
|
|
-echo "$as_me: error: conditional \"LIBGTOP_SYSDEPS_PRIVATE_FSUSAGE\" was never defined.
|
|
-Usually this means the macro was only invoked conditionally." >&2;}
|
|
- { (exit 1); exit 1; }; }
|
|
+ as_fn_error "conditional \"LIBGTOP_SYSDEPS_PRIVATE_FSUSAGE\" was never defined.
|
|
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
|
|
fi
|
|
|
|
ac_config_commands="$ac_config_commands po/stamp-it"
|
|
|
|
|
|
if test -z "${ENABLE_GTK_DOC_TRUE}" && test -z "${ENABLE_GTK_DOC_FALSE}"; then
|
|
- { { echo "$as_me:$LINENO: error: conditional \"ENABLE_GTK_DOC\" was never defined.
|
|
-Usually this means the macro was only invoked conditionally." >&5
|
|
-echo "$as_me: error: conditional \"ENABLE_GTK_DOC\" was never defined.
|
|
-Usually this means the macro was only invoked conditionally." >&2;}
|
|
- { (exit 1); exit 1; }; }
|
|
+ as_fn_error "conditional \"ENABLE_GTK_DOC\" was never defined.
|
|
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
|
|
fi
|
|
if test -z "${GTK_DOC_USE_LIBTOOL_TRUE}" && test -z "${GTK_DOC_USE_LIBTOOL_FALSE}"; then
|
|
- { { echo "$as_me:$LINENO: error: conditional \"GTK_DOC_USE_LIBTOOL\" was never defined.
|
|
-Usually this means the macro was only invoked conditionally." >&5
|
|
-echo "$as_me: error: conditional \"GTK_DOC_USE_LIBTOOL\" was never defined.
|
|
-Usually this means the macro was only invoked conditionally." >&2;}
|
|
- { (exit 1); exit 1; }; }
|
|
+ as_fn_error "conditional \"GTK_DOC_USE_LIBTOOL\" was never defined.
|
|
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
|
|
fi
|
|
|
|
: ${CONFIG_STATUS=./config.status}
|
|
+ac_write_fail=0
|
|
ac_clean_files_save=$ac_clean_files
|
|
ac_clean_files="$ac_clean_files $CONFIG_STATUS"
|
|
-{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
|
|
-echo "$as_me: creating $CONFIG_STATUS" >&6;}
|
|
-cat >$CONFIG_STATUS <<_ACEOF
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
|
|
+$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
|
|
+as_write_fail=0
|
|
+cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
|
|
#! $SHELL
|
|
# Generated by $as_me.
|
|
# Run this file to recreate the current configuration.
|
|
@@ -23877,59 +17318,79 @@ cat >$CONFIG_STATUS <<_ACEOF
|
|
debug=false
|
|
ac_cs_recheck=false
|
|
ac_cs_silent=false
|
|
-SHELL=\${CONFIG_SHELL-$SHELL}
|
|
-_ACEOF
|
|
|
|
-cat >>$CONFIG_STATUS <<\_ACEOF
|
|
-## --------------------- ##
|
|
-## M4sh Initialization. ##
|
|
-## --------------------- ##
|
|
+SHELL=\${CONFIG_SHELL-$SHELL}
|
|
+export SHELL
|
|
+_ASEOF
|
|
+cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
|
|
+## -------------------- ##
|
|
+## M4sh Initialization. ##
|
|
+## -------------------- ##
|
|
|
|
# Be more Bourne compatible
|
|
DUALCASE=1; export DUALCASE # for MKS sh
|
|
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
|
|
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
|
|
emulate sh
|
|
NULLCMD=:
|
|
- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
|
|
+ # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
|
|
# is contrary to our usage. Disable this feature.
|
|
alias -g '${1+"$@"}'='"$@"'
|
|
setopt NO_GLOB_SUBST
|
|
else
|
|
- case `(set -o) 2>/dev/null` in
|
|
- *posix*) set -o posix ;;
|
|
+ case `(set -o) 2>/dev/null` in #(
|
|
+ *posix*) :
|
|
+ set -o posix ;; #(
|
|
+ *) :
|
|
+ ;;
|
|
esac
|
|
-
|
|
fi
|
|
|
|
|
|
-
|
|
-
|
|
-# PATH needs CR
|
|
-# Avoid depending upon Character Ranges.
|
|
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
|
|
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
|
|
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
|
|
-as_cr_digits='0123456789'
|
|
-as_cr_alnum=$as_cr_Letters$as_cr_digits
|
|
-
|
|
-# The user is always right.
|
|
-if test "${PATH_SEPARATOR+set}" != set; then
|
|
- echo "#! /bin/sh" >conf$$.sh
|
|
- echo "exit 0" >>conf$$.sh
|
|
- chmod +x conf$$.sh
|
|
- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
|
|
- PATH_SEPARATOR=';'
|
|
+as_nl='
|
|
+'
|
|
+export as_nl
|
|
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
|
|
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
|
|
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
|
|
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
|
|
+# Prefer a ksh shell builtin over an external printf program on Solaris,
|
|
+# but without wasting forks for bash or zsh.
|
|
+if test -z "$BASH_VERSION$ZSH_VERSION" \
|
|
+ && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
|
|
+ as_echo='print -r --'
|
|
+ as_echo_n='print -rn --'
|
|
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
|
|
+ as_echo='printf %s\n'
|
|
+ as_echo_n='printf %s'
|
|
+else
|
|
+ if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
|
|
+ as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
|
|
+ as_echo_n='/usr/ucb/echo -n'
|
|
else
|
|
- PATH_SEPARATOR=:
|
|
+ as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
|
|
+ as_echo_n_body='eval
|
|
+ arg=$1;
|
|
+ case $arg in #(
|
|
+ *"$as_nl"*)
|
|
+ expr "X$arg" : "X\\(.*\\)$as_nl";
|
|
+ arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
|
|
+ esac;
|
|
+ expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
|
|
+ '
|
|
+ export as_echo_n_body
|
|
+ as_echo_n='sh -c $as_echo_n_body as_echo'
|
|
fi
|
|
- rm -f conf$$.sh
|
|
+ export as_echo_body
|
|
+ as_echo='sh -c $as_echo_body as_echo'
|
|
fi
|
|
|
|
-# Support unset when possible.
|
|
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
|
|
- as_unset=unset
|
|
-else
|
|
- as_unset=false
|
|
+# The user is always right.
|
|
+if test "${PATH_SEPARATOR+set}" != set; then
|
|
+ PATH_SEPARATOR=:
|
|
+ (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
|
|
+ (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
|
|
+ PATH_SEPARATOR=';'
|
|
+ }
|
|
fi
|
|
|
|
|
|
@@ -23938,20 +17399,18 @@ fi
|
|
# there to prevent editors from complaining about space-tab.
|
|
# (If _AS_PATH_WALK were called with IFS unset, it would disable word
|
|
# splitting by setting IFS to empty value.)
|
|
-as_nl='
|
|
-'
|
|
IFS=" "" $as_nl"
|
|
|
|
# Find who we are. Look in the path if we contain no directory separator.
|
|
-case $0 in
|
|
+case $0 in #((
|
|
*[\\/]* ) as_myself=$0 ;;
|
|
*) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
|
for as_dir in $PATH
|
|
do
|
|
IFS=$as_save_IFS
|
|
test -z "$as_dir" && as_dir=.
|
|
- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
|
|
-done
|
|
+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
|
|
+ done
|
|
IFS=$as_save_IFS
|
|
|
|
;;
|
|
@@ -23962,113 +17421,123 @@ if test "x$as_myself" = x; then
|
|
as_myself=$0
|
|
fi
|
|
if test ! -f "$as_myself"; then
|
|
- echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
|
|
- { (exit 1); exit 1; }
|
|
+ $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
|
|
+ exit 1
|
|
fi
|
|
|
|
-# Work around bugs in pre-3.0 UWIN ksh.
|
|
-for as_var in ENV MAIL MAILPATH
|
|
-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
|
|
+# Unset variables that we do not need and which cause bugs (e.g. in
|
|
+# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1"
|
|
+# suppresses any "Segmentation fault" message there. '((' could
|
|
+# trigger a bug in pdksh 5.2.14.
|
|
+for as_var in BASH_ENV ENV MAIL MAILPATH
|
|
+do eval test x\${$as_var+set} = xset \
|
|
+ && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
|
|
done
|
|
PS1='$ '
|
|
PS2='> '
|
|
PS4='+ '
|
|
|
|
# NLS nuisances.
|
|
-for as_var in \
|
|
- LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
|
|
- LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
|
|
- LC_TELEPHONE LC_TIME
|
|
-do
|
|
- if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
|
|
- eval $as_var=C; export $as_var
|
|
- else
|
|
- ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
|
|
- fi
|
|
-done
|
|
-
|
|
-# Required to use basename.
|
|
-if expr a : '\(a\)' >/dev/null 2>&1 &&
|
|
- test "X`expr 00001 : '.*\(...\)'`" = X001; then
|
|
- as_expr=expr
|
|
-else
|
|
- as_expr=false
|
|
-fi
|
|
-
|
|
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
|
|
- as_basename=basename
|
|
-else
|
|
- as_basename=false
|
|
-fi
|
|
-
|
|
-
|
|
-# Name of the executable.
|
|
-as_me=`$as_basename -- "$0" ||
|
|
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
|
|
- X"$0" : 'X\(//\)$' \| \
|
|
- X"$0" : 'X\(/\)' \| . 2>/dev/null ||
|
|
-echo X/"$0" |
|
|
- sed '/^.*\/\([^/][^/]*\)\/*$/{
|
|
- s//\1/
|
|
- q
|
|
- }
|
|
- /^X\/\(\/\/\)$/{
|
|
- s//\1/
|
|
- q
|
|
- }
|
|
- /^X\/\(\/\).*/{
|
|
- s//\1/
|
|
- q
|
|
- }
|
|
- s/.*/./; q'`
|
|
+LC_ALL=C
|
|
+export LC_ALL
|
|
+LANGUAGE=C
|
|
+export LANGUAGE
|
|
|
|
# CDPATH.
|
|
-$as_unset CDPATH
|
|
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
|
|
|
|
|
|
+# as_fn_error ERROR [LINENO LOG_FD]
|
|
+# ---------------------------------
|
|
+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
|
|
+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
|
|
+# script with status $?, using 1 if that was 0.
|
|
+as_fn_error ()
|
|
+{
|
|
+ as_status=$?; test $as_status -eq 0 && as_status=1
|
|
+ if test "$3"; then
|
|
+ as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
|
|
+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
|
|
+ fi
|
|
+ $as_echo "$as_me: error: $1" >&2
|
|
+ as_fn_exit $as_status
|
|
+} # as_fn_error
|
|
+
|
|
+
|
|
+# as_fn_set_status STATUS
|
|
+# -----------------------
|
|
+# Set $? to STATUS, without forking.
|
|
+as_fn_set_status ()
|
|
+{
|
|
+ return $1
|
|
+} # as_fn_set_status
|
|
+
|
|
+# as_fn_exit STATUS
|
|
+# -----------------
|
|
+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
|
|
+as_fn_exit ()
|
|
+{
|
|
+ set +e
|
|
+ as_fn_set_status $1
|
|
+ exit $1
|
|
+} # as_fn_exit
|
|
+
|
|
+# as_fn_unset VAR
|
|
+# ---------------
|
|
+# Portably unset VAR.
|
|
+as_fn_unset ()
|
|
+{
|
|
+ { eval $1=; unset $1;}
|
|
+}
|
|
+as_unset=as_fn_unset
|
|
+# as_fn_append VAR VALUE
|
|
+# ----------------------
|
|
+# Append the text in VALUE to the end of the definition contained in VAR. Take
|
|
+# advantage of any shell optimizations that allow amortized linear growth over
|
|
+# repeated appends, instead of the typical quadratic growth present in naive
|
|
+# implementations.
|
|
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
|
|
+ eval 'as_fn_append ()
|
|
+ {
|
|
+ eval $1+=\$2
|
|
+ }'
|
|
+else
|
|
+ as_fn_append ()
|
|
+ {
|
|
+ eval $1=\$$1\$2
|
|
+ }
|
|
+fi # as_fn_append
|
|
+
|
|
+# as_fn_arith ARG...
|
|
+# ------------------
|
|
+# Perform arithmetic evaluation on the ARGs, and store the result in the
|
|
+# global $as_val. Take advantage of shells that can avoid forks. The arguments
|
|
+# must be portable across $(()) and expr.
|
|
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
|
|
+ eval 'as_fn_arith ()
|
|
+ {
|
|
+ as_val=$(( $* ))
|
|
+ }'
|
|
+else
|
|
+ as_fn_arith ()
|
|
+ {
|
|
+ as_val=`expr "$@" || test $? -eq 1`
|
|
+ }
|
|
+fi # as_fn_arith
|
|
|
|
- as_lineno_1=$LINENO
|
|
- as_lineno_2=$LINENO
|
|
- test "x$as_lineno_1" != "x$as_lineno_2" &&
|
|
- test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
|
|
-
|
|
- # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
|
|
- # uniformly replaced by the line number. The first 'sed' inserts a
|
|
- # line-number line after each line using $LINENO; the second 'sed'
|
|
- # does the real work. The second script uses 'N' to pair each
|
|
- # line-number line with the line containing $LINENO, and appends
|
|
- # trailing '-' during substitution so that $LINENO is not a special
|
|
- # case at line end.
|
|
- # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
|
|
- # scripts with optimization help from Paolo Bonzini. Blame Lee
|
|
- # E. McMahon (1931-1989) for sed's syntax. :-)
|
|
- sed -n '
|
|
- p
|
|
- /[$]LINENO/=
|
|
- ' <$as_myself |
|
|
- sed '
|
|
- s/[$]LINENO.*/&-/
|
|
- t lineno
|
|
- b
|
|
- :lineno
|
|
- N
|
|
- :loop
|
|
- s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
|
|
- t loop
|
|
- s/-\n.*//
|
|
- ' >$as_me.lineno &&
|
|
- chmod +x "$as_me.lineno" ||
|
|
- { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
|
|
- { (exit 1); exit 1; }; }
|
|
|
|
- # Don't try to exec as it changes $[0], causing all sort of problems
|
|
- # (the dirname of $[0] is not the place where we might find the
|
|
- # original and so on. Autoconf is especially sensitive to this).
|
|
- . "./$as_me.lineno"
|
|
- # Exit status is that of the last command.
|
|
- exit
|
|
-}
|
|
+if expr a : '\(a\)' >/dev/null 2>&1 &&
|
|
+ test "X`expr 00001 : '.*\(...\)'`" = X001; then
|
|
+ as_expr=expr
|
|
+else
|
|
+ as_expr=false
|
|
+fi
|
|
|
|
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
|
|
+ as_basename=basename
|
|
+else
|
|
+ as_basename=false
|
|
+fi
|
|
|
|
if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
|
|
as_dirname=dirname
|
|
@@ -24076,50 +17545,122 @@ else
|
|
as_dirname=false
|
|
fi
|
|
|
|
+as_me=`$as_basename -- "$0" ||
|
|
+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
|
|
+ X"$0" : 'X\(//\)$' \| \
|
|
+ X"$0" : 'X\(/\)' \| . 2>/dev/null ||
|
|
+$as_echo X/"$0" |
|
|
+ sed '/^.*\/\([^/][^/]*\)\/*$/{
|
|
+ s//\1/
|
|
+ q
|
|
+ }
|
|
+ /^X\/\(\/\/\)$/{
|
|
+ s//\1/
|
|
+ q
|
|
+ }
|
|
+ /^X\/\(\/\).*/{
|
|
+ s//\1/
|
|
+ q
|
|
+ }
|
|
+ s/.*/./; q'`
|
|
+
|
|
+# Avoid depending upon Character Ranges.
|
|
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
|
|
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
|
|
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
|
|
+as_cr_digits='0123456789'
|
|
+as_cr_alnum=$as_cr_Letters$as_cr_digits
|
|
+
|
|
ECHO_C= ECHO_N= ECHO_T=
|
|
-case `echo -n x` in
|
|
+case `echo -n x` in #(((((
|
|
-n*)
|
|
- case `echo 'x\c'` in
|
|
+ case `echo 'xy\c'` in
|
|
*c*) ECHO_T=' ';; # ECHO_T is single tab character.
|
|
- *) ECHO_C='\c';;
|
|
+ xy) ECHO_C='\c';;
|
|
+ *) echo `echo ksh88 bug on AIX 6.1` > /dev/null
|
|
+ ECHO_T=' ';;
|
|
esac;;
|
|
*)
|
|
ECHO_N='-n';;
|
|
esac
|
|
|
|
-if expr a : '\(a\)' >/dev/null 2>&1 &&
|
|
- test "X`expr 00001 : '.*\(...\)'`" = X001; then
|
|
- as_expr=expr
|
|
-else
|
|
- as_expr=false
|
|
-fi
|
|
-
|
|
rm -f conf$$ conf$$.exe conf$$.file
|
|
if test -d conf$$.dir; then
|
|
rm -f conf$$.dir/conf$$.file
|
|
else
|
|
rm -f conf$$.dir
|
|
- mkdir conf$$.dir
|
|
+ mkdir conf$$.dir 2>/dev/null
|
|
fi
|
|
-echo >conf$$.file
|
|
-if ln -s conf$$.file conf$$ 2>/dev/null; then
|
|
- as_ln_s='ln -s'
|
|
- # ... but there are two gotchas:
|
|
- # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
|
|
- # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
|
|
- # In both cases, we have to default to `cp -p'.
|
|
- ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
|
|
+if (echo >conf$$.file) 2>/dev/null; then
|
|
+ if ln -s conf$$.file conf$$ 2>/dev/null; then
|
|
+ as_ln_s='ln -s'
|
|
+ # ... but there are two gotchas:
|
|
+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
|
|
+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
|
|
+ # In both cases, we have to default to `cp -p'.
|
|
+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
|
|
+ as_ln_s='cp -p'
|
|
+ elif ln conf$$.file conf$$ 2>/dev/null; then
|
|
+ as_ln_s=ln
|
|
+ else
|
|
as_ln_s='cp -p'
|
|
-elif ln conf$$.file conf$$ 2>/dev/null; then
|
|
- as_ln_s=ln
|
|
+ fi
|
|
else
|
|
as_ln_s='cp -p'
|
|
fi
|
|
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
|
|
rmdir conf$$.dir 2>/dev/null
|
|
|
|
+
|
|
+# as_fn_mkdir_p
|
|
+# -------------
|
|
+# Create "$as_dir" as a directory, including parents if necessary.
|
|
+as_fn_mkdir_p ()
|
|
+{
|
|
+
|
|
+ case $as_dir in #(
|
|
+ -*) as_dir=./$as_dir;;
|
|
+ esac
|
|
+ test -d "$as_dir" || eval $as_mkdir_p || {
|
|
+ as_dirs=
|
|
+ while :; do
|
|
+ case $as_dir in #(
|
|
+ *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
|
|
+ *) as_qdir=$as_dir;;
|
|
+ esac
|
|
+ as_dirs="'$as_qdir' $as_dirs"
|
|
+ as_dir=`$as_dirname -- "$as_dir" ||
|
|
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
|
|
+ X"$as_dir" : 'X\(//\)[^/]' \| \
|
|
+ X"$as_dir" : 'X\(//\)$' \| \
|
|
+ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
|
|
+$as_echo X"$as_dir" |
|
|
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
|
|
+ s//\1/
|
|
+ q
|
|
+ }
|
|
+ /^X\(\/\/\)[^/].*/{
|
|
+ s//\1/
|
|
+ q
|
|
+ }
|
|
+ /^X\(\/\/\)$/{
|
|
+ s//\1/
|
|
+ q
|
|
+ }
|
|
+ /^X\(\/\).*/{
|
|
+ s//\1/
|
|
+ q
|
|
+ }
|
|
+ s/.*/./; q'`
|
|
+ test -d "$as_dir" && break
|
|
+ done
|
|
+ test -z "$as_dirs" || eval "mkdir $as_dirs"
|
|
+ } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
|
|
+
|
|
+
|
|
+} # as_fn_mkdir_p
|
|
if mkdir -p . 2>/dev/null; then
|
|
- as_mkdir_p=:
|
|
+ as_mkdir_p='mkdir -p "$as_dir"'
|
|
else
|
|
test -d ./-p && rmdir ./-p
|
|
as_mkdir_p=false
|
|
@@ -24136,12 +17677,12 @@ else
|
|
as_test_x='
|
|
eval sh -c '\''
|
|
if test -d "$1"; then
|
|
- test -d "$1/.";
|
|
+ test -d "$1/.";
|
|
else
|
|
- case $1 in
|
|
- -*)set "./$1";;
|
|
+ case $1 in #(
|
|
+ -*)set "./$1";;
|
|
esac;
|
|
- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
|
|
+ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
|
|
???[sx]*):;;*)false;;esac;fi
|
|
'\'' sh
|
|
'
|
|
@@ -24156,13 +17697,19 @@ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr
|
|
|
|
|
|
exec 6>&1
|
|
+## ----------------------------------- ##
|
|
+## Main body of $CONFIG_STATUS script. ##
|
|
+## ----------------------------------- ##
|
|
+_ASEOF
|
|
+test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
|
|
|
|
-# Save the log message, to keep $[0] and so on meaningful, and to
|
|
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
|
|
+# Save the log message, to keep $0 and so on meaningful, and to
|
|
# report actual input values of CONFIG_FILES etc. instead of their
|
|
# values after options handling.
|
|
ac_log="
|
|
This file was extended by libgtop $as_me 2.28.0, which was
|
|
-generated by GNU Autoconf 2.61. Invocation command line was
|
|
+generated by GNU Autoconf 2.64. Invocation command line was
|
|
|
|
CONFIG_FILES = $CONFIG_FILES
|
|
CONFIG_HEADERS = $CONFIG_HEADERS
|
|
@@ -24175,7 +17722,16 @@ on `(hostname || uname -n) 2>/dev/null |
|
|
|
|
_ACEOF
|
|
|
|
-cat >>$CONFIG_STATUS <<_ACEOF
|
|
+case $ac_config_files in *"
|
|
+"*) set x $ac_config_files; shift; ac_config_files=$*;;
|
|
+esac
|
|
+
|
|
+case $ac_config_headers in *"
|
|
+"*) set x $ac_config_headers; shift; ac_config_headers=$*;;
|
|
+esac
|
|
+
|
|
+
|
|
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
|
|
# Files that config.status was made for.
|
|
config_files="$ac_config_files"
|
|
config_headers="$ac_config_headers"
|
|
@@ -24183,22 +17739,24 @@ config_commands="$ac_config_commands"
|
|
|
|
_ACEOF
|
|
|
|
-cat >>$CONFIG_STATUS <<\_ACEOF
|
|
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
|
|
ac_cs_usage="\
|
|
-\`$as_me' instantiates files from templates according to the
|
|
-current configuration.
|
|
+\`$as_me' instantiates files and other configuration actions
|
|
+from templates according to the current configuration. Unless the files
|
|
+and actions are specified as TAGs, all are instantiated by default.
|
|
|
|
-Usage: $0 [OPTIONS] [FILE]...
|
|
+Usage: $0 [OPTION]... [TAG]...
|
|
|
|
-h, --help print this help, then exit
|
|
-V, --version print version number and configuration settings, then exit
|
|
- -q, --quiet do not print progress messages
|
|
+ -q, --quiet, --silent
|
|
+ do not print progress messages
|
|
-d, --debug don't remove temporary files
|
|
--recheck update $as_me by reconfiguring in the same conditions
|
|
- --file=FILE[:TEMPLATE]
|
|
- instantiate the configuration file FILE
|
|
- --header=FILE[:TEMPLATE]
|
|
- instantiate the configuration header FILE
|
|
+ --file=FILE[:TEMPLATE]
|
|
+ instantiate the configuration file FILE
|
|
+ --header=FILE[:TEMPLATE]
|
|
+ instantiate the configuration header FILE
|
|
|
|
Configuration files:
|
|
$config_files
|
|
@@ -24209,16 +17767,16 @@ $config_headers
|
|
Configuration commands:
|
|
$config_commands
|
|
|
|
-Report bugs to <bug-autoconf@gnu.org>."
|
|
+Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=libgtop>."
|
|
|
|
_ACEOF
|
|
-cat >>$CONFIG_STATUS <<_ACEOF
|
|
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
|
|
ac_cs_version="\\
|
|
libgtop config.status 2.28.0
|
|
-configured by $0, generated by GNU Autoconf 2.61,
|
|
- with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
|
|
+configured by $0, generated by GNU Autoconf 2.64,
|
|
+ with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
|
|
|
|
-Copyright (C) 2006 Free Software Foundation, Inc.
|
|
+Copyright (C) 2009 Free Software Foundation, Inc.
|
|
This config.status script is free software; the Free Software Foundation
|
|
gives unlimited permission to copy, distribute and modify it."
|
|
|
|
@@ -24226,11 +17784,12 @@ ac_pwd='$ac_pwd'
|
|
srcdir='$srcdir'
|
|
INSTALL='$INSTALL'
|
|
MKDIR_P='$MKDIR_P'
|
|
+AWK='$AWK'
|
|
+test -n "\$AWK" || AWK=awk
|
|
_ACEOF
|
|
|
|
-cat >>$CONFIG_STATUS <<\_ACEOF
|
|
-# If no file are specified by the user, then we need to provide default
|
|
-# value. By we need to know if files were specified by the user.
|
|
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
|
|
+# The default lists apply if the user does not specify any file.
|
|
ac_need_defaults=:
|
|
while test $# != 0
|
|
do
|
|
@@ -24252,34 +17811,38 @@ do
|
|
-recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
|
|
ac_cs_recheck=: ;;
|
|
--version | --versio | --versi | --vers | --ver | --ve | --v | -V )
|
|
- echo "$ac_cs_version"; exit ;;
|
|
+ $as_echo "$ac_cs_version"; exit ;;
|
|
--debug | --debu | --deb | --de | --d | -d )
|
|
debug=: ;;
|
|
--file | --fil | --fi | --f )
|
|
$ac_shift
|
|
- CONFIG_FILES="$CONFIG_FILES $ac_optarg"
|
|
+ case $ac_optarg in
|
|
+ *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
|
|
+ esac
|
|
+ as_fn_append CONFIG_FILES " '$ac_optarg'"
|
|
ac_need_defaults=false;;
|
|
--header | --heade | --head | --hea )
|
|
$ac_shift
|
|
- CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
|
|
+ case $ac_optarg in
|
|
+ *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
|
|
+ esac
|
|
+ as_fn_append CONFIG_HEADERS " '$ac_optarg'"
|
|
ac_need_defaults=false;;
|
|
--he | --h)
|
|
# Conflict between --help and --header
|
|
- { echo "$as_me: error: ambiguous option: $1
|
|
-Try \`$0 --help' for more information." >&2
|
|
- { (exit 1); exit 1; }; };;
|
|
+ as_fn_error "ambiguous option: \`$1'
|
|
+Try \`$0 --help' for more information.";;
|
|
--help | --hel | -h )
|
|
- echo "$ac_cs_usage"; exit ;;
|
|
+ $as_echo "$ac_cs_usage"; exit ;;
|
|
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
|
|
| -silent | --silent | --silen | --sile | --sil | --si | --s)
|
|
ac_cs_silent=: ;;
|
|
|
|
# This is an error.
|
|
- -*) { echo "$as_me: error: unrecognized option: $1
|
|
-Try \`$0 --help' for more information." >&2
|
|
- { (exit 1); exit 1; }; } ;;
|
|
+ -*) as_fn_error "unrecognized option: \`$1'
|
|
+Try \`$0 --help' for more information." ;;
|
|
|
|
- *) ac_config_targets="$ac_config_targets $1"
|
|
+ *) as_fn_append ac_config_targets " $1"
|
|
ac_need_defaults=false ;;
|
|
|
|
esac
|
|
@@ -24294,27 +17857,29 @@ if $ac_cs_silent; then
|
|
fi
|
|
|
|
_ACEOF
|
|
-cat >>$CONFIG_STATUS <<_ACEOF
|
|
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
|
|
if \$ac_cs_recheck; then
|
|
- echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
|
|
- CONFIG_SHELL=$SHELL
|
|
+ set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
|
|
+ shift
|
|
+ \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
|
|
+ CONFIG_SHELL='$SHELL'
|
|
export CONFIG_SHELL
|
|
- exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
|
|
+ exec "\$@"
|
|
fi
|
|
|
|
_ACEOF
|
|
-cat >>$CONFIG_STATUS <<\_ACEOF
|
|
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
|
|
exec 5>>config.log
|
|
{
|
|
echo
|
|
sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
|
|
## Running $as_me. ##
|
|
_ASBOX
|
|
- echo "$ac_log"
|
|
+ $as_echo "$ac_log"
|
|
} >&5
|
|
|
|
_ACEOF
|
|
-cat >>$CONFIG_STATUS <<_ACEOF
|
|
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
|
|
#
|
|
# INIT-COMMANDS
|
|
#
|
|
@@ -24578,7 +18143,7 @@ fi
|
|
|
|
_ACEOF
|
|
|
|
-cat >>$CONFIG_STATUS <<\_ACEOF
|
|
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
|
|
|
|
# Handling of arguments.
|
|
for ac_config_target in $ac_config_targets
|
|
@@ -24618,9 +18183,7 @@ do
|
|
"libgtopconfig.h") CONFIG_FILES="$CONFIG_FILES libgtopconfig.h" ;;
|
|
"po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
|
|
|
|
- *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
|
|
-echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
|
|
- { (exit 1); exit 1; }; };;
|
|
+ *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
|
|
esac
|
|
done
|
|
|
|
@@ -24647,7 +18210,7 @@ $debug ||
|
|
trap 'exit_status=$?
|
|
{ test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
|
|
' 0
|
|
- trap '{ (exit 1); exit 1; }' 1 2 13 15
|
|
+ trap 'as_fn_exit 1' 1 2 13 15
|
|
}
|
|
# Create a (secure) tmp directory for tmp files.
|
|
|
|
@@ -24658,354 +18221,139 @@ $debug ||
|
|
{
|
|
tmp=./conf$$-$RANDOM
|
|
(umask 077 && mkdir "$tmp")
|
|
-} ||
|
|
-{
|
|
- echo "$me: cannot create a temporary directory in ." >&2
|
|
- { (exit 1); exit 1; }
|
|
-}
|
|
-
|
|
-#
|
|
-# Set up the sed scripts for CONFIG_FILES section.
|
|
-#
|
|
+} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
|
|
|
|
-# No need to generate the scripts if there are no CONFIG_FILES.
|
|
-# This happens for instance when ./config.status config.h
|
|
+# Set up the scripts for CONFIG_FILES section.
|
|
+# No need to generate them if there are no CONFIG_FILES.
|
|
+# This happens for instance with `./config.status config.h'.
|
|
if test -n "$CONFIG_FILES"; then
|
|
|
|
-_ACEOF
|
|
-
|
|
|
|
-
|
|
-ac_delim='%!_!# '
|
|
-for ac_last_try in false false false false false :; do
|
|
- cat >conf$$subs.sed <<_ACEOF
|
|
-SHELL!$SHELL$ac_delim
|
|
-PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim
|
|
-PACKAGE_NAME!$PACKAGE_NAME$ac_delim
|
|
-PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim
|
|
-PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim
|
|
-PACKAGE_STRING!$PACKAGE_STRING$ac_delim
|
|
-PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim
|
|
-exec_prefix!$exec_prefix$ac_delim
|
|
-prefix!$prefix$ac_delim
|
|
-program_transform_name!$program_transform_name$ac_delim
|
|
-bindir!$bindir$ac_delim
|
|
-sbindir!$sbindir$ac_delim
|
|
-libexecdir!$libexecdir$ac_delim
|
|
-datarootdir!$datarootdir$ac_delim
|
|
-datadir!$datadir$ac_delim
|
|
-sysconfdir!$sysconfdir$ac_delim
|
|
-sharedstatedir!$sharedstatedir$ac_delim
|
|
-localstatedir!$localstatedir$ac_delim
|
|
-includedir!$includedir$ac_delim
|
|
-oldincludedir!$oldincludedir$ac_delim
|
|
-docdir!$docdir$ac_delim
|
|
-infodir!$infodir$ac_delim
|
|
-htmldir!$htmldir$ac_delim
|
|
-dvidir!$dvidir$ac_delim
|
|
-pdfdir!$pdfdir$ac_delim
|
|
-psdir!$psdir$ac_delim
|
|
-libdir!$libdir$ac_delim
|
|
-localedir!$localedir$ac_delim
|
|
-mandir!$mandir$ac_delim
|
|
-DEFS!$DEFS$ac_delim
|
|
-ECHO_C!$ECHO_C$ac_delim
|
|
-ECHO_N!$ECHO_N$ac_delim
|
|
-ECHO_T!$ECHO_T$ac_delim
|
|
-LIBS!$LIBS$ac_delim
|
|
-build_alias!$build_alias$ac_delim
|
|
-host_alias!$host_alias$ac_delim
|
|
-target_alias!$target_alias$ac_delim
|
|
-build!$build$ac_delim
|
|
-build_cpu!$build_cpu$ac_delim
|
|
-build_vendor!$build_vendor$ac_delim
|
|
-build_os!$build_os$ac_delim
|
|
-host!$host$ac_delim
|
|
-host_cpu!$host_cpu$ac_delim
|
|
-host_vendor!$host_vendor$ac_delim
|
|
-host_os!$host_os$ac_delim
|
|
-INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
|
|
-INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
|
|
-INSTALL_DATA!$INSTALL_DATA$ac_delim
|
|
-am__isrc!$am__isrc$ac_delim
|
|
-CYGPATH_W!$CYGPATH_W$ac_delim
|
|
-PACKAGE!$PACKAGE$ac_delim
|
|
-VERSION!$VERSION$ac_delim
|
|
-ACLOCAL!$ACLOCAL$ac_delim
|
|
-AUTOCONF!$AUTOCONF$ac_delim
|
|
-AUTOMAKE!$AUTOMAKE$ac_delim
|
|
-AUTOHEADER!$AUTOHEADER$ac_delim
|
|
-MAKEINFO!$MAKEINFO$ac_delim
|
|
-install_sh!$install_sh$ac_delim
|
|
-STRIP!$STRIP$ac_delim
|
|
-INSTALL_STRIP_PROGRAM!$INSTALL_STRIP_PROGRAM$ac_delim
|
|
-mkdir_p!$mkdir_p$ac_delim
|
|
-AWK!$AWK$ac_delim
|
|
-SET_MAKE!$SET_MAKE$ac_delim
|
|
-am__leading_dot!$am__leading_dot$ac_delim
|
|
-AMTAR!$AMTAR$ac_delim
|
|
-am__tar!$am__tar$ac_delim
|
|
-am__untar!$am__untar$ac_delim
|
|
-ACLOCAL_AMFLAGS!$ACLOCAL_AMFLAGS$ac_delim
|
|
-LIBGTOP_MAJOR_VERSION!$LIBGTOP_MAJOR_VERSION$ac_delim
|
|
-LIBGTOP_MINOR_VERSION!$LIBGTOP_MINOR_VERSION$ac_delim
|
|
-LIBGTOP_MICRO_VERSION!$LIBGTOP_MICRO_VERSION$ac_delim
|
|
-LIBGTOP_SERVER_VERSION!$LIBGTOP_SERVER_VERSION$ac_delim
|
|
-LIBGTOP_VERSION!$LIBGTOP_VERSION$ac_delim
|
|
-LIBGTOP_VERSION_CODE!$LIBGTOP_VERSION_CODE$ac_delim
|
|
-LT_VERSION_INFO!$LT_VERSION_INFO$ac_delim
|
|
-CC!$CC$ac_delim
|
|
-CFLAGS!$CFLAGS$ac_delim
|
|
-LDFLAGS!$LDFLAGS$ac_delim
|
|
-CPPFLAGS!$CPPFLAGS$ac_delim
|
|
-ac_ct_CC!$ac_ct_CC$ac_delim
|
|
-EXEEXT!$EXEEXT$ac_delim
|
|
-OBJEXT!$OBJEXT$ac_delim
|
|
-DEPDIR!$DEPDIR$ac_delim
|
|
-am__include!$am__include$ac_delim
|
|
-am__quote!$am__quote$ac_delim
|
|
-AMDEP_TRUE!$AMDEP_TRUE$ac_delim
|
|
-AMDEP_FALSE!$AMDEP_FALSE$ac_delim
|
|
-AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim
|
|
-CCDEPMODE!$CCDEPMODE$ac_delim
|
|
-am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim
|
|
-am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim
|
|
-CPP!$CPP$ac_delim
|
|
-GREP!$GREP$ac_delim
|
|
-EGREP!$EGREP$ac_delim
|
|
-libgtop_top_builddir!$libgtop_top_builddir$ac_delim
|
|
-PERL!$PERL$ac_delim
|
|
-RANLIB!$RANLIB$ac_delim
|
|
-_ACEOF
|
|
-
|
|
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
|
|
- break
|
|
- elif $ac_last_try; then
|
|
- { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
|
|
-echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
|
|
- { (exit 1); exit 1; }; }
|
|
- else
|
|
- ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
|
|
- fi
|
|
-done
|
|
-
|
|
-ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
|
|
-if test -n "$ac_eof"; then
|
|
- ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
|
|
- ac_eof=`expr $ac_eof + 1`
|
|
+ac_cr=`echo X | tr X '\015'`
|
|
+# On cygwin, bash can eat \r inside `` if the user requested igncr.
|
|
+# But we know of no other shell where ac_cr would be empty at this
|
|
+# point, so we can use a bashism as a fallback.
|
|
+if test "x$ac_cr" = x; then
|
|
+ eval ac_cr=\$\'\\r\'
|
|
+fi
|
|
+ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
|
|
+if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
|
|
+ ac_cs_awk_cr='\r'
|
|
+else
|
|
+ ac_cs_awk_cr=$ac_cr
|
|
fi
|
|
|
|
-cat >>$CONFIG_STATUS <<_ACEOF
|
|
-cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof
|
|
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
|
|
-_ACEOF
|
|
-sed '
|
|
-s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
|
|
-s/^/s,@/; s/!/@,|#_!!_#|/
|
|
-:n
|
|
-t n
|
|
-s/'"$ac_delim"'$/,g/; t
|
|
-s/$/\\/; p
|
|
-N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
|
|
-' >>$CONFIG_STATUS <conf$$subs.sed
|
|
-rm -f conf$$subs.sed
|
|
-cat >>$CONFIG_STATUS <<_ACEOF
|
|
-CEOF$ac_eof
|
|
+echo 'BEGIN {' >"$tmp/subs1.awk" &&
|
|
_ACEOF
|
|
|
|
|
|
+{
|
|
+ echo "cat >conf$$subs.awk <<_ACEOF" &&
|
|
+ echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
|
|
+ echo "_ACEOF"
|
|
+} >conf$$subs.sh ||
|
|
+ as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
|
|
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
|
|
ac_delim='%!_!# '
|
|
for ac_last_try in false false false false false :; do
|
|
- cat >conf$$subs.sed <<_ACEOF
|
|
-AS!$AS$ac_delim
|
|
-AR!$AR$ac_delim
|
|
-LN_S!$LN_S$ac_delim
|
|
-LIBTOOL!$LIBTOOL$ac_delim
|
|
-SED!$SED$ac_delim
|
|
-FGREP!$FGREP$ac_delim
|
|
-LD!$LD$ac_delim
|
|
-DUMPBIN!$DUMPBIN$ac_delim
|
|
-ac_ct_DUMPBIN!$ac_ct_DUMPBIN$ac_delim
|
|
-NM!$NM$ac_delim
|
|
-OBJDUMP!$OBJDUMP$ac_delim
|
|
-lt_ECHO!$lt_ECHO$ac_delim
|
|
-DSYMUTIL!$DSYMUTIL$ac_delim
|
|
-NMEDIT!$NMEDIT$ac_delim
|
|
-LIPO!$LIPO$ac_delim
|
|
-OTOOL!$OTOOL$ac_delim
|
|
-OTOOL64!$OTOOL64$ac_delim
|
|
-CROSS_COMPILING_TRUE!$CROSS_COMPILING_TRUE$ac_delim
|
|
-CROSS_COMPILING_FALSE!$CROSS_COMPILING_FALSE$ac_delim
|
|
-libgtop_sysdeps_dir!$libgtop_sysdeps_dir$ac_delim
|
|
-libgtop_use_machine_h!$libgtop_use_machine_h$ac_delim
|
|
-libgtop_need_server!$libgtop_need_server$ac_delim
|
|
-EXAMPLES_TRUE!$EXAMPLES_TRUE$ac_delim
|
|
-EXAMPLES_FALSE!$EXAMPLES_FALSE$ac_delim
|
|
-HACKER_MODE_TRUE!$HACKER_MODE_TRUE$ac_delim
|
|
-HACKER_MODE_FALSE!$HACKER_MODE_FALSE$ac_delim
|
|
-LIBGTOP_SMP_TRUE!$LIBGTOP_SMP_TRUE$ac_delim
|
|
-LIBGTOP_SMP_FALSE!$LIBGTOP_SMP_FALSE$ac_delim
|
|
-libgtop_postinstall!$libgtop_postinstall$ac_delim
|
|
-libgtop_have_sysinfo!$libgtop_have_sysinfo$ac_delim
|
|
-KVM_LIBS!$KVM_LIBS$ac_delim
|
|
-EXTRA_SYSDEPS_LIBS!$EXTRA_SYSDEPS_LIBS$ac_delim
|
|
-NEED_LIBGTOP_TRUE!$NEED_LIBGTOP_TRUE$ac_delim
|
|
-NEED_LIBGTOP_FALSE!$NEED_LIBGTOP_FALSE$ac_delim
|
|
-LIBGTOP_SYSDEPS_PRIVATE_MOUNTLIST_TRUE!$LIBGTOP_SYSDEPS_PRIVATE_MOUNTLIST_TRUE$ac_delim
|
|
-LIBGTOP_SYSDEPS_PRIVATE_MOUNTLIST_FALSE!$LIBGTOP_SYSDEPS_PRIVATE_MOUNTLIST_FALSE$ac_delim
|
|
-LIBGTOP_SYSDEPS_PRIVATE_FSUSAGE_TRUE!$LIBGTOP_SYSDEPS_PRIVATE_FSUSAGE_TRUE$ac_delim
|
|
-LIBGTOP_SYSDEPS_PRIVATE_FSUSAGE_FALSE!$LIBGTOP_SYSDEPS_PRIVATE_FSUSAGE_FALSE$ac_delim
|
|
-PKG_CONFIG!$PKG_CONFIG$ac_delim
|
|
-GLIB_CFLAGS!$GLIB_CFLAGS$ac_delim
|
|
-GLIB_LIBS!$GLIB_LIBS$ac_delim
|
|
-LIBOBJS!$LIBOBJS$ac_delim
|
|
-DL_LIB!$DL_LIB$ac_delim
|
|
-ALLOCA!$ALLOCA$ac_delim
|
|
-INTLTOOL_UPDATE!$INTLTOOL_UPDATE$ac_delim
|
|
-INTLTOOL_MERGE!$INTLTOOL_MERGE$ac_delim
|
|
-INTLTOOL_EXTRACT!$INTLTOOL_EXTRACT$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
|
|
-INTLTOOL_PROP_RULE!$INTLTOOL_PROP_RULE$ac_delim
|
|
-INTLTOOL_OAF_RULE!$INTLTOOL_OAF_RULE$ac_delim
|
|
-INTLTOOL_PONG_RULE!$INTLTOOL_PONG_RULE$ac_delim
|
|
-INTLTOOL_SERVER_RULE!$INTLTOOL_SERVER_RULE$ac_delim
|
|
-INTLTOOL_SHEET_RULE!$INTLTOOL_SHEET_RULE$ac_delim
|
|
-INTLTOOL_SOUNDLIST_RULE!$INTLTOOL_SOUNDLIST_RULE$ac_delim
|
|
-INTLTOOL_UI_RULE!$INTLTOOL_UI_RULE$ac_delim
|
|
-INTLTOOL_XAM_RULE!$INTLTOOL_XAM_RULE$ac_delim
|
|
-INTLTOOL_KBD_RULE!$INTLTOOL_KBD_RULE$ac_delim
|
|
-INTLTOOL_XML_RULE!$INTLTOOL_XML_RULE$ac_delim
|
|
-INTLTOOL_XML_NOMERGE_RULE!$INTLTOOL_XML_NOMERGE_RULE$ac_delim
|
|
-INTLTOOL_CAVES_RULE!$INTLTOOL_CAVES_RULE$ac_delim
|
|
-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
|
|
-XGETTEXT!$XGETTEXT$ac_delim
|
|
-MSGMERGE!$MSGMERGE$ac_delim
|
|
-MSGFMT!$MSGFMT$ac_delim
|
|
-INTLTOOL_PERL!$INTLTOOL_PERL$ac_delim
|
|
-ALL_LINGUAS!$ALL_LINGUAS$ac_delim
|
|
-DATADIRNAME!$DATADIRNAME$ac_delim
|
|
-GETTEXT_PACKAGE!$GETTEXT_PACKAGE$ac_delim
|
|
-USE_NLS!$USE_NLS$ac_delim
|
|
-MSGFMT_OPTS!$MSGFMT_OPTS$ac_delim
|
|
-GMSGFMT!$GMSGFMT$ac_delim
|
|
-CATALOGS!$CATALOGS$ac_delim
|
|
-CATOBJEXT!$CATOBJEXT$ac_delim
|
|
-GMOFILES!$GMOFILES$ac_delim
|
|
-INSTOBJEXT!$INSTOBJEXT$ac_delim
|
|
-INTLLIBS!$INTLLIBS$ac_delim
|
|
-PO_IN_DATADIR_TRUE!$PO_IN_DATADIR_TRUE$ac_delim
|
|
-PO_IN_DATADIR_FALSE!$PO_IN_DATADIR_FALSE$ac_delim
|
|
-POFILES!$POFILES$ac_delim
|
|
-POSUB!$POSUB$ac_delim
|
|
-MKINSTALLDIRS!$MKINSTALLDIRS$ac_delim
|
|
-XMKMF!$XMKMF$ac_delim
|
|
-X_CFLAGS!$X_CFLAGS$ac_delim
|
|
-X_PRE_LIBS!$X_PRE_LIBS$ac_delim
|
|
-X_LIBS!$X_LIBS$ac_delim
|
|
-X_EXTRA_LIBS!$X_EXTRA_LIBS$ac_delim
|
|
-libs_xauth!$libs_xauth$ac_delim
|
|
-sysdeps_dir!$sysdeps_dir$ac_delim
|
|
-machine_incs!$machine_incs$ac_delim
|
|
-INCLUDES!$INCLUDES$ac_delim
|
|
-LIBGTOP_EXTRA_LIBS!$LIBGTOP_EXTRA_LIBS$ac_delim
|
|
-LIBGTOP_LIBS!$LIBGTOP_LIBS$ac_delim
|
|
-_ACEOF
|
|
+ . ./conf$$subs.sh ||
|
|
+ as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
|
|
|
|
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
|
|
+ ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
|
|
+ if test $ac_delim_n = $ac_delim_num; then
|
|
break
|
|
elif $ac_last_try; then
|
|
- { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
|
|
-echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
|
|
- { (exit 1); exit 1; }; }
|
|
+ as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
|
|
else
|
|
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
|
|
fi
|
|
done
|
|
+rm -f conf$$subs.sh
|
|
|
|
-ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
|
|
-if test -n "$ac_eof"; then
|
|
- ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
|
|
- ac_eof=`expr $ac_eof + 1`
|
|
-fi
|
|
-
|
|
-cat >>$CONFIG_STATUS <<_ACEOF
|
|
-cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof
|
|
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
|
|
-_ACEOF
|
|
-sed '
|
|
-s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
|
|
-s/^/s,@/; s/!/@,|#_!!_#|/
|
|
-:n
|
|
-t n
|
|
-s/'"$ac_delim"'$/,g/; t
|
|
-s/$/\\/; p
|
|
-N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
|
|
-' >>$CONFIG_STATUS <conf$$subs.sed
|
|
-rm -f conf$$subs.sed
|
|
-cat >>$CONFIG_STATUS <<_ACEOF
|
|
-CEOF$ac_eof
|
|
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
|
|
+cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
|
|
_ACEOF
|
|
+sed -n '
|
|
+h
|
|
+s/^/S["/; s/!.*/"]=/
|
|
+p
|
|
+g
|
|
+s/^[^!]*!//
|
|
+:repl
|
|
+t repl
|
|
+s/'"$ac_delim"'$//
|
|
+t delim
|
|
+:nl
|
|
+h
|
|
+s/\(.\{148\}\).*/\1/
|
|
+t more1
|
|
+s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
|
|
+p
|
|
+n
|
|
+b repl
|
|
+:more1
|
|
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
|
|
+p
|
|
+g
|
|
+s/.\{148\}//
|
|
+t nl
|
|
+:delim
|
|
+h
|
|
+s/\(.\{148\}\).*/\1/
|
|
+t more2
|
|
+s/["\\]/\\&/g; s/^/"/; s/$/"/
|
|
+p
|
|
+b
|
|
+:more2
|
|
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
|
|
+p
|
|
+g
|
|
+s/.\{148\}//
|
|
+t delim
|
|
+' <conf$$subs.awk | sed '
|
|
+/^[^""]/{
|
|
+ N
|
|
+ s/\n//
|
|
+}
|
|
+' >>$CONFIG_STATUS || ac_write_fail=1
|
|
+rm -f conf$$subs.awk
|
|
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
|
|
+_ACAWK
|
|
+cat >>"\$tmp/subs1.awk" <<_ACAWK &&
|
|
+ for (key in S) S_is_set[key] = 1
|
|
+ FS = ""
|
|
|
|
+}
|
|
+{
|
|
+ line = $ 0
|
|
+ nfields = split(line, field, "@")
|
|
+ substed = 0
|
|
+ len = length(field[1])
|
|
+ for (i = 2; i < nfields; i++) {
|
|
+ key = field[i]
|
|
+ keylen = length(key)
|
|
+ if (S_is_set[key]) {
|
|
+ value = S[key]
|
|
+ line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
|
|
+ len += length(value) + length(field[++i])
|
|
+ substed = 1
|
|
+ } else
|
|
+ len += 1 + keylen
|
|
+ }
|
|
|
|
-ac_delim='%!_!# '
|
|
-for ac_last_try in false false false false false :; do
|
|
- cat >conf$$subs.sed <<_ACEOF
|
|
-LIBGTOP_INCS!$LIBGTOP_INCS$ac_delim
|
|
-LIBGTOP_BINDIR!$LIBGTOP_BINDIR$ac_delim
|
|
-LIBGTOP_SERVER!$LIBGTOP_SERVER$ac_delim
|
|
-sysdeps_suid_lib!$sysdeps_suid_lib$ac_delim
|
|
-server_programs!$server_programs$ac_delim
|
|
-HTML_DIR!$HTML_DIR$ac_delim
|
|
-GTKDOC_CHECK!$GTKDOC_CHECK$ac_delim
|
|
-ENABLE_GTK_DOC_TRUE!$ENABLE_GTK_DOC_TRUE$ac_delim
|
|
-ENABLE_GTK_DOC_FALSE!$ENABLE_GTK_DOC_FALSE$ac_delim
|
|
-GTK_DOC_USE_LIBTOOL_TRUE!$GTK_DOC_USE_LIBTOOL_TRUE$ac_delim
|
|
-GTK_DOC_USE_LIBTOOL_FALSE!$GTK_DOC_USE_LIBTOOL_FALSE$ac_delim
|
|
-LTLIBOBJS!$LTLIBOBJS$ac_delim
|
|
-_ACEOF
|
|
-
|
|
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 12; then
|
|
- break
|
|
- elif $ac_last_try; then
|
|
- { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
|
|
-echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
|
|
- { (exit 1); exit 1; }; }
|
|
- else
|
|
- ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
|
|
- fi
|
|
-done
|
|
+ print line
|
|
+}
|
|
|
|
-ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
|
|
-if test -n "$ac_eof"; then
|
|
- ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
|
|
- ac_eof=`expr $ac_eof + 1`
|
|
-fi
|
|
-
|
|
-cat >>$CONFIG_STATUS <<_ACEOF
|
|
-cat >"\$tmp/subs-3.sed" <<\CEOF$ac_eof
|
|
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
|
|
-_ACEOF
|
|
-sed '
|
|
-s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
|
|
-s/^/s,@/; s/!/@,|#_!!_#|/
|
|
-:n
|
|
-t n
|
|
-s/'"$ac_delim"'$/,g/; t
|
|
-s/$/\\/; p
|
|
-N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
|
|
-' >>$CONFIG_STATUS <conf$$subs.sed
|
|
-rm -f conf$$subs.sed
|
|
-cat >>$CONFIG_STATUS <<_ACEOF
|
|
-:end
|
|
-s/|#_!!_#|//g
|
|
-CEOF$ac_eof
|
|
+_ACAWK
|
|
+_ACEOF
|
|
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
|
|
+if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
|
|
+ sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
|
|
+else
|
|
+ cat
|
|
+fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
|
|
+ || as_fn_error "could not setup config files machinery" "$LINENO" 5
|
|
_ACEOF
|
|
-
|
|
|
|
# VPATH may cause trouble with some makes, so we remove $(srcdir),
|
|
# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
|
|
@@ -25022,20 +18370,128 @@ s/^[^=]*=[ ]*$//
|
|
}'
|
|
fi
|
|
|
|
-cat >>$CONFIG_STATUS <<\_ACEOF
|
|
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
|
|
fi # test -n "$CONFIG_FILES"
|
|
|
|
+# Set up the scripts for CONFIG_HEADERS section.
|
|
+# No need to generate them if there are no CONFIG_HEADERS.
|
|
+# This happens for instance with `./config.status Makefile'.
|
|
+if test -n "$CONFIG_HEADERS"; then
|
|
+cat >"$tmp/defines.awk" <<\_ACAWK ||
|
|
+BEGIN {
|
|
+_ACEOF
|
|
+
|
|
+# Transform confdefs.h into an awk script `defines.awk', embedded as
|
|
+# here-document in config.status, that substitutes the proper values into
|
|
+# config.h.in to produce config.h.
|
|
+
|
|
+# Create a delimiter string that does not exist in confdefs.h, to ease
|
|
+# handling of long lines.
|
|
+ac_delim='%!_!# '
|
|
+for ac_last_try in false false :; do
|
|
+ ac_t=`sed -n "/$ac_delim/p" confdefs.h`
|
|
+ if test -z "$ac_t"; then
|
|
+ break
|
|
+ elif $ac_last_try; then
|
|
+ as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5
|
|
+ else
|
|
+ ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
|
|
+ fi
|
|
+done
|
|
+
|
|
+# For the awk script, D is an array of macro values keyed by name,
|
|
+# likewise P contains macro parameters if any. Preserve backslash
|
|
+# newline sequences.
|
|
+
|
|
+ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
|
|
+sed -n '
|
|
+s/.\{148\}/&'"$ac_delim"'/g
|
|
+t rset
|
|
+:rset
|
|
+s/^[ ]*#[ ]*define[ ][ ]*/ /
|
|
+t def
|
|
+d
|
|
+:def
|
|
+s/\\$//
|
|
+t bsnl
|
|
+s/["\\]/\\&/g
|
|
+s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\
|
|
+D["\1"]=" \3"/p
|
|
+s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2"/p
|
|
+d
|
|
+:bsnl
|
|
+s/["\\]/\\&/g
|
|
+s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\
|
|
+D["\1"]=" \3\\\\\\n"\\/p
|
|
+t cont
|
|
+s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p
|
|
+t cont
|
|
+d
|
|
+:cont
|
|
+n
|
|
+s/.\{148\}/&'"$ac_delim"'/g
|
|
+t clear
|
|
+:clear
|
|
+s/\\$//
|
|
+t bsnlc
|
|
+s/["\\]/\\&/g; s/^/"/; s/$/"/p
|
|
+d
|
|
+:bsnlc
|
|
+s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p
|
|
+b cont
|
|
+' <confdefs.h | sed '
|
|
+s/'"$ac_delim"'/"\\\
|
|
+"/g' >>$CONFIG_STATUS || ac_write_fail=1
|
|
+
|
|
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
|
|
+ for (key in D) D_is_set[key] = 1
|
|
+ FS = ""
|
|
+}
|
|
+/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ {
|
|
+ line = \$ 0
|
|
+ split(line, arg, " ")
|
|
+ if (arg[1] == "#") {
|
|
+ defundef = arg[2]
|
|
+ mac1 = arg[3]
|
|
+ } else {
|
|
+ defundef = substr(arg[1], 2)
|
|
+ mac1 = arg[2]
|
|
+ }
|
|
+ split(mac1, mac2, "(") #)
|
|
+ macro = mac2[1]
|
|
+ prefix = substr(line, 1, index(line, defundef) - 1)
|
|
+ if (D_is_set[macro]) {
|
|
+ # Preserve the white space surrounding the "#".
|
|
+ print prefix "define", macro P[macro] D[macro]
|
|
+ next
|
|
+ } else {
|
|
+ # Replace #undef with comments. This is necessary, for example,
|
|
+ # in the case of _POSIX_SOURCE, which is predefined and required
|
|
+ # on some systems where configure will not decide to define it.
|
|
+ if (defundef == "undef") {
|
|
+ print "/*", prefix defundef, macro, "*/"
|
|
+ next
|
|
+ }
|
|
+ }
|
|
+}
|
|
+{ print }
|
|
+_ACAWK
|
|
+_ACEOF
|
|
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
|
|
+ as_fn_error "could not setup config headers machinery" "$LINENO" 5
|
|
+fi # test -n "$CONFIG_HEADERS"
|
|
+
|
|
|
|
-for ac_tag in :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS
|
|
+eval set X " :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS"
|
|
+shift
|
|
+for ac_tag
|
|
do
|
|
case $ac_tag in
|
|
:[FHLC]) ac_mode=$ac_tag; continue;;
|
|
esac
|
|
case $ac_mode$ac_tag in
|
|
:[FHL]*:*);;
|
|
- :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
|
|
-echo "$as_me: error: Invalid tag $ac_tag." >&2;}
|
|
- { (exit 1); exit 1; }; };;
|
|
+ :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
|
|
:[FH]-) ac_tag=-:-;;
|
|
:[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
|
|
esac
|
|
@@ -25063,26 +18519,34 @@ echo "$as_me: error: Invalid tag $ac_tag
|
|
[\\/$]*) false;;
|
|
*) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
|
|
esac ||
|
|
- { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
|
|
-echo "$as_me: error: cannot find input file: $ac_f" >&2;}
|
|
- { (exit 1); exit 1; }; };;
|
|
+ as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;
|
|
esac
|
|
- ac_file_inputs="$ac_file_inputs $ac_f"
|
|
+ case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
|
|
+ as_fn_append ac_file_inputs " '$ac_f'"
|
|
done
|
|
|
|
# Let's still pretend it is `configure' which instantiates (i.e., don't
|
|
# use $as_me), people would be surprised to read:
|
|
# /* config.h. Generated by config.status. */
|
|
- configure_input="Generated from "`IFS=:
|
|
- echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure."
|
|
+ configure_input='Generated from '`
|
|
+ $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
|
|
+ `' by configure.'
|
|
if test x"$ac_file" != x-; then
|
|
configure_input="$ac_file. $configure_input"
|
|
- { echo "$as_me:$LINENO: creating $ac_file" >&5
|
|
-echo "$as_me: creating $ac_file" >&6;}
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
|
|
+$as_echo "$as_me: creating $ac_file" >&6;}
|
|
fi
|
|
+ # Neutralize special characters interpreted by sed in replacement strings.
|
|
+ case $configure_input in #(
|
|
+ *\&* | *\|* | *\\* )
|
|
+ ac_sed_conf_input=`$as_echo "$configure_input" |
|
|
+ sed 's/[\\\\&|]/\\\\&/g'`;; #(
|
|
+ *) ac_sed_conf_input=$configure_input;;
|
|
+ esac
|
|
|
|
case $ac_tag in
|
|
- *:-:* | *:-) cat >"$tmp/stdin";;
|
|
+ *:-:* | *:-) cat >"$tmp/stdin" \
|
|
+ || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
|
|
esac
|
|
;;
|
|
esac
|
|
@@ -25092,42 +18556,7 @@ $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^
|
|
X"$ac_file" : 'X\(//\)[^/]' \| \
|
|
X"$ac_file" : 'X\(//\)$' \| \
|
|
X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
|
|
-echo X"$ac_file" |
|
|
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
|
|
- s//\1/
|
|
- q
|
|
- }
|
|
- /^X\(\/\/\)[^/].*/{
|
|
- s//\1/
|
|
- q
|
|
- }
|
|
- /^X\(\/\/\)$/{
|
|
- s//\1/
|
|
- q
|
|
- }
|
|
- /^X\(\/\).*/{
|
|
- s//\1/
|
|
- q
|
|
- }
|
|
- s/.*/./; q'`
|
|
- { as_dir="$ac_dir"
|
|
- case $as_dir in #(
|
|
- -*) as_dir=./$as_dir;;
|
|
- esac
|
|
- test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
|
|
- as_dirs=
|
|
- while :; do
|
|
- case $as_dir in #(
|
|
- *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
|
|
- *) as_qdir=$as_dir;;
|
|
- esac
|
|
- as_dirs="'$as_qdir' $as_dirs"
|
|
- as_dir=`$as_dirname -- "$as_dir" ||
|
|
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
|
|
- X"$as_dir" : 'X\(//\)[^/]' \| \
|
|
- X"$as_dir" : 'X\(//\)$' \| \
|
|
- X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
|
|
-echo X"$as_dir" |
|
|
+$as_echo X"$ac_file" |
|
|
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
|
|
s//\1/
|
|
q
|
|
@@ -25145,20 +18574,15 @@ echo X"$as_dir" |
|
|
q
|
|
}
|
|
s/.*/./; q'`
|
|
- test -d "$as_dir" && break
|
|
- done
|
|
- test -z "$as_dirs" || eval "mkdir $as_dirs"
|
|
- } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
|
|
-echo "$as_me: error: cannot create directory $as_dir" >&2;}
|
|
- { (exit 1); exit 1; }; }; }
|
|
+ as_dir="$ac_dir"; as_fn_mkdir_p
|
|
ac_builddir=.
|
|
|
|
case "$ac_dir" in
|
|
.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
|
|
*)
|
|
- ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
|
|
+ ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
|
|
# A ".." for each directory in $ac_dir_suffix.
|
|
- ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
|
|
+ ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
|
|
case $ac_top_builddir_sub in
|
|
"") ac_top_builddir_sub=. ac_top_build_prefix= ;;
|
|
*) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
|
|
@@ -25203,12 +18627,12 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_
|
|
esac
|
|
_ACEOF
|
|
|
|
-cat >>$CONFIG_STATUS <<\_ACEOF
|
|
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
|
|
# If the template does not know about datarootdir, expand it.
|
|
# FIXME: This hack should be removed a few years after 2.60.
|
|
ac_datarootdir_hack=; ac_datarootdir_seen=
|
|
-
|
|
-case `sed -n '/datarootdir/ {
|
|
+ac_sed_dataroot='
|
|
+/datarootdir/ {
|
|
p
|
|
q
|
|
}
|
|
@@ -25216,36 +18640,37 @@ case `sed -n '/datarootdir/ {
|
|
/@docdir@/p
|
|
/@infodir@/p
|
|
/@localedir@/p
|
|
-/@mandir@/p
|
|
-' $ac_file_inputs` in
|
|
+/@mandir@/p'
|
|
+case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
|
|
*datarootdir*) ac_datarootdir_seen=yes;;
|
|
*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
|
|
- { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
|
|
-echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
|
|
+$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
|
|
_ACEOF
|
|
-cat >>$CONFIG_STATUS <<_ACEOF
|
|
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
|
|
ac_datarootdir_hack='
|
|
s&@datadir@&$datadir&g
|
|
s&@docdir@&$docdir&g
|
|
s&@infodir@&$infodir&g
|
|
s&@localedir@&$localedir&g
|
|
s&@mandir@&$mandir&g
|
|
- s&\\\${datarootdir}&$datarootdir&g' ;;
|
|
+ s&\\\${datarootdir}&$datarootdir&g' ;;
|
|
esac
|
|
_ACEOF
|
|
|
|
# Neutralize VPATH when `$srcdir' = `.'.
|
|
# Shell code in configure.ac might set extrasub.
|
|
# FIXME: do we really want to maintain this feature?
|
|
-cat >>$CONFIG_STATUS <<_ACEOF
|
|
- sed "$ac_vpsub
|
|
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
|
|
+ac_sed_extra="$ac_vpsub
|
|
$extrasub
|
|
_ACEOF
|
|
-cat >>$CONFIG_STATUS <<\_ACEOF
|
|
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
|
|
:t
|
|
/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
|
|
-s&@configure_input@&$configure_input&;t t
|
|
+s|@configure_input@|$ac_sed_conf_input|;t t
|
|
s&@top_builddir@&$ac_top_builddir_sub&;t t
|
|
+s&@top_build_prefix@&$ac_top_build_prefix&;t t
|
|
s&@srcdir@&$ac_srcdir&;t t
|
|
s&@abs_srcdir@&$ac_abs_srcdir&;t t
|
|
s&@top_srcdir@&$ac_top_srcdir&;t t
|
|
@@ -25256,121 +18681,50 @@ s&@abs_top_builddir@&$ac_abs_top_builddi
|
|
s&@INSTALL@&$ac_INSTALL&;t t
|
|
s&@MKDIR_P@&$ac_MKDIR_P&;t t
|
|
$ac_datarootdir_hack
|
|
-" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" | sed -f "$tmp/subs-3.sed" >$tmp/out
|
|
+"
|
|
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
|
|
+ || as_fn_error "could not create $ac_file" "$LINENO" 5
|
|
|
|
test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
|
|
{ ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
|
|
{ ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
|
|
- { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
|
|
which seems to be undefined. Please make sure it is defined." >&5
|
|
-echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
|
|
+$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
|
|
which seems to be undefined. Please make sure it is defined." >&2;}
|
|
|
|
rm -f "$tmp/stdin"
|
|
case $ac_file in
|
|
- -) cat "$tmp/out"; rm -f "$tmp/out";;
|
|
- *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;;
|
|
- esac
|
|
+ -) cat "$tmp/out" && rm -f "$tmp/out";;
|
|
+ *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
|
|
+ esac \
|
|
+ || as_fn_error "could not create $ac_file" "$LINENO" 5
|
|
;;
|
|
:H)
|
|
#
|
|
# CONFIG_HEADER
|
|
#
|
|
-_ACEOF
|
|
-
|
|
-# Transform confdefs.h into a sed script `conftest.defines', that
|
|
-# substitutes the proper values into config.h.in to produce config.h.
|
|
-rm -f conftest.defines conftest.tail
|
|
-# First, append a space to every undef/define line, to ease matching.
|
|
-echo 's/$/ /' >conftest.defines
|
|
-# Then, protect against being on the right side of a sed subst, or in
|
|
-# an unquoted here document, in config.status. If some macros were
|
|
-# called several times there might be several #defines for the same
|
|
-# symbol, which is useless. But do not sort them, since the last
|
|
-# AC_DEFINE must be honored.
|
|
-ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
|
|
-# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where
|
|
-# NAME is the cpp macro being defined, VALUE is the value it is being given.
|
|
-# PARAMS is the parameter list in the macro definition--in most cases, it's
|
|
-# just an empty string.
|
|
-ac_dA='s,^\\([ #]*\\)[^ ]*\\([ ]*'
|
|
-ac_dB='\\)[ (].*,\\1define\\2'
|
|
-ac_dC=' '
|
|
-ac_dD=' ,'
|
|
-
|
|
-uniq confdefs.h |
|
|
- sed -n '
|
|
- t rset
|
|
- :rset
|
|
- s/^[ ]*#[ ]*define[ ][ ]*//
|
|
- t ok
|
|
- d
|
|
- :ok
|
|
- s/[\\&,]/\\&/g
|
|
- s/^\('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p
|
|
- s/^\('"$ac_word_re"'\)[ ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p
|
|
- ' >>conftest.defines
|
|
-
|
|
-# Remove the space that was appended to ease matching.
|
|
-# Then replace #undef with comments. This is necessary, for
|
|
-# example, in the case of _POSIX_SOURCE, which is predefined and required
|
|
-# on some systems where configure will not decide to define it.
|
|
-# (The regexp can be short, since the line contains either #define or #undef.)
|
|
-echo 's/ $//
|
|
-s,^[ #]*u.*,/* & */,' >>conftest.defines
|
|
-
|
|
-# Break up conftest.defines:
|
|
-ac_max_sed_lines=50
|
|
-
|
|
-# First sed command is: sed -f defines.sed $ac_file_inputs >"$tmp/out1"
|
|
-# Second one is: sed -f defines.sed "$tmp/out1" >"$tmp/out2"
|
|
-# Third one will be: sed -f defines.sed "$tmp/out2" >"$tmp/out1"
|
|
-# et cetera.
|
|
-ac_in='$ac_file_inputs'
|
|
-ac_out='"$tmp/out1"'
|
|
-ac_nxt='"$tmp/out2"'
|
|
-
|
|
-while :
|
|
-do
|
|
- # Write a here document:
|
|
- cat >>$CONFIG_STATUS <<_ACEOF
|
|
- # First, check the format of the line:
|
|
- cat >"\$tmp/defines.sed" <<\\CEOF
|
|
-/^[ ]*#[ ]*undef[ ][ ]*$ac_word_re[ ]*\$/b def
|
|
-/^[ ]*#[ ]*define[ ][ ]*$ac_word_re[( ]/b def
|
|
-b
|
|
-:def
|
|
-_ACEOF
|
|
- sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS
|
|
- echo 'CEOF
|
|
- sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS
|
|
- ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in
|
|
- sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail
|
|
- grep . conftest.tail >/dev/null || break
|
|
- rm -f conftest.defines
|
|
- mv conftest.tail conftest.defines
|
|
-done
|
|
-rm -f conftest.defines conftest.tail
|
|
-
|
|
-echo "ac_result=$ac_in" >>$CONFIG_STATUS
|
|
-cat >>$CONFIG_STATUS <<\_ACEOF
|
|
if test x"$ac_file" != x-; then
|
|
- echo "/* $configure_input */" >"$tmp/config.h"
|
|
- cat "$ac_result" >>"$tmp/config.h"
|
|
- if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then
|
|
- { echo "$as_me:$LINENO: $ac_file is unchanged" >&5
|
|
-echo "$as_me: $ac_file is unchanged" >&6;}
|
|
+ {
|
|
+ $as_echo "/* $configure_input */" \
|
|
+ && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
|
|
+ } >"$tmp/config.h" \
|
|
+ || as_fn_error "could not create $ac_file" "$LINENO" 5
|
|
+ if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
|
|
+$as_echo "$as_me: $ac_file is unchanged" >&6;}
|
|
else
|
|
- rm -f $ac_file
|
|
- mv "$tmp/config.h" $ac_file
|
|
+ rm -f "$ac_file"
|
|
+ mv "$tmp/config.h" "$ac_file" \
|
|
+ || as_fn_error "could not create $ac_file" "$LINENO" 5
|
|
fi
|
|
else
|
|
- echo "/* $configure_input */"
|
|
- cat "$ac_result"
|
|
+ $as_echo "/* $configure_input */" \
|
|
+ && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
|
|
+ || as_fn_error "could not create -" "$LINENO" 5
|
|
fi
|
|
- rm -f "$tmp/out12"
|
|
-# Compute $ac_file's index in $config_headers.
|
|
-_am_arg=$ac_file
|
|
+# Compute "$ac_file"'s index in $config_headers.
|
|
+_am_arg="$ac_file"
|
|
_am_stamp_count=1
|
|
for _am_header in $config_headers :; do
|
|
case $_am_header in
|
|
@@ -25385,7 +18739,7 @@ $as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^
|
|
X"$_am_arg" : 'X\(//\)[^/]' \| \
|
|
X"$_am_arg" : 'X\(//\)$' \| \
|
|
X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
|
|
-echo X"$_am_arg" |
|
|
+$as_echo X"$_am_arg" |
|
|
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
|
|
s//\1/
|
|
q
|
|
@@ -25405,39 +18759,40 @@ echo X"$_am_arg" |
|
|
s/.*/./; q'`/stamp-h$_am_stamp_count
|
|
;;
|
|
|
|
- :C) { echo "$as_me:$LINENO: executing $ac_file commands" >&5
|
|
-echo "$as_me: executing $ac_file commands" >&6;}
|
|
+ :C) { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
|
|
+$as_echo "$as_me: executing $ac_file commands" >&6;}
|
|
;;
|
|
esac
|
|
|
|
|
|
case $ac_file$ac_mode in
|
|
- "depfiles":C) test x"$AMDEP_TRUE" != x"" || # Autoconf 2.62 quotes --file arguments for eval, but not when files
|
|
-# are listed without --file. Let's play safe and only enable the eval
|
|
-# if we detect the quoting.
|
|
-case $CONFIG_FILES in
|
|
-*\'*) eval set x "$CONFIG_FILES" ;;
|
|
-*) set x $CONFIG_FILES ;;
|
|
-esac
|
|
-shift
|
|
-for mf
|
|
-do
|
|
- # Strip MF so we end up with the name of the file.
|
|
- mf=`echo "$mf" | sed -e 's/:.*$//'`
|
|
- # Check whether this is an Automake generated Makefile or not.
|
|
- # We used to match only the files named `Makefile.in', but
|
|
- # some people rename them; so instead we look at the file content.
|
|
- # Grep'ing the first line is not enough: some people post-process
|
|
- # each Makefile.in and add a new line on top of each file to say so.
|
|
- # Grep'ing the whole file is not good either: AIX grep has a line
|
|
- # limit of 2048, but all sed's we know have understand at least 4000.
|
|
- if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
|
|
- dirpart=`$as_dirname -- "$mf" ||
|
|
+ "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
|
|
+ # Autoconf 2.62 quotes --file arguments for eval, but not when files
|
|
+ # are listed without --file. Let's play safe and only enable the eval
|
|
+ # if we detect the quoting.
|
|
+ case $CONFIG_FILES in
|
|
+ *\'*) eval set x "$CONFIG_FILES" ;;
|
|
+ *) set x $CONFIG_FILES ;;
|
|
+ esac
|
|
+ shift
|
|
+ for mf
|
|
+ do
|
|
+ # Strip MF so we end up with the name of the file.
|
|
+ mf=`echo "$mf" | sed -e 's/:.*$//'`
|
|
+ # Check whether this is an Automake generated Makefile or not.
|
|
+ # We used to match only the files named `Makefile.in', but
|
|
+ # some people rename them; so instead we look at the file content.
|
|
+ # Grep'ing the first line is not enough: some people post-process
|
|
+ # each Makefile.in and add a new line on top of each file to say so.
|
|
+ # Grep'ing the whole file is not good either: AIX grep has a line
|
|
+ # limit of 2048, but all sed's we know have understand at least 4000.
|
|
+ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
|
|
+ dirpart=`$as_dirname -- "$mf" ||
|
|
$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
|
|
X"$mf" : 'X\(//\)[^/]' \| \
|
|
X"$mf" : 'X\(//\)$' \| \
|
|
X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
|
|
-echo X"$mf" |
|
|
+$as_echo X"$mf" |
|
|
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
|
|
s//\1/
|
|
q
|
|
@@ -25455,68 +18810,33 @@ echo X"$mf" |
|
|
q
|
|
}
|
|
s/.*/./; q'`
|
|
- else
|
|
- continue
|
|
- fi
|
|
- # Extract the definition of DEPDIR, am__include, and am__quote
|
|
- # from the Makefile without running `make'.
|
|
- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
|
|
- test -z "$DEPDIR" && continue
|
|
- am__include=`sed -n 's/^am__include = //p' < "$mf"`
|
|
- test -z "am__include" && continue
|
|
- am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
|
|
- # When using ansi2knr, U may be empty or an underscore; expand it
|
|
- U=`sed -n 's/^U = //p' < "$mf"`
|
|
- # Find all dependency output files, they are included files with
|
|
- # $(DEPDIR) in their names. We invoke sed twice because it is the
|
|
- # simplest approach to changing $(DEPDIR) to its actual value in the
|
|
- # expansion.
|
|
- for file in `sed -n "
|
|
- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
|
|
- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
|
|
- # Make sure the directory exists.
|
|
- test -f "$dirpart/$file" && continue
|
|
- fdir=`$as_dirname -- "$file" ||
|
|
+ else
|
|
+ continue
|
|
+ fi
|
|
+ # Extract the definition of DEPDIR, am__include, and am__quote
|
|
+ # from the Makefile without running `make'.
|
|
+ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
|
|
+ test -z "$DEPDIR" && continue
|
|
+ am__include=`sed -n 's/^am__include = //p' < "$mf"`
|
|
+ test -z "am__include" && continue
|
|
+ am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
|
|
+ # When using ansi2knr, U may be empty or an underscore; expand it
|
|
+ U=`sed -n 's/^U = //p' < "$mf"`
|
|
+ # Find all dependency output files, they are included files with
|
|
+ # $(DEPDIR) in their names. We invoke sed twice because it is the
|
|
+ # simplest approach to changing $(DEPDIR) to its actual value in the
|
|
+ # expansion.
|
|
+ for file in `sed -n "
|
|
+ s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
|
|
+ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
|
|
+ # Make sure the directory exists.
|
|
+ test -f "$dirpart/$file" && continue
|
|
+ fdir=`$as_dirname -- "$file" ||
|
|
$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
|
|
X"$file" : 'X\(//\)[^/]' \| \
|
|
X"$file" : 'X\(//\)$' \| \
|
|
X"$file" : 'X\(/\)' \| . 2>/dev/null ||
|
|
-echo X"$file" |
|
|
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
|
|
- s//\1/
|
|
- q
|
|
- }
|
|
- /^X\(\/\/\)[^/].*/{
|
|
- s//\1/
|
|
- q
|
|
- }
|
|
- /^X\(\/\/\)$/{
|
|
- s//\1/
|
|
- q
|
|
- }
|
|
- /^X\(\/\).*/{
|
|
- s//\1/
|
|
- q
|
|
- }
|
|
- s/.*/./; q'`
|
|
- { as_dir=$dirpart/$fdir
|
|
- case $as_dir in #(
|
|
- -*) as_dir=./$as_dir;;
|
|
- esac
|
|
- test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
|
|
- as_dirs=
|
|
- while :; do
|
|
- case $as_dir in #(
|
|
- *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
|
|
- *) as_qdir=$as_dir;;
|
|
- esac
|
|
- as_dirs="'$as_qdir' $as_dirs"
|
|
- as_dir=`$as_dirname -- "$as_dir" ||
|
|
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
|
|
- X"$as_dir" : 'X\(//\)[^/]' \| \
|
|
- X"$as_dir" : 'X\(//\)$' \| \
|
|
- X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
|
|
-echo X"$as_dir" |
|
|
+$as_echo X"$file" |
|
|
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
|
|
s//\1/
|
|
q
|
|
@@ -25534,16 +18854,12 @@ echo X"$as_dir" |
|
|
q
|
|
}
|
|
s/.*/./; q'`
|
|
- test -d "$as_dir" && break
|
|
+ as_dir=$dirpart/$fdir; as_fn_mkdir_p
|
|
+ # echo "creating $dirpart/$file"
|
|
+ echo '# dummy' > "$dirpart/$file"
|
|
done
|
|
- test -z "$as_dirs" || eval "mkdir $as_dirs"
|
|
- } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
|
|
-echo "$as_me: error: cannot create directory $as_dir" >&2;}
|
|
- { (exit 1); exit 1; }; }; }
|
|
- # echo "creating $dirpart/$file"
|
|
- echo '# dummy' > "$dirpart/$file"
|
|
done
|
|
-done
|
|
+}
|
|
;;
|
|
"libtool":C)
|
|
|
|
@@ -26184,6 +19500,9 @@ _LT_EOF
|
|
sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
|
|
esac ;;
|
|
"po/stamp-it":C)
|
|
+ if ! grep "^# INTLTOOL_MAKEFILE$" "po/Makefile.in" > /dev/null ; then
|
|
+ as_fn_error "po/Makefile.in.in was not created by intltoolize." "$LINENO" 5
|
|
+ fi
|
|
rm -f "po/stamp-it" "po/stamp-it.tmp" "po/POTFILES" "po/Makefile.tmp"
|
|
>"po/stamp-it.tmp"
|
|
sed '/^#/d
|
|
@@ -26192,17 +19511,11 @@ _LT_EOF
|
|
'"s|^| $ac_top_srcdir/|" \
|
|
"$srcdir/po/POTFILES.in" | sed '$!s/$/ \\/' >"po/POTFILES"
|
|
|
|
- if test ! -f "po/Makefile"; then
|
|
- { { echo "$as_me:$LINENO: error: po/Makefile is not ready." >&5
|
|
-echo "$as_me: error: po/Makefile is not ready." >&2;}
|
|
- { (exit 1); exit 1; }; }
|
|
- fi
|
|
- mv "po/Makefile" "po/Makefile.tmp"
|
|
sed '/^POTFILES =/,/[^\\]$/ {
|
|
/^POTFILES =/!d
|
|
r po/POTFILES
|
|
}
|
|
- ' "po/Makefile.tmp" >"po/Makefile"
|
|
+ ' "po/Makefile.in" >"po/Makefile"
|
|
rm -f "po/Makefile.tmp"
|
|
mv "po/stamp-it.tmp" "po/stamp-it"
|
|
;;
|
|
@@ -26211,11 +19524,13 @@ echo "$as_me: error: po/Makefile is not
|
|
done # for ac_tag
|
|
|
|
|
|
-{ (exit 0); exit 0; }
|
|
+as_fn_exit 0
|
|
_ACEOF
|
|
-chmod +x $CONFIG_STATUS
|
|
ac_clean_files=$ac_clean_files_save
|
|
|
|
+test $ac_write_fail = 0 ||
|
|
+ as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
|
|
+
|
|
|
|
# configure is writing to config.log, and then calls config.status.
|
|
# config.status does its own redirection, appending to config.log.
|
|
@@ -26235,6 +19550,10 @@ if test "$no_create" != yes; then
|
|
exec 5>>config.log
|
|
# Use ||, not &&, to avoid exiting from the if with $? = 1, which
|
|
# would make configure fail if this is the last instruction.
|
|
- $ac_cs_success || { (exit 1); exit 1; }
|
|
+ $ac_cs_success || as_fn_exit $?
|
|
+fi
|
|
+if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
|
|
+$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
|
|
fi
|
|
|
|
Index: libgtop-2.28.0/INSTALL
|
|
===================================================================
|
|
--- libgtop-2.28.0.orig/INSTALL 2009-11-22 17:53:38.957687521 +0100
|
|
+++ libgtop-2.28.0/INSTALL 2009-11-22 17:53:11.897689463 +0100
|
|
@@ -2,15 +2,15 @@ Installation Instructions
|
|
*************************
|
|
|
|
Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
|
|
-2006, 2007 Free Software Foundation, Inc.
|
|
+2006, 2007, 2008, 2009 Free Software Foundation, Inc.
|
|
|
|
-This file is free documentation; the Free Software Foundation gives
|
|
+ This file is free documentation; the Free Software Foundation gives
|
|
unlimited permission to copy, distribute and modify it.
|
|
|
|
Basic Installation
|
|
==================
|
|
|
|
-Briefly, the shell commands `./configure; make; make install' should
|
|
+ Briefly, the shell commands `./configure; make; make install' should
|
|
configure, build, and install this package. The following
|
|
more-detailed instructions are generic; see the `README' file for
|
|
instructions specific to this package.
|
|
@@ -73,9 +73,9 @@ The simplest way to compile this package
|
|
Compilers and Options
|
|
=====================
|
|
|
|
-Some systems require unusual options for compilation or linking that the
|
|
-`configure' script does not know about. Run `./configure --help' for
|
|
-details on some of the pertinent environment variables.
|
|
+ Some systems require unusual options for compilation or linking that
|
|
+the `configure' script does not know about. Run `./configure --help'
|
|
+for details on some of the pertinent environment variables.
|
|
|
|
You can give `configure' initial values for configuration parameters
|
|
by setting variables in the command line or in the environment. Here
|
|
@@ -88,7 +88,7 @@ is an example:
|
|
Compiling For Multiple Architectures
|
|
====================================
|
|
|
|
-You can compile the package for more than one kind of computer at the
|
|
+ You can compile the package for more than one kind of computer at the
|
|
same time, by placing the object files for each architecture in their
|
|
own directory. To do this, you can use GNU `make'. `cd' to the
|
|
directory where you want the object files and executables to go and run
|
|
@@ -100,10 +100,24 @@ architecture at a time in the source cod
|
|
installed the package for one architecture, use `make distclean' before
|
|
reconfiguring for another architecture.
|
|
|
|
+ On MacOS X 10.5 and later systems, you can create libraries and
|
|
+executables that work on multiple system types--known as "fat" or
|
|
+"universal" binaries--by specifying multiple `-arch' options to the
|
|
+compiler but only a single `-arch' option to the preprocessor. Like
|
|
+this:
|
|
+
|
|
+ ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
|
|
+ CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
|
|
+ CPP="gcc -E" CXXCPP="g++ -E"
|
|
+
|
|
+ This is not guaranteed to produce working output in all cases, you
|
|
+may have to build one architecture at a time and combine the results
|
|
+using the `lipo' tool if you have problems.
|
|
+
|
|
Installation Names
|
|
==================
|
|
|
|
-By default, `make install' installs the package's commands under
|
|
+ By default, `make install' installs the package's commands under
|
|
`/usr/local/bin', include files under `/usr/local/include', etc. You
|
|
can specify an installation prefix other than `/usr/local' by giving
|
|
`configure' the option `--prefix=PREFIX'.
|
|
@@ -126,7 +140,7 @@ option `--program-prefix=PREFIX' or `--p
|
|
Optional Features
|
|
=================
|
|
|
|
-Some packages pay attention to `--enable-FEATURE' options to
|
|
+ Some packages pay attention to `--enable-FEATURE' options to
|
|
`configure', where FEATURE indicates an optional part of the package.
|
|
They may also pay attention to `--with-PACKAGE' options, where PACKAGE
|
|
is something like `gnu-as' or `x' (for the X Window System). The
|
|
@@ -138,14 +152,46 @@ find the X include and library files aut
|
|
you can use the `configure' options `--x-includes=DIR' and
|
|
`--x-libraries=DIR' to specify their locations.
|
|
|
|
+Particular systems
|
|
+==================
|
|
+
|
|
+ On HP-UX, the default C compiler is not ANSI C compatible. If GNU
|
|
+CC is not installed, it is recommended to use the following options in
|
|
+order to use an ANSI C compiler:
|
|
+
|
|
+ ./configure CC="cc -Ae -D_XOPEN_SOURCE=500"
|
|
+
|
|
+and if that doesn't work, install pre-built binaries of GCC for HP-UX.
|
|
+
|
|
+ On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
|
|
+parse its `<wchar.h>' header file. The option `-nodtk' can be used as
|
|
+a workaround. If GNU CC is not installed, it is therefore recommended
|
|
+to try
|
|
+
|
|
+ ./configure CC="cc"
|
|
+
|
|
+and if that doesn't work, try
|
|
+
|
|
+ ./configure CC="cc -nodtk"
|
|
+
|
|
+ On Solaris, don't put `/usr/ucb' early in your `PATH'. This
|
|
+directory contains several dysfunctional programs; working variants of
|
|
+these programs are available in `/usr/bin'. So, if you need `/usr/ucb'
|
|
+in your `PATH', put it _after_ `/usr/bin'.
|
|
+
|
|
+ On Haiku, software installed for all users goes in `/boot/common',
|
|
+not `/usr/local'. It is recommended to use the following options:
|
|
+
|
|
+ ./configure --prefix=/boot/common
|
|
+
|
|
Specifying the System Type
|
|
==========================
|
|
|
|
-There may be some features `configure' cannot figure out automatically,
|
|
-but needs to determine by the type of machine the package will run on.
|
|
-Usually, assuming the package is built to be run on the _same_
|
|
-architectures, `configure' can figure that out, but if it prints a
|
|
-message saying it cannot guess the machine type, give it the
|
|
+ There may be some features `configure' cannot figure out
|
|
+automatically, but needs to determine by the type of machine the package
|
|
+will run on. Usually, assuming the package is built to be run on the
|
|
+_same_ architectures, `configure' can figure that out, but if it prints
|
|
+a message saying it cannot guess the machine type, give it the
|
|
`--build=TYPE' option. TYPE can either be a short name for the system
|
|
type, such as `sun4', or a canonical name which has the form:
|
|
|
|
@@ -153,7 +199,8 @@ type, such as `sun4', or a canonical nam
|
|
|
|
where SYSTEM can have one of these forms:
|
|
|
|
- OS KERNEL-OS
|
|
+ OS
|
|
+ KERNEL-OS
|
|
|
|
See the file `config.sub' for the possible values of each field. If
|
|
`config.sub' isn't included in this package, then this package doesn't
|
|
@@ -171,9 +218,9 @@ eventually be run) with `--host=TYPE'.
|
|
Sharing Defaults
|
|
================
|
|
|
|
-If you want to set default values for `configure' scripts to share, you
|
|
-can create a site shell script called `config.site' that gives default
|
|
-values for variables like `CC', `cache_file', and `prefix'.
|
|
+ If you want to set default values for `configure' scripts to share,
|
|
+you can create a site shell script called `config.site' that gives
|
|
+default values for variables like `CC', `cache_file', and `prefix'.
|
|
`configure' looks for `PREFIX/share/config.site' if it exists, then
|
|
`PREFIX/etc/config.site' if it exists. Or, you can set the
|
|
`CONFIG_SITE' environment variable to the location of the site script.
|
|
@@ -182,7 +229,7 @@ A warning: not all `configure' scripts l
|
|
Defining Variables
|
|
==================
|
|
|
|
-Variables not defined in a site shell script can be set in the
|
|
+ Variables not defined in a site shell script can be set in the
|
|
environment passed to `configure'. However, some packages may run
|
|
configure again during the build, and the customized values of these
|
|
variables may be lost. In order to avoid this problem, you should set
|
|
@@ -201,11 +248,19 @@ an Autoconf bug. Until the bug is fixed
|
|
`configure' Invocation
|
|
======================
|
|
|
|
-`configure' recognizes the following options to control how it operates.
|
|
+ `configure' recognizes the following options to control how it
|
|
+operates.
|
|
|
|
`--help'
|
|
`-h'
|
|
- Print a summary of the options to `configure', and exit.
|
|
+ Print a summary of all of the options to `configure', and exit.
|
|
+
|
|
+`--help=short'
|
|
+`--help=recursive'
|
|
+ Print a summary of the options unique to this package's
|
|
+ `configure', and exit. The `short' variant lists options used
|
|
+ only in the top level, while the `recursive' variant lists options
|
|
+ also present in any nested packages.
|
|
|
|
`--version'
|
|
`-V'
|
|
@@ -232,6 +287,16 @@ an Autoconf bug. Until the bug is fixed
|
|
Look for the package's source code in directory DIR. Usually
|
|
`configure' can determine that directory automatically.
|
|
|
|
+`--prefix=DIR'
|
|
+ Use DIR as the installation prefix. *Note Installation Names::
|
|
+ for more details, including other options available for fine-tuning
|
|
+ the installation locations.
|
|
+
|
|
+`--no-create'
|
|
+`-n'
|
|
+ Run the configure checks, but stop before creating any output
|
|
+ files.
|
|
+
|
|
`configure' also accepts some other, not widely useful, options. Run
|
|
`configure --help' for more details.
|
|
|
|
Index: libgtop-2.28.0/Makefile.in
|
|
===================================================================
|
|
--- libgtop-2.28.0.orig/Makefile.in 2009-11-22 17:53:38.733185322 +0100
|
|
+++ libgtop-2.28.0/Makefile.in 2009-11-22 17:53:11.977686853 +0100
|
|
@@ -1,8 +1,9 @@
|
|
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
|
|
+# Makefile.in generated by automake 1.11 from Makefile.am.
|
|
# @configure_input@
|
|
|
|
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
|
|
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
|
|
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
|
|
+# Inc.
|
|
# This Makefile.in is free software; the Free Software Foundation
|
|
# gives unlimited permission to copy and/or distribute it,
|
|
# with or without modifications, as long as this notice is preserved.
|
|
@@ -17,8 +18,9 @@
|
|
|
|
VPATH = @srcdir@
|
|
pkgdatadir = $(datadir)/@PACKAGE@
|
|
-pkglibdir = $(libdir)/@PACKAGE@
|
|
pkgincludedir = $(includedir)/@PACKAGE@
|
|
+pkglibdir = $(libdir)/@PACKAGE@
|
|
+pkglibexecdir = $(libexecdir)/@PACKAGE@
|
|
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
|
|
install_sh_DATA = $(install_sh) -c -m 644
|
|
install_sh_PROGRAM = $(install_sh) -c
|
|
@@ -51,6 +53,7 @@ am__CONFIG_DISTCLEAN_FILES = config.stat
|
|
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
|
|
CONFIG_HEADER = config.h
|
|
CONFIG_CLEAN_FILES = libgtop.spec libgtop-2.0.pc libgtopconfig.h
|
|
+CONFIG_CLEAN_VPATH_FILES =
|
|
SOURCES =
|
|
DIST_SOURCES =
|
|
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
|
|
@@ -65,15 +68,31 @@ am__vpath_adj = case $$p in \
|
|
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
|
|
*) f=$$p;; \
|
|
esac;
|
|
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
|
|
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
|
|
+am__install_max = 40
|
|
+am__nobase_strip_setup = \
|
|
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
|
|
+am__nobase_strip = \
|
|
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
|
|
+am__nobase_list = $(am__nobase_strip_setup); \
|
|
+ for p in $$list; do echo "$$p $$p"; done | \
|
|
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
|
|
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
|
|
+ if (++n[$$2] == $(am__install_max)) \
|
|
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
|
|
+ END { for (dir in files) print dir, files[dir] }'
|
|
+am__base_list = \
|
|
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
|
|
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
|
|
am__installdirs = "$(DESTDIR)$(pkgconfigdir)" \
|
|
"$(DESTDIR)$(libgtopincludedir)"
|
|
-pkgconfigDATA_INSTALL = $(INSTALL_DATA)
|
|
DATA = $(pkgconfig_DATA)
|
|
-libgtopincludeHEADERS_INSTALL = $(INSTALL_HEADER)
|
|
HEADERS = $(libgtopinclude_HEADERS)
|
|
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
|
|
distclean-recursive maintainer-clean-recursive
|
|
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
|
|
+ $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
|
|
+ distdir dist dist-all distcheck
|
|
ETAGS = etags
|
|
CTAGS = ctags
|
|
DIST_SUBDIRS = po misc include sysdeps lib src examples doc
|
|
@@ -81,9 +100,34 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCE
|
|
distdir = $(PACKAGE)-$(VERSION)
|
|
top_distdir = $(distdir)
|
|
am__remove_distdir = \
|
|
- { test ! -d $(distdir) \
|
|
- || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
|
|
- && rm -fr $(distdir); }; }
|
|
+ { test ! -d "$(distdir)" \
|
|
+ || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
|
|
+ && rm -fr "$(distdir)"; }; }
|
|
+am__relativize = \
|
|
+ dir0=`pwd`; \
|
|
+ sed_first='s,^\([^/]*\)/.*$$,\1,'; \
|
|
+ sed_rest='s,^[^/]*/*,,'; \
|
|
+ sed_last='s,^.*/\([^/]*\)$$,\1,'; \
|
|
+ sed_butlast='s,/*[^/]*$$,,'; \
|
|
+ while test -n "$$dir1"; do \
|
|
+ first=`echo "$$dir1" | sed -e "$$sed_first"`; \
|
|
+ if test "$$first" != "."; then \
|
|
+ if test "$$first" = ".."; then \
|
|
+ dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
|
|
+ dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
|
|
+ else \
|
|
+ first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
|
|
+ if test "$$first2" = "$$first"; then \
|
|
+ dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
|
|
+ else \
|
|
+ dir2="../$$dir2"; \
|
|
+ fi; \
|
|
+ dir0="$$dir0"/"$$first"; \
|
|
+ fi; \
|
|
+ fi; \
|
|
+ dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
|
|
+ done; \
|
|
+ reldir="$$dir2"
|
|
DIST_ARCHIVES = $(distdir).tar.gz
|
|
GZIP_ENV = --best
|
|
distuninstallcheck_listfiles = find . -type f -print
|
|
@@ -136,29 +180,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
|
|
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
|
|
INSTOBJEXT = @INSTOBJEXT@
|
|
INTLLIBS = @INTLLIBS@
|
|
-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
|
|
-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
|
|
-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
|
|
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
|
|
-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
|
|
-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
|
|
INTLTOOL_MERGE = @INTLTOOL_MERGE@
|
|
-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@
|
|
-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
|
|
-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
|
|
-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
|
|
-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
|
|
-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
|
|
-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
|
|
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
|
|
-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
|
|
-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
|
|
-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
|
|
KVM_LIBS = @KVM_LIBS@
|
|
LD = @LD@
|
|
LDFLAGS = @LDFLAGS@
|
|
@@ -197,6 +222,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
|
|
PACKAGE_NAME = @PACKAGE_NAME@
|
|
PACKAGE_STRING = @PACKAGE_STRING@
|
|
PACKAGE_TARNAME = @PACKAGE_TARNAME@
|
|
+PACKAGE_URL = @PACKAGE_URL@
|
|
PACKAGE_VERSION = @PACKAGE_VERSION@
|
|
PATH_SEPARATOR = @PATH_SEPARATOR@
|
|
PERL = @PERL@
|
|
@@ -278,6 +304,7 @@ sysconfdir = @sysconfdir@
|
|
sysdeps_dir = @sysdeps_dir@
|
|
sysdeps_suid_lib = @sysdeps_suid_lib@
|
|
target_alias = @target_alias@
|
|
+top_build_prefix = @top_build_prefix@
|
|
top_builddir = @top_builddir@
|
|
top_srcdir = @top_srcdir@
|
|
@EXAMPLES_FALSE@EXAMPLES_DIR =
|
|
@@ -312,15 +339,15 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefi
|
|
@for dep in $?; do \
|
|
case '$(am__configure_deps)' in \
|
|
*$$dep*) \
|
|
- echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \
|
|
- cd $(srcdir) && $(AUTOMAKE) --gnu \
|
|
+ echo ' cd $(srcdir) && $(AUTOMAKE) --gnu'; \
|
|
+ $(am__cd) $(srcdir) && $(AUTOMAKE) --gnu \
|
|
&& exit 0; \
|
|
exit 1;; \
|
|
esac; \
|
|
done; \
|
|
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \
|
|
- cd $(top_srcdir) && \
|
|
- $(AUTOMAKE) --gnu Makefile
|
|
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \
|
|
+ $(am__cd) $(top_srcdir) && \
|
|
+ $(AUTOMAKE) --gnu Makefile
|
|
.PRECIOUS: Makefile
|
|
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
|
|
@case '$?' in \
|
|
@@ -336,9 +363,10 @@ $(top_builddir)/config.status: $(top_src
|
|
$(SHELL) ./config.status --recheck
|
|
|
|
$(top_srcdir)/configure: $(am__configure_deps)
|
|
- cd $(srcdir) && $(AUTOCONF)
|
|
+ $(am__cd) $(srcdir) && $(AUTOCONF)
|
|
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
|
|
- cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
|
|
+ $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
|
|
+$(am__aclocal_m4_deps):
|
|
|
|
config.h: stamp-h1
|
|
@if test ! -f $@; then \
|
|
@@ -350,7 +378,7 @@ stamp-h1: $(srcdir)/config.h.in $(top_bu
|
|
@rm -f stamp-h1
|
|
cd $(top_builddir) && $(SHELL) ./config.status config.h
|
|
$(srcdir)/config.h.in: $(am__configure_deps)
|
|
- cd $(top_srcdir) && $(AUTOHEADER)
|
|
+ ($(am__cd) $(top_srcdir) && $(AUTOHEADER))
|
|
rm -f stamp-h1
|
|
touch $@
|
|
|
|
@@ -374,37 +402,43 @@ distclean-libtool:
|
|
install-pkgconfigDATA: $(pkgconfig_DATA)
|
|
@$(NORMAL_INSTALL)
|
|
test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)"
|
|
- @list='$(pkgconfig_DATA)'; for p in $$list; do \
|
|
+ @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
|
|
+ for p in $$list; do \
|
|
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
|
|
- f=$(am__strip_dir) \
|
|
- echo " $(pkgconfigDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgconfigdir)/$$f'"; \
|
|
- $(pkgconfigDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgconfigdir)/$$f"; \
|
|
+ echo "$$d$$p"; \
|
|
+ done | $(am__base_list) | \
|
|
+ while read files; do \
|
|
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgconfigdir)'"; \
|
|
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgconfigdir)" || exit $$?; \
|
|
done
|
|
|
|
uninstall-pkgconfigDATA:
|
|
@$(NORMAL_UNINSTALL)
|
|
- @list='$(pkgconfig_DATA)'; for p in $$list; do \
|
|
- f=$(am__strip_dir) \
|
|
- echo " rm -f '$(DESTDIR)$(pkgconfigdir)/$$f'"; \
|
|
- rm -f "$(DESTDIR)$(pkgconfigdir)/$$f"; \
|
|
- done
|
|
+ @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
|
|
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
|
|
+ test -n "$$files" || exit 0; \
|
|
+ echo " ( cd '$(DESTDIR)$(pkgconfigdir)' && rm -f" $$files ")"; \
|
|
+ cd "$(DESTDIR)$(pkgconfigdir)" && rm -f $$files
|
|
install-libgtopincludeHEADERS: $(libgtopinclude_HEADERS)
|
|
@$(NORMAL_INSTALL)
|
|
test -z "$(libgtopincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libgtopincludedir)"
|
|
- @list='$(libgtopinclude_HEADERS)'; for p in $$list; do \
|
|
+ @list='$(libgtopinclude_HEADERS)'; test -n "$(libgtopincludedir)" || list=; \
|
|
+ for p in $$list; do \
|
|
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
|
|
- f=$(am__strip_dir) \
|
|
- echo " $(libgtopincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(libgtopincludedir)/$$f'"; \
|
|
- $(libgtopincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(libgtopincludedir)/$$f"; \
|
|
+ echo "$$d$$p"; \
|
|
+ done | $(am__base_list) | \
|
|
+ while read files; do \
|
|
+ echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(libgtopincludedir)'"; \
|
|
+ $(INSTALL_HEADER) $$files "$(DESTDIR)$(libgtopincludedir)" || exit $$?; \
|
|
done
|
|
|
|
uninstall-libgtopincludeHEADERS:
|
|
@$(NORMAL_UNINSTALL)
|
|
- @list='$(libgtopinclude_HEADERS)'; for p in $$list; do \
|
|
- f=$(am__strip_dir) \
|
|
- echo " rm -f '$(DESTDIR)$(libgtopincludedir)/$$f'"; \
|
|
- rm -f "$(DESTDIR)$(libgtopincludedir)/$$f"; \
|
|
- done
|
|
+ @list='$(libgtopinclude_HEADERS)'; test -n "$(libgtopincludedir)" || list=; \
|
|
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
|
|
+ test -n "$$files" || exit 0; \
|
|
+ echo " ( cd '$(DESTDIR)$(libgtopincludedir)' && rm -f" $$files ")"; \
|
|
+ cd "$(DESTDIR)$(libgtopincludedir)" && rm -f $$files
|
|
|
|
# This directory's subdirectories are mostly independent; you can cd
|
|
# into them and run `make' without going through this Makefile.
|
|
@@ -430,7 +464,7 @@ $(RECURSIVE_TARGETS):
|
|
else \
|
|
local_target="$$target"; \
|
|
fi; \
|
|
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
|
|
+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
|
|
|| eval $$failcom; \
|
|
done; \
|
|
if test "$$dot_seen" = "no"; then \
|
|
@@ -464,16 +498,16 @@ $(RECURSIVE_CLEAN_TARGETS):
|
|
else \
|
|
local_target="$$target"; \
|
|
fi; \
|
|
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
|
|
+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
|
|
|| eval $$failcom; \
|
|
done && test -z "$$fail"
|
|
tags-recursive:
|
|
list='$(SUBDIRS)'; for subdir in $$list; do \
|
|
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
|
|
+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
|
|
done
|
|
ctags-recursive:
|
|
list='$(SUBDIRS)'; for subdir in $$list; do \
|
|
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
|
|
+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
|
|
done
|
|
|
|
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
|
|
@@ -488,7 +522,7 @@ tags: TAGS
|
|
|
|
TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
|
|
$(TAGS_FILES) $(LISP)
|
|
- tags=; \
|
|
+ set x; \
|
|
here=`pwd`; \
|
|
if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
|
|
include_option=--etags-include; \
|
|
@@ -500,7 +534,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE
|
|
list='$(SUBDIRS)'; for subdir in $$list; do \
|
|
if test "$$subdir" = .; then :; else \
|
|
test ! -f $$subdir/TAGS || \
|
|
- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
|
|
+ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
|
|
fi; \
|
|
done; \
|
|
list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
|
|
@@ -509,36 +543,41 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE
|
|
done | \
|
|
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
|
|
END { if (nonempty) { for (i in files) print i; }; }'`; \
|
|
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
|
|
+ shift; \
|
|
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
|
|
test -n "$$unique" || unique=$$empty_fix; \
|
|
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
|
|
- $$tags $$unique; \
|
|
+ if test $$# -gt 0; then \
|
|
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
|
|
+ "$$@" $$unique; \
|
|
+ else \
|
|
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
|
|
+ $$unique; \
|
|
+ fi; \
|
|
fi
|
|
ctags: CTAGS
|
|
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
|
|
$(TAGS_FILES) $(LISP)
|
|
- tags=; \
|
|
list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
|
|
unique=`for i in $$list; do \
|
|
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
|
|
done | \
|
|
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
|
|
END { if (nonempty) { for (i in files) print i; }; }'`; \
|
|
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
|
|
+ test -z "$(CTAGS_ARGS)$$unique" \
|
|
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
|
|
- $$tags $$unique
|
|
+ $$unique
|
|
|
|
GTAGS:
|
|
here=`$(am__cd) $(top_builddir) && pwd` \
|
|
- && cd $(top_srcdir) \
|
|
- && gtags -i $(GTAGS_ARGS) $$here
|
|
+ && $(am__cd) $(top_srcdir) \
|
|
+ && gtags -i $(GTAGS_ARGS) "$$here"
|
|
|
|
distclean-tags:
|
|
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
|
|
|
|
distdir: $(DISTFILES)
|
|
$(am__remove_distdir)
|
|
- test -d $(distdir) || mkdir $(distdir)
|
|
+ test -d "$(distdir)" || mkdir "$(distdir)"
|
|
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
|
|
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
|
|
list='$(DISTFILES)'; \
|
|
@@ -554,29 +593,44 @@ distdir: $(DISTFILES)
|
|
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
|
|
if test -d $$d/$$file; then \
|
|
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
|
|
+ if test -d "$(distdir)/$$file"; then \
|
|
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
|
|
+ fi; \
|
|
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
|
|
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
|
|
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
|
|
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
|
|
fi; \
|
|
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
|
|
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
|
|
else \
|
|
- test -f $(distdir)/$$file \
|
|
- || cp -p $$d/$$file $(distdir)/$$file \
|
|
+ test -f "$(distdir)/$$file" \
|
|
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|
|
|| exit 1; \
|
|
fi; \
|
|
done
|
|
- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
|
|
+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
|
|
if test "$$subdir" = .; then :; else \
|
|
test -d "$(distdir)/$$subdir" \
|
|
|| $(MKDIR_P) "$(distdir)/$$subdir" \
|
|
|| exit 1; \
|
|
- distdir=`$(am__cd) $(distdir) && pwd`; \
|
|
- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
|
|
- (cd $$subdir && \
|
|
+ fi; \
|
|
+ done
|
|
+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
|
|
+ if test "$$subdir" = .; then :; else \
|
|
+ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
|
|
+ $(am__relativize); \
|
|
+ new_distdir=$$reldir; \
|
|
+ dir1=$$subdir; dir2="$(top_distdir)"; \
|
|
+ $(am__relativize); \
|
|
+ new_top_distdir=$$reldir; \
|
|
+ echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
|
|
+ echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
|
|
+ ($(am__cd) $$subdir && \
|
|
$(MAKE) $(AM_MAKEFLAGS) \
|
|
- top_distdir="$$top_distdir" \
|
|
- distdir="$$distdir/$$subdir" \
|
|
+ top_distdir="$$new_top_distdir" \
|
|
+ distdir="$$new_distdir" \
|
|
am__remove_distdir=: \
|
|
am__skip_length_check=: \
|
|
+ am__skip_mode_fix=: \
|
|
distdir) \
|
|
|| exit 1; \
|
|
fi; \
|
|
@@ -584,11 +638,12 @@ distdir: $(DISTFILES)
|
|
$(MAKE) $(AM_MAKEFLAGS) \
|
|
top_distdir="$(top_distdir)" distdir="$(distdir)" \
|
|
dist-hook
|
|
- -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
|
|
+ -test -n "$(am__skip_mode_fix)" \
|
|
+ || find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
|
|
! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
|
|
! -type d ! -perm -400 -exec chmod a+r {} \; -o \
|
|
! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
|
|
- || chmod -R a+r $(distdir)
|
|
+ || chmod -R a+r "$(distdir)"
|
|
dist-gzip: distdir
|
|
tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
|
|
$(am__remove_distdir)
|
|
@@ -601,6 +656,10 @@ dist-lzma: distdir
|
|
tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
|
|
$(am__remove_distdir)
|
|
|
|
+dist-xz: distdir
|
|
+ tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz
|
|
+ $(am__remove_distdir)
|
|
+
|
|
dist-tarZ: distdir
|
|
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
|
|
$(am__remove_distdir)
|
|
@@ -629,6 +688,8 @@ distcheck: dist
|
|
bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
|
|
*.tar.lzma*) \
|
|
unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
|
|
+ *.tar.xz*) \
|
|
+ xz -dc $(distdir).tar.xz | $(am__untar) ;;\
|
|
*.tar.Z*) \
|
|
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
|
|
*.shar.gz*) \
|
|
@@ -640,9 +701,11 @@ distcheck: dist
|
|
mkdir $(distdir)/_build
|
|
mkdir $(distdir)/_inst
|
|
chmod a-w $(distdir)
|
|
+ test -d $(distdir)/_build || exit 0; \
|
|
dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
|
|
&& dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
|
|
- && cd $(distdir)/_build \
|
|
+ && am__cwd=`pwd` \
|
|
+ && $(am__cd) $(distdir)/_build \
|
|
&& ../configure --srcdir=.. --prefix="$$dc_install_base" \
|
|
$(DISTCHECK_CONFIGURE_FLAGS) \
|
|
&& $(MAKE) $(AM_MAKEFLAGS) \
|
|
@@ -664,13 +727,15 @@ distcheck: dist
|
|
&& rm -rf "$$dc_destdir" \
|
|
&& $(MAKE) $(AM_MAKEFLAGS) dist \
|
|
&& rm -rf $(DIST_ARCHIVES) \
|
|
- && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
|
|
+ && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
|
|
+ && cd "$$am__cwd" \
|
|
+ || exit 1
|
|
$(am__remove_distdir)
|
|
@(echo "$(distdir) archives ready for distribution: "; \
|
|
list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
|
|
sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
|
|
distuninstallcheck:
|
|
- @cd $(distuninstallcheck_dir) \
|
|
+ @$(am__cd) '$(distuninstallcheck_dir)' \
|
|
&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
|
|
|| { echo "ERROR: files left after uninstall:" ; \
|
|
if test -n "$(DESTDIR)"; then \
|
|
@@ -715,6 +780,7 @@ clean-generic:
|
|
|
|
distclean-generic:
|
|
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
|
|
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
|
|
-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
|
|
|
|
maintainer-clean-generic:
|
|
@@ -736,6 +802,8 @@ dvi-am:
|
|
|
|
html: html-recursive
|
|
|
|
+html-am:
|
|
+
|
|
info: info-recursive
|
|
|
|
info-am:
|
|
@@ -744,18 +812,28 @@ install-data-am: install-libgtopincludeH
|
|
|
|
install-dvi: install-dvi-recursive
|
|
|
|
+install-dvi-am:
|
|
+
|
|
install-exec-am:
|
|
|
|
install-html: install-html-recursive
|
|
|
|
+install-html-am:
|
|
+
|
|
install-info: install-info-recursive
|
|
|
|
+install-info-am:
|
|
+
|
|
install-man:
|
|
|
|
install-pdf: install-pdf-recursive
|
|
|
|
+install-pdf-am:
|
|
+
|
|
install-ps: install-ps-recursive
|
|
|
|
+install-ps-am:
|
|
+
|
|
installcheck-am:
|
|
|
|
maintainer-clean: maintainer-clean-recursive
|
|
@@ -778,14 +856,14 @@ ps-am:
|
|
|
|
uninstall-am: uninstall-libgtopincludeHEADERS uninstall-pkgconfigDATA
|
|
|
|
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
|
|
- install-strip
|
|
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \
|
|
+ ctags-recursive install-am install-strip tags-recursive
|
|
|
|
.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
|
|
all all-am am--refresh check check-am clean clean-generic \
|
|
clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
|
|
- dist-gzip dist-hook dist-lzma dist-shar dist-tarZ dist-zip \
|
|
- distcheck distclean distclean-generic distclean-hdr \
|
|
+ dist-gzip dist-hook dist-lzma dist-shar dist-tarZ dist-xz \
|
|
+ dist-zip distcheck distclean distclean-generic distclean-hdr \
|
|
distclean-libtool distclean-tags distcleancheck distdir \
|
|
distuninstallcheck dvi dvi-am html html-am info info-am \
|
|
install install-am install-data install-data-am install-dvi \
|
|
@@ -805,6 +883,7 @@ dist-hook:
|
|
|
|
libgtop-features.def: features.def
|
|
@LN_S@ $< $@
|
|
+
|
|
# Tell versions [3.59,3.63) of GNU make to not export all variables.
|
|
# Otherwise a system limit (for SysV at least) may be exceeded.
|
|
.NOEXPORT:
|
|
Index: libgtop-2.28.0/aclocal.m4
|
|
===================================================================
|
|
--- libgtop-2.28.0.orig/aclocal.m4 2009-11-22 17:53:39.653190245 +0100
|
|
+++ libgtop-2.28.0/aclocal.m4 2009-11-22 17:52:52.665187789 +0100
|
|
@@ -1,7 +1,7 @@
|
|
-# generated automatically by aclocal 1.10.2 -*- Autoconf -*-
|
|
+# generated automatically by aclocal 1.11 -*- Autoconf -*-
|
|
|
|
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
|
|
-# 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
|
|
+# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
|
|
# This file is free software; the Free Software Foundation
|
|
# gives unlimited permission to copy and/or distribute it,
|
|
# with or without modifications, as long as this notice is preserved.
|
|
@@ -13,8 +13,8 @@
|
|
|
|
m4_ifndef([AC_AUTOCONF_VERSION],
|
|
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
|
|
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.61],,
|
|
-[m4_warning([this file was generated for autoconf 2.61.
|
|
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.64],,
|
|
+[m4_warning([this file was generated for autoconf 2.64.
|
|
You have another version of autoconf. It may work, but is not guaranteed to.
|
|
If you have problems, you may need to regenerate the build system entirely.
|
|
To do so, use the procedure documented by the package, typically `autoreconf'.])])
|
|
@@ -495,8 +495,9 @@ AC_DEFUN([GTK_DOC_CHECK],
|
|
|
|
dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml])
|
|
# serial 40 IT_PROG_INTLTOOL
|
|
-AC_DEFUN([IT_PROG_INTLTOOL],
|
|
-[AC_PREREQ([2.50])dnl
|
|
+AC_DEFUN([IT_PROG_INTLTOOL], [
|
|
+AC_PREREQ([2.50])dnl
|
|
+AC_REQUIRE([AM_NLS])dnl
|
|
|
|
case "$am__api_version" in
|
|
1.[01234])
|
|
@@ -545,30 +546,31 @@ INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.
|
|
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)
|
|
-AC_SUBST(INTLTOOL_KEYS_RULE)
|
|
-AC_SUBST(INTLTOOL_PROP_RULE)
|
|
-AC_SUBST(INTLTOOL_OAF_RULE)
|
|
-AC_SUBST(INTLTOOL_PONG_RULE)
|
|
-AC_SUBST(INTLTOOL_SERVER_RULE)
|
|
-AC_SUBST(INTLTOOL_SHEET_RULE)
|
|
-AC_SUBST(INTLTOOL_SOUNDLIST_RULE)
|
|
-AC_SUBST(INTLTOOL_UI_RULE)
|
|
-AC_SUBST(INTLTOOL_XAM_RULE)
|
|
-AC_SUBST(INTLTOOL_KBD_RULE)
|
|
-AC_SUBST(INTLTOOL_XML_RULE)
|
|
-AC_SUBST(INTLTOOL_XML_NOMERGE_RULE)
|
|
-AC_SUBST(INTLTOOL_CAVES_RULE)
|
|
-AC_SUBST(INTLTOOL_SCHEMAS_RULE)
|
|
-AC_SUBST(INTLTOOL_THEME_RULE)
|
|
-AC_SUBST(INTLTOOL_SERVICE_RULE)
|
|
-AC_SUBST(INTLTOOL_POLICY_RULE)
|
|
+_IT_SUBST(INTLTOOL_DESKTOP_RULE)
|
|
+_IT_SUBST(INTLTOOL_DIRECTORY_RULE)
|
|
+_IT_SUBST(INTLTOOL_KEYS_RULE)
|
|
+_IT_SUBST(INTLTOOL_PROP_RULE)
|
|
+_IT_SUBST(INTLTOOL_OAF_RULE)
|
|
+_IT_SUBST(INTLTOOL_PONG_RULE)
|
|
+_IT_SUBST(INTLTOOL_SERVER_RULE)
|
|
+_IT_SUBST(INTLTOOL_SHEET_RULE)
|
|
+_IT_SUBST(INTLTOOL_SOUNDLIST_RULE)
|
|
+_IT_SUBST(INTLTOOL_UI_RULE)
|
|
+_IT_SUBST(INTLTOOL_XAM_RULE)
|
|
+_IT_SUBST(INTLTOOL_KBD_RULE)
|
|
+_IT_SUBST(INTLTOOL_XML_RULE)
|
|
+_IT_SUBST(INTLTOOL_XML_NOMERGE_RULE)
|
|
+_IT_SUBST(INTLTOOL_CAVES_RULE)
|
|
+_IT_SUBST(INTLTOOL_SCHEMAS_RULE)
|
|
+_IT_SUBST(INTLTOOL_THEME_RULE)
|
|
+_IT_SUBST(INTLTOOL_SERVICE_RULE)
|
|
+_IT_SUBST(INTLTOOL_POLICY_RULE)
|
|
|
|
# Check the gettext tools to make sure they are GNU
|
|
AC_PATH_PROG(XGETTEXT, xgettext)
|
|
AC_PATH_PROG(MSGMERGE, msgmerge)
|
|
AC_PATH_PROG(MSGFMT, msgfmt)
|
|
+AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
|
|
if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then
|
|
AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
|
|
fi
|
|
@@ -579,12 +581,17 @@ if test -z "$xgversion" -o -z "$mmversio
|
|
AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
|
|
fi
|
|
|
|
-AC_PATH_PROG(INTLTOOL_PERL, [perl])
|
|
+AC_PATH_PROG(INTLTOOL_PERL, perl)
|
|
if test -z "$INTLTOOL_PERL"; then
|
|
- AC_MSG_ERROR([perl not found; required for intltool])
|
|
+ AC_MSG_ERROR([perl not found])
|
|
fi
|
|
-if test -z "`$INTLTOOL_PERL -v | fgrep '5.' 2> /dev/null`"; then
|
|
- AC_MSG_ERROR([perl 5.x required for intltool])
|
|
+AC_MSG_CHECKING([for perl >= 5.8.1])
|
|
+$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1
|
|
+if test $? -ne 0; then
|
|
+ AC_MSG_ERROR([perl 5.8.1 is required for intltool])
|
|
+else
|
|
+ IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`"
|
|
+ AC_MSG_RESULT([$IT_PERL_VERSION])
|
|
fi
|
|
if test "x$2" != "xno-xml"; then
|
|
AC_MSG_CHECKING([for XML::Parser])
|
|
@@ -640,6 +647,9 @@ dnl The following CONFIG_COMMANDS should
|
|
dnl of config.status.
|
|
AC_CONFIG_COMMANDS_PRE([
|
|
AC_CONFIG_COMMANDS([$1/stamp-it], [
|
|
+ if [ ! grep "^# INTLTOOL_MAKEFILE$" "$1/Makefile.in" > /dev/null ]; then
|
|
+ AC_MSG_ERROR([$1/Makefile.in.in was not created by intltoolize.])
|
|
+ fi
|
|
rm -f "$1/stamp-it" "$1/stamp-it.tmp" "$1/POTFILES" "$1/Makefile.tmp"
|
|
>"$1/stamp-it.tmp"
|
|
[sed '/^#/d
|
|
@@ -648,21 +658,27 @@ AC_CONFIG_COMMANDS_PRE([
|
|
'"s|^| $ac_top_srcdir/|" \
|
|
"$srcdir/$1/POTFILES.in" | sed '$!s/$/ \\/' >"$1/POTFILES"
|
|
]
|
|
- if test ! -f "$1/Makefile"; then
|
|
- AC_MSG_ERROR([$1/Makefile is not ready.])
|
|
- fi
|
|
- mv "$1/Makefile" "$1/Makefile.tmp"
|
|
[sed '/^POTFILES =/,/[^\\]$/ {
|
|
/^POTFILES =/!d
|
|
r $1/POTFILES
|
|
}
|
|
- ' "$1/Makefile.tmp" >"$1/Makefile"]
|
|
+ ' "$1/Makefile.in" >"$1/Makefile"]
|
|
rm -f "$1/Makefile.tmp"
|
|
mv "$1/stamp-it.tmp" "$1/stamp-it"
|
|
])
|
|
])dnl
|
|
])
|
|
|
|
+# _IT_SUBST(VARIABLE)
|
|
+# -------------------
|
|
+# Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST
|
|
+#
|
|
+AC_DEFUN([_IT_SUBST],
|
|
+[
|
|
+AC_SUBST([$1])
|
|
+m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])])
|
|
+]
|
|
+)
|
|
|
|
# deprecated macros
|
|
AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL])
|
|
@@ -8635,6 +8651,38 @@ m4_ifndef([_LT_AC_LANG_RC_CONFIG], [AC_D
|
|
m4_ifndef([AC_LIBTOOL_CONFIG], [AC_DEFUN([AC_LIBTOOL_CONFIG])])
|
|
m4_ifndef([_LT_AC_FILE_LTDLL_C], [AC_DEFUN([_LT_AC_FILE_LTDLL_C])])
|
|
|
|
+# nls.m4 serial 3 (gettext-0.15)
|
|
+dnl Copyright (C) 1995-2003, 2005-2006 Free Software Foundation, Inc.
|
|
+dnl This file is free software; the Free Software Foundation
|
|
+dnl gives unlimited permission to copy and/or distribute it,
|
|
+dnl with or without modifications, as long as this notice is preserved.
|
|
+dnl
|
|
+dnl This file can can be used in projects which are not available under
|
|
+dnl the GNU General Public License or the GNU Library General Public
|
|
+dnl License but which still want to provide support for the GNU gettext
|
|
+dnl functionality.
|
|
+dnl Please note that the actual code of the GNU gettext library is covered
|
|
+dnl by the GNU Library General Public License, and the rest of the GNU
|
|
+dnl gettext package package is covered by the GNU General Public License.
|
|
+dnl They are *not* in the public domain.
|
|
+
|
|
+dnl Authors:
|
|
+dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
|
|
+dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003.
|
|
+
|
|
+AC_PREREQ(2.50)
|
|
+
|
|
+AC_DEFUN([AM_NLS],
|
|
+[
|
|
+ AC_MSG_CHECKING([whether NLS is requested])
|
|
+ dnl Default is enabled NLS
|
|
+ AC_ARG_ENABLE(nls,
|
|
+ [ --disable-nls do not use Native Language Support],
|
|
+ USE_NLS=$enableval, USE_NLS=yes)
|
|
+ AC_MSG_RESULT($USE_NLS)
|
|
+ AC_SUBST(USE_NLS)
|
|
+])
|
|
+
|
|
# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
|
|
#
|
|
# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
|
|
@@ -8805,10 +8853,10 @@ fi[]dnl
|
|
# generated from the m4 files accompanying Automake X.Y.
|
|
# (This private macro should not be called outside this file.)
|
|
AC_DEFUN([AM_AUTOMAKE_VERSION],
|
|
-[am__api_version='1.10'
|
|
+[am__api_version='1.11'
|
|
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
|
|
dnl require some minimum version. Point them to the right macro.
|
|
-m4_if([$1], [1.10.2], [],
|
|
+m4_if([$1], [1.11], [],
|
|
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
|
|
])
|
|
|
|
@@ -8824,7 +8872,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
|
|
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
|
|
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
|
|
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
|
|
-[AM_AUTOMAKE_VERSION([1.10.2])dnl
|
|
+[AM_AUTOMAKE_VERSION([1.11])dnl
|
|
m4_ifndef([AC_AUTOCONF_VERSION],
|
|
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
|
|
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
|
|
@@ -8884,14 +8932,14 @@ am_aux_dir=`cd $ac_aux_dir && pwd`
|
|
|
|
# AM_CONDITIONAL -*- Autoconf -*-
|
|
|
|
-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006
|
|
+# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008
|
|
# Free Software Foundation, Inc.
|
|
#
|
|
# This file is free software; the Free Software Foundation
|
|
# gives unlimited permission to copy and/or distribute it,
|
|
# with or without modifications, as long as this notice is preserved.
|
|
|
|
-# serial 8
|
|
+# serial 9
|
|
|
|
# AM_CONDITIONAL(NAME, SHELL-CONDITION)
|
|
# -------------------------------------
|
|
@@ -8904,6 +8952,7 @@ AC_SUBST([$1_TRUE])dnl
|
|
AC_SUBST([$1_FALSE])dnl
|
|
_AM_SUBST_NOTMAKE([$1_TRUE])dnl
|
|
_AM_SUBST_NOTMAKE([$1_FALSE])dnl
|
|
+m4_define([_AM_COND_VALUE_$1], [$2])dnl
|
|
if $2; then
|
|
$1_TRUE=
|
|
$1_FALSE='#'
|
|
@@ -8917,14 +8966,14 @@ AC_CONFIG_COMMANDS_PRE(
|
|
Usually this means the macro was only invoked conditionally.]])
|
|
fi])])
|
|
|
|
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
|
|
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009
|
|
# Free Software Foundation, Inc.
|
|
#
|
|
# This file is free software; the Free Software Foundation
|
|
# gives unlimited permission to copy and/or distribute it,
|
|
# with or without modifications, as long as this notice is preserved.
|
|
|
|
-# serial 9
|
|
+# serial 10
|
|
|
|
# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
|
|
# written in clear, in which case automake, when reading aclocal.m4,
|
|
@@ -8981,6 +9030,16 @@ AC_CACHE_CHECK([dependency style of $dep
|
|
if test "$am_compiler_list" = ""; then
|
|
am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
|
|
fi
|
|
+ am__universal=false
|
|
+ m4_case([$1], [CC],
|
|
+ [case " $depcc " in #(
|
|
+ *\ -arch\ *\ -arch\ *) am__universal=true ;;
|
|
+ esac],
|
|
+ [CXX],
|
|
+ [case " $depcc " in #(
|
|
+ *\ -arch\ *\ -arch\ *) am__universal=true ;;
|
|
+ esac])
|
|
+
|
|
for depmode in $am_compiler_list; do
|
|
# Setup a source with many dependencies, because some compilers
|
|
# like to wrap large dependency lists on column 80 (with \), and
|
|
@@ -8998,7 +9057,17 @@ AC_CACHE_CHECK([dependency style of $dep
|
|
done
|
|
echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
|
|
|
|
+ # We check with `-c' and `-o' for the sake of the "dashmstdout"
|
|
+ # mode. It turns out that the SunPro C++ compiler does not properly
|
|
+ # handle `-M -o', and we need to detect this. Also, some Intel
|
|
+ # versions had trouble with output in subdirs
|
|
+ am__obj=sub/conftest.${OBJEXT-o}
|
|
+ am__minus_obj="-o $am__obj"
|
|
case $depmode in
|
|
+ gcc)
|
|
+ # This depmode causes a compiler race in universal mode.
|
|
+ test "$am__universal" = false || continue
|
|
+ ;;
|
|
nosideeffect)
|
|
# after this tag, mechanisms are not by side-effect, so they'll
|
|
# only be used when explicitly requested
|
|
@@ -9008,19 +9077,23 @@ AC_CACHE_CHECK([dependency style of $dep
|
|
break
|
|
fi
|
|
;;
|
|
+ msvisualcpp | msvcmsys)
|
|
+ # This compiler won't grok `-c -o', but also, the minuso test has
|
|
+ # not run yet. These depmodes are late enough in the game, and
|
|
+ # so weak that their functioning should not be impacted.
|
|
+ am__obj=conftest.${OBJEXT-o}
|
|
+ am__minus_obj=
|
|
+ ;;
|
|
none) break ;;
|
|
esac
|
|
- # We check with `-c' and `-o' for the sake of the "dashmstdout"
|
|
- # mode. It turns out that the SunPro C++ compiler does not properly
|
|
- # handle `-M -o', and we need to detect this.
|
|
if depmode=$depmode \
|
|
- source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
|
|
+ source=sub/conftest.c object=$am__obj \
|
|
depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
|
|
- $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
|
|
+ $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
|
|
>/dev/null 2>conftest.err &&
|
|
grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
|
|
grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
|
|
- grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
|
|
+ grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
|
|
${MAKE-make} -s -f confmf > /dev/null 2>&1; then
|
|
# icc doesn't choke on unknown options, it will just issue warnings
|
|
# or remarks (even with -Werror). So we grep stderr for any message
|
|
@@ -9084,59 +9157,61 @@ _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
|
|
# gives unlimited permission to copy and/or distribute it,
|
|
# with or without modifications, as long as this notice is preserved.
|
|
|
|
-#serial 4
|
|
+#serial 5
|
|
|
|
# _AM_OUTPUT_DEPENDENCY_COMMANDS
|
|
# ------------------------------
|
|
AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
|
|
-[# Autoconf 2.62 quotes --file arguments for eval, but not when files
|
|
-# are listed without --file. Let's play safe and only enable the eval
|
|
-# if we detect the quoting.
|
|
-case $CONFIG_FILES in
|
|
-*\'*) eval set x "$CONFIG_FILES" ;;
|
|
-*) set x $CONFIG_FILES ;;
|
|
-esac
|
|
-shift
|
|
-for mf
|
|
-do
|
|
- # Strip MF so we end up with the name of the file.
|
|
- mf=`echo "$mf" | sed -e 's/:.*$//'`
|
|
- # Check whether this is an Automake generated Makefile or not.
|
|
- # We used to match only the files named `Makefile.in', but
|
|
- # some people rename them; so instead we look at the file content.
|
|
- # Grep'ing the first line is not enough: some people post-process
|
|
- # each Makefile.in and add a new line on top of each file to say so.
|
|
- # Grep'ing the whole file is not good either: AIX grep has a line
|
|
- # limit of 2048, but all sed's we know have understand at least 4000.
|
|
- if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
|
|
- dirpart=`AS_DIRNAME("$mf")`
|
|
- else
|
|
- continue
|
|
- fi
|
|
- # Extract the definition of DEPDIR, am__include, and am__quote
|
|
- # from the Makefile without running `make'.
|
|
- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
|
|
- test -z "$DEPDIR" && continue
|
|
- am__include=`sed -n 's/^am__include = //p' < "$mf"`
|
|
- test -z "am__include" && continue
|
|
- am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
|
|
- # When using ansi2knr, U may be empty or an underscore; expand it
|
|
- U=`sed -n 's/^U = //p' < "$mf"`
|
|
- # Find all dependency output files, they are included files with
|
|
- # $(DEPDIR) in their names. We invoke sed twice because it is the
|
|
- # simplest approach to changing $(DEPDIR) to its actual value in the
|
|
- # expansion.
|
|
- for file in `sed -n "
|
|
- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
|
|
- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
|
|
- # Make sure the directory exists.
|
|
- test -f "$dirpart/$file" && continue
|
|
- fdir=`AS_DIRNAME(["$file"])`
|
|
- AS_MKDIR_P([$dirpart/$fdir])
|
|
- # echo "creating $dirpart/$file"
|
|
- echo '# dummy' > "$dirpart/$file"
|
|
+[{
|
|
+ # Autoconf 2.62 quotes --file arguments for eval, but not when files
|
|
+ # are listed without --file. Let's play safe and only enable the eval
|
|
+ # if we detect the quoting.
|
|
+ case $CONFIG_FILES in
|
|
+ *\'*) eval set x "$CONFIG_FILES" ;;
|
|
+ *) set x $CONFIG_FILES ;;
|
|
+ esac
|
|
+ shift
|
|
+ for mf
|
|
+ do
|
|
+ # Strip MF so we end up with the name of the file.
|
|
+ mf=`echo "$mf" | sed -e 's/:.*$//'`
|
|
+ # Check whether this is an Automake generated Makefile or not.
|
|
+ # We used to match only the files named `Makefile.in', but
|
|
+ # some people rename them; so instead we look at the file content.
|
|
+ # Grep'ing the first line is not enough: some people post-process
|
|
+ # each Makefile.in and add a new line on top of each file to say so.
|
|
+ # Grep'ing the whole file is not good either: AIX grep has a line
|
|
+ # limit of 2048, but all sed's we know have understand at least 4000.
|
|
+ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
|
|
+ dirpart=`AS_DIRNAME("$mf")`
|
|
+ else
|
|
+ continue
|
|
+ fi
|
|
+ # Extract the definition of DEPDIR, am__include, and am__quote
|
|
+ # from the Makefile without running `make'.
|
|
+ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
|
|
+ test -z "$DEPDIR" && continue
|
|
+ am__include=`sed -n 's/^am__include = //p' < "$mf"`
|
|
+ test -z "am__include" && continue
|
|
+ am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
|
|
+ # When using ansi2knr, U may be empty or an underscore; expand it
|
|
+ U=`sed -n 's/^U = //p' < "$mf"`
|
|
+ # Find all dependency output files, they are included files with
|
|
+ # $(DEPDIR) in their names. We invoke sed twice because it is the
|
|
+ # simplest approach to changing $(DEPDIR) to its actual value in the
|
|
+ # expansion.
|
|
+ for file in `sed -n "
|
|
+ s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
|
|
+ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
|
|
+ # Make sure the directory exists.
|
|
+ test -f "$dirpart/$file" && continue
|
|
+ fdir=`AS_DIRNAME(["$file"])`
|
|
+ AS_MKDIR_P([$dirpart/$fdir])
|
|
+ # echo "creating $dirpart/$file"
|
|
+ echo '# dummy' > "$dirpart/$file"
|
|
+ done
|
|
done
|
|
-done
|
|
+}
|
|
])# _AM_OUTPUT_DEPENDENCY_COMMANDS
|
|
|
|
|
|
@@ -9156,13 +9231,13 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS]
|
|
# Do all the work for Automake. -*- Autoconf -*-
|
|
|
|
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
|
|
-# 2005, 2006, 2008 Free Software Foundation, Inc.
|
|
+# 2005, 2006, 2008, 2009 Free Software Foundation, Inc.
|
|
#
|
|
# This file is free software; the Free Software Foundation
|
|
# gives unlimited permission to copy and/or distribute it,
|
|
# with or without modifications, as long as this notice is preserved.
|
|
|
|
-# serial 13
|
|
+# serial 16
|
|
|
|
# This macro actually does too much. Some checks are only needed if
|
|
# your package does certain things. But this isn't really a big deal.
|
|
@@ -9179,7 +9254,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS]
|
|
# arguments mandatory, and then we can depend on a new Autoconf
|
|
# release and drop the old call support.
|
|
AC_DEFUN([AM_INIT_AUTOMAKE],
|
|
-[AC_PREREQ([2.60])dnl
|
|
+[AC_PREREQ([2.62])dnl
|
|
dnl Autoconf wants to disallow AM_ names. We explicitly allow
|
|
dnl the ones we care about.
|
|
m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
|
|
@@ -9230,8 +9305,8 @@ AM_MISSING_PROG(AUTOCONF, autoconf)
|
|
AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
|
|
AM_MISSING_PROG(AUTOHEADER, autoheader)
|
|
AM_MISSING_PROG(MAKEINFO, makeinfo)
|
|
-AM_PROG_INSTALL_SH
|
|
-AM_PROG_INSTALL_STRIP
|
|
+AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
|
|
+AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
|
|
AC_REQUIRE([AM_PROG_MKDIR_P])dnl
|
|
# We need awk for the "check" target. The system "awk" is bad on
|
|
# some platforms.
|
|
@@ -9239,23 +9314,36 @@ AC_REQUIRE([AC_PROG_AWK])dnl
|
|
AC_REQUIRE([AC_PROG_MAKE_SET])dnl
|
|
AC_REQUIRE([AM_SET_LEADING_DOT])dnl
|
|
_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
|
|
- [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
|
|
- [_AM_PROG_TAR([v7])])])
|
|
+ [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
|
|
+ [_AM_PROG_TAR([v7])])])
|
|
_AM_IF_OPTION([no-dependencies],,
|
|
[AC_PROVIDE_IFELSE([AC_PROG_CC],
|
|
- [_AM_DEPENDENCIES(CC)],
|
|
- [define([AC_PROG_CC],
|
|
- defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
|
|
+ [_AM_DEPENDENCIES(CC)],
|
|
+ [define([AC_PROG_CC],
|
|
+ defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
|
|
AC_PROVIDE_IFELSE([AC_PROG_CXX],
|
|
- [_AM_DEPENDENCIES(CXX)],
|
|
- [define([AC_PROG_CXX],
|
|
- defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
|
|
+ [_AM_DEPENDENCIES(CXX)],
|
|
+ [define([AC_PROG_CXX],
|
|
+ defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
|
|
AC_PROVIDE_IFELSE([AC_PROG_OBJC],
|
|
- [_AM_DEPENDENCIES(OBJC)],
|
|
- [define([AC_PROG_OBJC],
|
|
- defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
|
|
-])
|
|
-])
|
|
+ [_AM_DEPENDENCIES(OBJC)],
|
|
+ [define([AC_PROG_OBJC],
|
|
+ defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
|
|
+])
|
|
+_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl
|
|
+dnl The `parallel-tests' driver may need to know about EXEEXT, so add the
|
|
+dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro
|
|
+dnl is hooked onto _AC_COMPILER_EXEEXT early, see below.
|
|
+AC_CONFIG_COMMANDS_PRE(dnl
|
|
+[m4_provide_if([_AM_COMPILER_EXEEXT],
|
|
+ [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
|
|
+])
|
|
+
|
|
+dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
|
|
+dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
|
|
+dnl mangled by Autoconf and run in a shell conditional statement.
|
|
+m4_define([_AC_COMPILER_EXEEXT],
|
|
+m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
|
|
|
|
|
|
# When config.status generates a header, we must update the stamp-h file.
|
|
@@ -9279,7 +9367,7 @@ for _am_header in $config_headers :; do
|
|
done
|
|
echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
|
|
|
|
-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
|
|
+# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc.
|
|
#
|
|
# This file is free software; the Free Software Foundation
|
|
# gives unlimited permission to copy and/or distribute it,
|
|
@@ -9290,7 +9378,14 @@ echo "timestamp for $_am_arg" >`AS_DIRNA
|
|
# Define $install_sh.
|
|
AC_DEFUN([AM_PROG_INSTALL_SH],
|
|
[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
|
|
-install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
|
|
+if test x"${install_sh}" != xset; then
|
|
+ case $am_aux_dir in
|
|
+ *\ * | *\ *)
|
|
+ install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
|
|
+ *)
|
|
+ install_sh="\${SHELL} $am_aux_dir/install-sh"
|
|
+ esac
|
|
+fi
|
|
AC_SUBST(install_sh)])
|
|
|
|
# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
|
|
@@ -9316,13 +9411,13 @@ AC_SUBST([am__leading_dot])])
|
|
|
|
# Check to see how 'make' treats includes. -*- Autoconf -*-
|
|
|
|
-# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
|
|
+# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc.
|
|
#
|
|
# This file is free software; the Free Software Foundation
|
|
# gives unlimited permission to copy and/or distribute it,
|
|
# with or without modifications, as long as this notice is preserved.
|
|
|
|
-# serial 3
|
|
+# serial 4
|
|
|
|
# AM_MAKE_INCLUDE()
|
|
# -----------------
|
|
@@ -9331,7 +9426,7 @@ AC_DEFUN([AM_MAKE_INCLUDE],
|
|
[am_make=${MAKE-make}
|
|
cat > confinc << 'END'
|
|
am__doit:
|
|
- @echo done
|
|
+ @echo this is the am__doit target
|
|
.PHONY: am__doit
|
|
END
|
|
# If we don't find an include directive, just comment out the code.
|
|
@@ -9341,24 +9436,24 @@ am__quote=
|
|
_am_result=none
|
|
# First try GNU make style include.
|
|
echo "include confinc" > confmf
|
|
-# We grep out `Entering directory' and `Leaving directory'
|
|
-# messages which can occur if `w' ends up in MAKEFLAGS.
|
|
-# In particular we don't look at `^make:' because GNU make might
|
|
-# be invoked under some other name (usually "gmake"), in which
|
|
-# case it prints its new name instead of `make'.
|
|
-if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
|
|
- am__include=include
|
|
- am__quote=
|
|
- _am_result=GNU
|
|
-fi
|
|
+# Ignore all kinds of additional output from `make'.
|
|
+case `$am_make -s -f confmf 2> /dev/null` in #(
|
|
+*the\ am__doit\ target*)
|
|
+ am__include=include
|
|
+ am__quote=
|
|
+ _am_result=GNU
|
|
+ ;;
|
|
+esac
|
|
# Now try BSD make style include.
|
|
if test "$am__include" = "#"; then
|
|
echo '.include "confinc"' > confmf
|
|
- if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
|
|
- am__include=.include
|
|
- am__quote="\""
|
|
- _am_result=BSD
|
|
- fi
|
|
+ case `$am_make -s -f confmf 2> /dev/null` in #(
|
|
+ *the\ am__doit\ target*)
|
|
+ am__include=.include
|
|
+ am__quote="\""
|
|
+ _am_result=BSD
|
|
+ ;;
|
|
+ esac
|
|
fi
|
|
AC_SUBST([am__include])
|
|
AC_SUBST([am__quote])
|
|
@@ -9368,14 +9463,14 @@ rm -f confinc confmf
|
|
|
|
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
|
|
|
|
-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005
|
|
+# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008
|
|
# Free Software Foundation, Inc.
|
|
#
|
|
# This file is free software; the Free Software Foundation
|
|
# gives unlimited permission to copy and/or distribute it,
|
|
# with or without modifications, as long as this notice is preserved.
|
|
|
|
-# serial 5
|
|
+# serial 6
|
|
|
|
# AM_MISSING_PROG(NAME, PROGRAM)
|
|
# ------------------------------
|
|
@@ -9392,7 +9487,14 @@ AC_SUBST($1)])
|
|
AC_DEFUN([AM_MISSING_HAS_RUN],
|
|
[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
|
|
AC_REQUIRE_AUX_FILE([missing])dnl
|
|
-test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
|
|
+if test x"${MISSING+set}" != xset; then
|
|
+ case $am_aux_dir in
|
|
+ *\ * | *\ *)
|
|
+ MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
|
|
+ *)
|
|
+ MISSING="\${SHELL} $am_aux_dir/missing" ;;
|
|
+ esac
|
|
+fi
|
|
# Use eval to expand $SHELL
|
|
if eval "$MISSING --run true"; then
|
|
am_missing_run="$MISSING --run "
|
|
@@ -9463,14 +9565,14 @@ AC_DEFUN([_AM_IF_OPTION],
|
|
|
|
# Check to make sure that the build environment is sane. -*- Autoconf -*-
|
|
|
|
-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
|
|
+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008
|
|
# Free Software Foundation, Inc.
|
|
#
|
|
# This file is free software; the Free Software Foundation
|
|
# gives unlimited permission to copy and/or distribute it,
|
|
# with or without modifications, as long as this notice is preserved.
|
|
|
|
-# serial 4
|
|
+# serial 5
|
|
|
|
# AM_SANITY_CHECK
|
|
# ---------------
|
|
@@ -9479,16 +9581,29 @@ AC_DEFUN([AM_SANITY_CHECK],
|
|
# Just in case
|
|
sleep 1
|
|
echo timestamp > conftest.file
|
|
+# Reject unsafe characters in $srcdir or the absolute working directory
|
|
+# name. Accept space and tab only in the latter.
|
|
+am_lf='
|
|
+'
|
|
+case `pwd` in
|
|
+ *[[\\\"\#\$\&\'\`$am_lf]]*)
|
|
+ AC_MSG_ERROR([unsafe absolute working directory name]);;
|
|
+esac
|
|
+case $srcdir in
|
|
+ *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*)
|
|
+ AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);;
|
|
+esac
|
|
+
|
|
# Do `set' in a subshell so we don't clobber the current shell's
|
|
# arguments. Must try -L first in case configure is actually a
|
|
# symlink; some systems play weird games with the mod time of symlinks
|
|
# (eg FreeBSD returns the mod time of the symlink's containing
|
|
# directory).
|
|
if (
|
|
- set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
|
|
+ set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
|
|
if test "$[*]" = "X"; then
|
|
# -L didn't work.
|
|
- set X `ls -t $srcdir/configure conftest.file`
|
|
+ set X `ls -t "$srcdir/configure" conftest.file`
|
|
fi
|
|
rm -f conftest.file
|
|
if test "$[*]" != "X $srcdir/configure conftest.file" \
|
|
@@ -9541,18 +9656,25 @@ fi
|
|
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
|
|
AC_SUBST([INSTALL_STRIP_PROGRAM])])
|
|
|
|
-# Copyright (C) 2006 Free Software Foundation, Inc.
|
|
+# Copyright (C) 2006, 2008 Free Software Foundation, Inc.
|
|
#
|
|
# This file is free software; the Free Software Foundation
|
|
# gives unlimited permission to copy and/or distribute it,
|
|
# with or without modifications, as long as this notice is preserved.
|
|
|
|
+# serial 2
|
|
+
|
|
# _AM_SUBST_NOTMAKE(VARIABLE)
|
|
# ---------------------------
|
|
# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
|
|
# This macro is traced by Automake.
|
|
AC_DEFUN([_AM_SUBST_NOTMAKE])
|
|
|
|
+# AM_SUBST_NOTMAKE(VARIABLE)
|
|
+# ---------------------------
|
|
+# Public sister of _AM_SUBST_NOTMAKE.
|
|
+AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
|
|
+
|
|
# Check how to create a tarball. -*- Autoconf -*-
|
|
|
|
# Copyright (C) 2004, 2005 Free Software Foundation, Inc.
|
|
Index: libgtop-2.28.0/config.guess
|
|
===================================================================
|
|
--- libgtop-2.28.0.orig/config.guess 2009-11-22 17:53:39.553195824 +0100
|
|
+++ libgtop-2.28.0/config.guess 2009-11-22 17:53:09.225684515 +0100
|
|
@@ -1,10 +1,10 @@
|
|
#! /bin/sh
|
|
# Attempt to guess a canonical system name.
|
|
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
|
|
-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
|
|
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
|
|
# Free Software Foundation, Inc.
|
|
|
|
-timestamp='2008-01-23'
|
|
+timestamp='2009-06-10'
|
|
|
|
# This file is free software; you can redistribute it and/or modify it
|
|
# under the terms of the GNU General Public License as published by
|
|
@@ -170,7 +170,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
|
|
arm*|i386|m68k|ns32k|sh3*|sparc|vax)
|
|
eval $set_cc_for_build
|
|
if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
|
|
- | grep __ELF__ >/dev/null
|
|
+ | grep -q __ELF__
|
|
then
|
|
# Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
|
|
# Return netbsd for either. FIX?
|
|
@@ -324,6 +324,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
|
|
case `/usr/bin/uname -p` in
|
|
sparc) echo sparc-icl-nx7; exit ;;
|
|
esac ;;
|
|
+ s390x:SunOS:*:*)
|
|
+ echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
|
|
+ exit ;;
|
|
sun4H:SunOS:5.*:*)
|
|
echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
|
|
exit ;;
|
|
@@ -331,7 +334,20 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
|
|
echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
|
|
exit ;;
|
|
i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
|
|
- echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
|
|
+ eval $set_cc_for_build
|
|
+ SUN_ARCH="i386"
|
|
+ # If there is a compiler, see if it is configured for 64-bit objects.
|
|
+ # Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
|
|
+ # This test works for both compilers.
|
|
+ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
|
|
+ if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
|
|
+ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
|
|
+ grep IS_64BIT_ARCH >/dev/null
|
|
+ then
|
|
+ SUN_ARCH="x86_64"
|
|
+ fi
|
|
+ fi
|
|
+ echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
|
|
exit ;;
|
|
sun4*:SunOS:6*:*)
|
|
# According to config.sub, this is the proper way to canonicalize
|
|
@@ -640,7 +656,7 @@ EOF
|
|
# => hppa64-hp-hpux11.23
|
|
|
|
if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
|
|
- grep __LP64__ >/dev/null
|
|
+ grep -q __LP64__
|
|
then
|
|
HP_ARCH="hppa2.0w"
|
|
else
|
|
@@ -796,7 +812,7 @@ EOF
|
|
x86)
|
|
echo i586-pc-interix${UNAME_RELEASE}
|
|
exit ;;
|
|
- EM64T | authenticamd)
|
|
+ EM64T | authenticamd | genuineintel)
|
|
echo x86_64-unknown-interix${UNAME_RELEASE}
|
|
exit ;;
|
|
IA64)
|
|
@@ -806,6 +822,9 @@ EOF
|
|
[345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
|
|
echo i${UNAME_MACHINE}-pc-mks
|
|
exit ;;
|
|
+ 8664:Windows_NT:*)
|
|
+ echo x86_64-pc-mks
|
|
+ exit ;;
|
|
i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
|
|
# How do we know it's Interix rather than the generic POSIX subsystem?
|
|
# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
|
|
@@ -866,40 +885,17 @@ EOF
|
|
m68*:Linux:*:*)
|
|
echo ${UNAME_MACHINE}-unknown-linux-gnu
|
|
exit ;;
|
|
- mips:Linux:*:*)
|
|
+ mips:Linux:*:* | mips64:Linux:*:*)
|
|
eval $set_cc_for_build
|
|
sed 's/^ //' << EOF >$dummy.c
|
|
#undef CPU
|
|
- #undef mips
|
|
- #undef mipsel
|
|
+ #undef ${UNAME_MACHINE}
|
|
+ #undef ${UNAME_MACHINE}el
|
|
#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
|
|
- CPU=mipsel
|
|
+ CPU=${UNAME_MACHINE}el
|
|
#else
|
|
#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
|
|
- CPU=mips
|
|
- #else
|
|
- CPU=
|
|
- #endif
|
|
- #endif
|
|
-EOF
|
|
- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
|
|
- /^CPU/{
|
|
- s: ::g
|
|
- p
|
|
- }'`"
|
|
- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
|
|
- ;;
|
|
- mips64:Linux:*:*)
|
|
- eval $set_cc_for_build
|
|
- sed 's/^ //' << EOF >$dummy.c
|
|
- #undef CPU
|
|
- #undef mips64
|
|
- #undef mips64el
|
|
- #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
|
|
- CPU=mips64el
|
|
- #else
|
|
- #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
|
|
- CPU=mips64
|
|
+ CPU=${UNAME_MACHINE}
|
|
#else
|
|
CPU=
|
|
#endif
|
|
@@ -931,10 +927,13 @@ EOF
|
|
EV67) UNAME_MACHINE=alphaev67 ;;
|
|
EV68*) UNAME_MACHINE=alphaev68 ;;
|
|
esac
|
|
- objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
|
|
+ objdump --private-headers /bin/sh | grep -q ld.so.1
|
|
if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
|
|
echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
|
|
exit ;;
|
|
+ padre:Linux:*:*)
|
|
+ echo sparc-unknown-linux-gnu
|
|
+ exit ;;
|
|
parisc:Linux:*:* | hppa:Linux:*:*)
|
|
# Look for CPU level
|
|
case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
|
|
@@ -982,17 +981,6 @@ EOF
|
|
elf32-i386)
|
|
TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
|
|
;;
|
|
- a.out-i386-linux)
|
|
- echo "${UNAME_MACHINE}-pc-linux-gnuaout"
|
|
- exit ;;
|
|
- coff-i386)
|
|
- echo "${UNAME_MACHINE}-pc-linux-gnucoff"
|
|
- exit ;;
|
|
- "")
|
|
- # Either a pre-BFD a.out linker (linux-gnuoldld) or
|
|
- # one that does not give us useful --help.
|
|
- echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
|
|
- exit ;;
|
|
esac
|
|
# Determine whether the default compiler is a.out or elf
|
|
eval $set_cc_for_build
|
|
@@ -1058,7 +1046,7 @@ EOF
|
|
i*86:syllable:*:*)
|
|
echo ${UNAME_MACHINE}-pc-syllable
|
|
exit ;;
|
|
- i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
|
|
+ i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
|
|
echo i386-unknown-lynxos${UNAME_RELEASE}
|
|
exit ;;
|
|
i*86:*DOS:*:*)
|
|
@@ -1102,8 +1090,11 @@ EOF
|
|
pc:*:*:*)
|
|
# Left here for compatibility:
|
|
# uname -m prints for DJGPP always 'pc', but it prints nothing about
|
|
- # the processor, so we play safe by assuming i386.
|
|
- echo i386-pc-msdosdjgpp
|
|
+ # the processor, so we play safe by assuming i586.
|
|
+ # Note: whatever this is, it MUST be the same as what config.sub
|
|
+ # prints for the "djgpp" host, or else GDB configury will decide that
|
|
+ # this is a cross-build.
|
|
+ echo i586-pc-msdosdjgpp
|
|
exit ;;
|
|
Intel:Mach:3*:*)
|
|
echo i386-pc-mach3
|
|
@@ -1141,6 +1132,16 @@ EOF
|
|
3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
|
|
/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
|
|
&& { echo i486-ncr-sysv4; exit; } ;;
|
|
+ NCR*:*:4.2:* | MPRAS*:*:4.2:*)
|
|
+ OS_REL='.3'
|
|
+ test -r /etc/.relid \
|
|
+ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
|
|
+ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
|
|
+ && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
|
|
+ /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
|
|
+ && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
|
|
+ /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
|
|
+ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
|
|
m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
|
|
echo m68k-unknown-lynxos${UNAME_RELEASE}
|
|
exit ;;
|
|
@@ -1153,7 +1154,7 @@ EOF
|
|
rs6000:LynxOS:2.*:*)
|
|
echo rs6000-unknown-lynxos${UNAME_RELEASE}
|
|
exit ;;
|
|
- PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
|
|
+ PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
|
|
echo powerpc-unknown-lynxos${UNAME_RELEASE}
|
|
exit ;;
|
|
SM[BE]S:UNIX_SV:*:*)
|
|
@@ -1216,6 +1217,9 @@ EOF
|
|
BePC:BeOS:*:*) # BeOS running on Intel PC compatible.
|
|
echo i586-pc-beos
|
|
exit ;;
|
|
+ BePC:Haiku:*:*) # Haiku running on Intel PC compatible.
|
|
+ echo i586-pc-haiku
|
|
+ exit ;;
|
|
SX-4:SUPER-UX:*:*)
|
|
echo sx4-nec-superux${UNAME_RELEASE}
|
|
exit ;;
|
|
@@ -1324,6 +1328,9 @@ EOF
|
|
i*86:rdos:*:*)
|
|
echo ${UNAME_MACHINE}-pc-rdos
|
|
exit ;;
|
|
+ i*86:AROS:*:*)
|
|
+ echo ${UNAME_MACHINE}-pc-aros
|
|
+ exit ;;
|
|
esac
|
|
|
|
#echo '(No uname command or uname output not recognized.)' 1>&2
|
|
Index: libgtop-2.28.0/config.h.in
|
|
===================================================================
|
|
--- libgtop-2.28.0.orig/config.h.in 2009-11-22 17:53:38.609185477 +0100
|
|
+++ libgtop-2.28.0/config.h.in 2009-11-22 17:53:17.853684706 +0100
|
|
@@ -211,7 +211,7 @@
|
|
/* Define to 1 if you have the `strtoul' function. */
|
|
#undef HAVE_STRTOUL
|
|
|
|
-/* Define to 1 if `st_rdev' is member of `struct stat'. */
|
|
+/* Define to 1 if `struct stat' is a member of `st_rdev'. */
|
|
#undef HAVE_STRUCT_STAT_ST_RDEV
|
|
|
|
/* Define to 1 if your `struct stat' has `st_rdev'. Deprecated, use
|
|
@@ -307,7 +307,9 @@
|
|
#undef MOUNTED_FREAD_FSTYP
|
|
|
|
/* Define if there is a function named getfsstat for reading the list of
|
|
- mounted filesystems. [DEC], [Alpha], [running], [OSF/1] */
|
|
+ mounted filesystems.
|
|
+ [DEC], [ ], [79])[][]_m4_text_wrap_word([Alpha], [ ], [79])[][]_m4_text_wrap_word([running], [ ], [79])[][]_m4_text_wrap_word([OSF/1]
|
|
+ */
|
|
#undef MOUNTED_GETFSSTAT
|
|
|
|
/* Define if there is a function named getmnt for reading the list of mounted
|
|
@@ -316,7 +318,8 @@
|
|
|
|
/* Define if there is a function named getmntent for reading the list of
|
|
mounted filesystems, and that function takes a single argument.
|
|
- [4.3BSD,], [SunOS,], [HP-UX,], [Dynix,], [Irix] */
|
|
+ [4.3BSD,], [ ], [79])[][]_m4_text_wrap_word([SunOS,], [ ], [79])[][]_m4_text_wrap_word([HP-UX,], [ ], [79])[][]_m4_text_wrap_word([Dynix,], [ ], [79])[][]_m4_text_wrap_word([Irix]
|
|
+ */
|
|
#undef MOUNTED_GETMNTENT1
|
|
|
|
/* Define if there is a function named getmntent for reading the list of
|
|
@@ -354,6 +357,9 @@
|
|
/* Define to the one symbol short name of this package. */
|
|
#undef PACKAGE_TARNAME
|
|
|
|
+/* Define to the home page for this package. */
|
|
+#undef PACKAGE_URL
|
|
+
|
|
/* Define to the version of this package. */
|
|
#undef PACKAGE_VERSION
|
|
|
|
@@ -370,7 +376,7 @@
|
|
|
|
/* Define if the block counts reported by statfs may be truncated to 2GB and
|
|
the correct values may be stored in the f_spare array.
|
|
- [SunOS], [4.1.2,], [4.1.3,], [and], [4.1.3_U1], [are], [reported], [to], [have], [this], [problem.], [SunOS], [4.1.1], [seems], [not], [to], [be], [affected.]
|
|
+ [SunOS], [ ], [79])[][]_m4_text_wrap_word([4.1.2,], [ ], [79])[][]_m4_text_wrap_word([4.1.3,], [ ], [79])[][]_m4_text_wrap_word([and], [ ], [79])[][]_m4_text_wrap_word([4.1.3_U1], [ ], [79])[][]_m4_text_wrap_word([are], [ ], [79])[][]_m4_text_wrap_word([reported], [ ], [79])[][]_m4_text_wrap_word([to], [ ], [79])[][]_m4_text_wrap_word([have], [ ], [79])[][]_m4_text_wrap_word([this], [ ], [79])[][]_m4_text_wrap_word([problem.], [ ], [79])[][]_m4_text_wrap_word([SunOS], [ ], [79])[][]_m4_text_wrap_word([4.1.1], [ ], [79])[][]_m4_text_wrap_word([seems], [ ], [79])[][]_m4_text_wrap_word([not], [ ], [79])[][]_m4_text_wrap_word([to], [ ], [79])[][]_m4_text_wrap_word([be], [ ], [79])[][]_m4_text_wrap_word([affected.]
|
|
*/
|
|
#undef STATFS_TRUNCATES_BLOCK_COUNTS
|
|
|
|
@@ -379,21 +385,26 @@
|
|
#undef STAT_READ_FILSYS
|
|
|
|
/* Define if statfs takes 2 args and struct statfs has a field named f_bsize.
|
|
- [4.3BSD,], [SunOS], [4,], [HP-UX,], [AIX], [PS/2] */
|
|
+ [4.3BSD,], [ ], [79])[][]_m4_text_wrap_word([SunOS], [ ], [79])[][]_m4_text_wrap_word([4,], [ ], [79])[][]_m4_text_wrap_word([HP-UX,], [ ], [79])[][]_m4_text_wrap_word([AIX], [ ], [79])[][]_m4_text_wrap_word([PS/2]
|
|
+ */
|
|
#undef STAT_STATFS2_BSIZE
|
|
|
|
/* Define if statfs takes 2 args and struct statfs has a field named f_fsize.
|
|
- [4.4BSD,], [NetBSD] */
|
|
+ [4.4BSD,], [ ], [79])[][]_m4_text_wrap_word([NetBSD] */
|
|
#undef STAT_STATFS2_FSIZE
|
|
|
|
/* Define if statfs takes 2 args and the second argument has type struct
|
|
fs_data. [Ultrix] */
|
|
#undef STAT_STATFS2_FS_DATA
|
|
|
|
-/* Define if statfs takes 3 args. [DEC], [Alpha], [running], [OSF/1] */
|
|
+/* Define if statfs takes 3 args.
|
|
+ [DEC], [ ], [79])[][]_m4_text_wrap_word([Alpha], [ ], [79])[][]_m4_text_wrap_word([running], [ ], [79])[][]_m4_text_wrap_word([OSF/1]
|
|
+ */
|
|
#undef STAT_STATFS3_OSF1
|
|
|
|
-/* Define if statfs takes 4 args. [SVR3,], [Dynix,], [Irix,], [Dolphin] */
|
|
+/* Define if statfs takes 4 args.
|
|
+ [SVR3,], [ ], [79])[][]_m4_text_wrap_word([Dynix,], [ ], [79])[][]_m4_text_wrap_word([Irix,], [ ], [79])[][]_m4_text_wrap_word([Dolphin]
|
|
+ */
|
|
#undef STAT_STATFS4
|
|
|
|
/* Define if there is a function named statvfs. [SVR4] */
|
|
Index: libgtop-2.28.0/config.sub
|
|
===================================================================
|
|
--- libgtop-2.28.0.orig/config.sub 2009-11-22 17:53:39.461188388 +0100
|
|
+++ libgtop-2.28.0/config.sub 2009-11-22 17:53:09.233682738 +0100
|
|
@@ -1,10 +1,10 @@
|
|
#! /bin/sh
|
|
# Configuration validation subroutine script.
|
|
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
|
|
-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
|
|
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
|
|
# Free Software Foundation, Inc.
|
|
|
|
-timestamp='2008-01-16'
|
|
+timestamp='2009-06-11'
|
|
|
|
# This file is (in principle) common to ALL GNU software.
|
|
# The presence of a machine in this file suggests that SOME GNU software
|
|
@@ -122,6 +122,7 @@ maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-
|
|
case $maybe_os in
|
|
nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
|
|
uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
|
|
+ kopensolaris*-gnu* | \
|
|
storm-chaos* | os2-emx* | rtmk-nova*)
|
|
os=-$maybe_os
|
|
basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
|
|
@@ -152,6 +153,9 @@ case $os in
|
|
os=
|
|
basic_machine=$1
|
|
;;
|
|
+ -bluegene*)
|
|
+ os=-cnk
|
|
+ ;;
|
|
-sim | -cisco | -oki | -wec | -winbond)
|
|
os=
|
|
basic_machine=$1
|
|
@@ -249,13 +253,16 @@ case $basic_machine in
|
|
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
|
|
| i370 | i860 | i960 | ia64 \
|
|
| ip2k | iq2000 \
|
|
+ | lm32 \
|
|
| m32c | m32r | m32rle | m68000 | m68k | m88k \
|
|
- | maxq | mb | microblaze | mcore | mep \
|
|
+ | maxq | mb | microblaze | mcore | mep | metag \
|
|
| mips | mipsbe | mipseb | mipsel | mipsle \
|
|
| mips16 \
|
|
| mips64 | mips64el \
|
|
- | mips64vr | mips64vrel \
|
|
+ | mips64octeon | mips64octeonel \
|
|
| mips64orion | mips64orionel \
|
|
+ | mips64r5900 | mips64r5900el \
|
|
+ | mips64vr | mips64vrel \
|
|
| mips64vr4100 | mips64vr4100el \
|
|
| mips64vr4300 | mips64vr4300el \
|
|
| mips64vr5000 | mips64vr5000el \
|
|
@@ -268,6 +275,7 @@ case $basic_machine in
|
|
| mipsisa64sr71k | mipsisa64sr71kel \
|
|
| mipstx39 | mipstx39el \
|
|
| mn10200 | mn10300 \
|
|
+ | moxie \
|
|
| mt \
|
|
| msp430 \
|
|
| nios | nios2 \
|
|
@@ -277,7 +285,7 @@ case $basic_machine in
|
|
| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
|
|
| pyramid \
|
|
| score \
|
|
- | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
|
|
+ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
|
|
| sh64 | sh64le \
|
|
| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
|
|
| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
|
|
@@ -286,7 +294,7 @@ case $basic_machine in
|
|
| v850 | v850e \
|
|
| we32k \
|
|
| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
|
|
- | z8k)
|
|
+ | z8k | z80)
|
|
basic_machine=$basic_machine-unknown
|
|
;;
|
|
m6811 | m68hc11 | m6812 | m68hc12)
|
|
@@ -329,14 +337,17 @@ case $basic_machine in
|
|
| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
|
|
| i*86-* | i860-* | i960-* | ia64-* \
|
|
| ip2k-* | iq2000-* \
|
|
+ | lm32-* \
|
|
| m32c-* | m32r-* | m32rle-* \
|
|
| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
|
|
- | m88110-* | m88k-* | maxq-* | mcore-* \
|
|
+ | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
|
|
| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
|
|
| mips16-* \
|
|
| mips64-* | mips64el-* \
|
|
- | mips64vr-* | mips64vrel-* \
|
|
+ | mips64octeon-* | mips64octeonel-* \
|
|
| mips64orion-* | mips64orionel-* \
|
|
+ | mips64r5900-* | mips64r5900el-* \
|
|
+ | mips64vr-* | mips64vrel-* \
|
|
| mips64vr4100-* | mips64vr4100el-* \
|
|
| mips64vr4300-* | mips64vr4300el-* \
|
|
| mips64vr5000-* | mips64vr5000el-* \
|
|
@@ -358,20 +369,20 @@ case $basic_machine in
|
|
| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
|
|
| pyramid-* \
|
|
| romp-* | rs6000-* \
|
|
- | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
|
|
+ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
|
|
| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
|
|
| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
|
|
| sparclite-* \
|
|
| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
|
|
| tahoe-* | thumb-* \
|
|
- | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
|
|
+ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
|
|
| tron-* \
|
|
| v850-* | v850e-* | vax-* \
|
|
| we32k-* \
|
|
| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
|
|
| xstormy16-* | xtensa*-* \
|
|
| ymp-* \
|
|
- | z8k-*)
|
|
+ | z8k-* | z80-*)
|
|
;;
|
|
# Recognize the basic CPU types without company name, with glob match.
|
|
xtensa*)
|
|
@@ -439,6 +450,10 @@ case $basic_machine in
|
|
basic_machine=m68k-apollo
|
|
os=-bsd
|
|
;;
|
|
+ aros)
|
|
+ basic_machine=i386-pc
|
|
+ os=-aros
|
|
+ ;;
|
|
aux)
|
|
basic_machine=m68k-apple
|
|
os=-aux
|
|
@@ -455,10 +470,18 @@ case $basic_machine in
|
|
basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
|
|
os=-linux
|
|
;;
|
|
+ bluegene*)
|
|
+ basic_machine=powerpc-ibm
|
|
+ os=-cnk
|
|
+ ;;
|
|
c90)
|
|
basic_machine=c90-cray
|
|
os=-unicos
|
|
;;
|
|
+ cegcc)
|
|
+ basic_machine=arm-unknown
|
|
+ os=-cegcc
|
|
+ ;;
|
|
convex-c1)
|
|
basic_machine=c1-convex
|
|
os=-bsd
|
|
@@ -526,6 +549,10 @@ case $basic_machine in
|
|
basic_machine=m88k-motorola
|
|
os=-sysv3
|
|
;;
|
|
+ dicos)
|
|
+ basic_machine=i686-pc
|
|
+ os=-dicos
|
|
+ ;;
|
|
djgpp)
|
|
basic_machine=i586-pc
|
|
os=-msdosdjgpp
|
|
@@ -1128,6 +1155,10 @@ case $basic_machine in
|
|
basic_machine=z8k-unknown
|
|
os=-sim
|
|
;;
|
|
+ z80-*-coff)
|
|
+ basic_machine=z80-unknown
|
|
+ os=-sim
|
|
+ ;;
|
|
none)
|
|
basic_machine=none-none
|
|
os=-none
|
|
@@ -1166,7 +1197,7 @@ case $basic_machine in
|
|
we32k)
|
|
basic_machine=we32k-att
|
|
;;
|
|
- sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
|
|
+ sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
|
|
basic_machine=sh-unknown
|
|
;;
|
|
sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
|
|
@@ -1236,10 +1267,11 @@ case $os in
|
|
# Each alternative MUST END IN A *, to match a version number.
|
|
# -sysv* is not here because it comes later, after sysvr4.
|
|
-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
|
|
- | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
|
|
+ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
|
|
| -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
|
|
+ | -kopensolaris* \
|
|
| -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
|
|
- | -aos* \
|
|
+ | -aos* | -aros* \
|
|
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
|
|
| -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
|
|
| -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
|
|
@@ -1248,7 +1280,7 @@ case $os in
|
|
| -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
|
|
| -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
|
|
| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
|
|
- | -chorusos* | -chorusrdb* \
|
|
+ | -chorusos* | -chorusrdb* | -cegcc* \
|
|
| -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
|
|
| -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
|
|
| -uxpv* | -beos* | -mpeix* | -udk* \
|
|
@@ -1388,6 +1420,9 @@ case $os in
|
|
-zvmoe)
|
|
os=-zvmoe
|
|
;;
|
|
+ -dicos*)
|
|
+ os=-dicos
|
|
+ ;;
|
|
-none)
|
|
;;
|
|
*)
|
|
@@ -1585,7 +1620,7 @@ case $basic_machine in
|
|
-sunos*)
|
|
vendor=sun
|
|
;;
|
|
- -aix*)
|
|
+ -cnk*|-aix*)
|
|
vendor=ibm
|
|
;;
|
|
-beos*)
|
|
Index: libgtop-2.28.0/depcomp
|
|
===================================================================
|
|
--- libgtop-2.28.0.orig/depcomp 2009-11-22 17:53:39.061684960 +0100
|
|
+++ libgtop-2.28.0/depcomp 2009-11-22 17:53:11.801689771 +0100
|
|
@@ -1,10 +1,10 @@
|
|
#! /bin/sh
|
|
# depcomp - compile a program generating dependencies as side-effects
|
|
|
|
-scriptversion=2007-03-29.01
|
|
+scriptversion=2009-04-28.21; # UTC
|
|
|
|
-# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007 Free Software
|
|
-# Foundation, Inc.
|
|
+# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free
|
|
+# Software Foundation, Inc.
|
|
|
|
# This program is free software; you can redistribute it and/or modify
|
|
# it under the terms of the GNU General Public License as published by
|
|
@@ -17,9 +17,7 @@ scriptversion=2007-03-29.01
|
|
# GNU General Public License for more details.
|
|
|
|
# You should have received a copy of the GNU General Public License
|
|
-# along with this program; if not, write to the Free Software
|
|
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
|
|
-# 02110-1301, USA.
|
|
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
# As a special exception to the GNU General Public License, if you
|
|
# distribute this file as part of a program that contains a
|
|
@@ -87,6 +85,15 @@ if test "$depmode" = dashXmstdout; then
|
|
depmode=dashmstdout
|
|
fi
|
|
|
|
+cygpath_u="cygpath -u -f -"
|
|
+if test "$depmode" = msvcmsys; then
|
|
+ # This is just like msvisualcpp but w/o cygpath translation.
|
|
+ # Just convert the backslash-escaped backslashes to single forward
|
|
+ # slashes to satisfy depend.m4
|
|
+ cygpath_u="sed s,\\\\\\\\,/,g"
|
|
+ depmode=msvisualcpp
|
|
+fi
|
|
+
|
|
case "$depmode" in
|
|
gcc3)
|
|
## gcc 3 implements dependency tracking that does exactly what
|
|
@@ -192,14 +199,14 @@ sgi)
|
|
' < "$tmpdepfile" \
|
|
| sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
|
|
tr '
|
|
-' ' ' >> $depfile
|
|
- echo >> $depfile
|
|
+' ' ' >> "$depfile"
|
|
+ echo >> "$depfile"
|
|
|
|
# The second pass generates a dummy entry for each header file.
|
|
tr ' ' '
|
|
' < "$tmpdepfile" \
|
|
| sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
|
|
- >> $depfile
|
|
+ >> "$depfile"
|
|
else
|
|
# The sourcefile does not contain any dependencies, so just
|
|
# store a dummy comment line, to avoid errors with the Makefile
|
|
@@ -328,7 +335,12 @@ hp2)
|
|
if test -f "$tmpdepfile"; then
|
|
sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
|
|
# Add `dependent.h:' lines.
|
|
- sed -ne '2,${; s/^ *//; s/ \\*$//; s/$/:/; p;}' "$tmpdepfile" >> "$depfile"
|
|
+ sed -ne '2,${
|
|
+ s/^ *//
|
|
+ s/ \\*$//
|
|
+ s/$/:/
|
|
+ p
|
|
+ }' "$tmpdepfile" >> "$depfile"
|
|
else
|
|
echo "#dummy" > "$depfile"
|
|
fi
|
|
@@ -404,7 +416,7 @@ dashmstdout)
|
|
|
|
# Remove the call to Libtool.
|
|
if test "$libtool" = yes; then
|
|
- while test $1 != '--mode=compile'; do
|
|
+ while test "X$1" != 'X--mode=compile'; do
|
|
shift
|
|
done
|
|
shift
|
|
@@ -455,32 +467,39 @@ makedepend)
|
|
"$@" || exit $?
|
|
# Remove any Libtool call
|
|
if test "$libtool" = yes; then
|
|
- while test $1 != '--mode=compile'; do
|
|
+ while test "X$1" != 'X--mode=compile'; do
|
|
shift
|
|
done
|
|
shift
|
|
fi
|
|
# X makedepend
|
|
shift
|
|
- cleared=no
|
|
- for arg in "$@"; do
|
|
+ cleared=no eat=no
|
|
+ for arg
|
|
+ do
|
|
case $cleared in
|
|
no)
|
|
set ""; shift
|
|
cleared=yes ;;
|
|
esac
|
|
+ if test $eat = yes; then
|
|
+ eat=no
|
|
+ continue
|
|
+ fi
|
|
case "$arg" in
|
|
-D*|-I*)
|
|
set fnord "$@" "$arg"; shift ;;
|
|
# Strip any option that makedepend may not understand. Remove
|
|
# the object too, otherwise makedepend will parse it as a source file.
|
|
+ -arch)
|
|
+ eat=yes ;;
|
|
-*|$object)
|
|
;;
|
|
*)
|
|
set fnord "$@" "$arg"; shift ;;
|
|
esac
|
|
done
|
|
- obj_suffix="`echo $object | sed 's/^.*\././'`"
|
|
+ obj_suffix=`echo "$object" | sed 's/^.*\././'`
|
|
touch "$tmpdepfile"
|
|
${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
|
|
rm -f "$depfile"
|
|
@@ -500,7 +519,7 @@ cpp)
|
|
|
|
# Remove the call to Libtool.
|
|
if test "$libtool" = yes; then
|
|
- while test $1 != '--mode=compile'; do
|
|
+ while test "X$1" != 'X--mode=compile'; do
|
|
shift
|
|
done
|
|
shift
|
|
@@ -538,13 +557,27 @@ cpp)
|
|
|
|
msvisualcpp)
|
|
# Important note: in order to support this mode, a compiler *must*
|
|
- # always write the preprocessed file to stdout, regardless of -o,
|
|
- # because we must use -o when running libtool.
|
|
+ # always write the preprocessed file to stdout.
|
|
"$@" || exit $?
|
|
+
|
|
+ # Remove the call to Libtool.
|
|
+ if test "$libtool" = yes; then
|
|
+ while test "X$1" != 'X--mode=compile'; do
|
|
+ shift
|
|
+ done
|
|
+ shift
|
|
+ fi
|
|
+
|
|
IFS=" "
|
|
for arg
|
|
do
|
|
case "$arg" in
|
|
+ -o)
|
|
+ shift
|
|
+ ;;
|
|
+ $object)
|
|
+ shift
|
|
+ ;;
|
|
"-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
|
|
set fnord "$@"
|
|
shift
|
|
@@ -557,16 +590,23 @@ msvisualcpp)
|
|
;;
|
|
esac
|
|
done
|
|
- "$@" -E |
|
|
- sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"
|
|
+ "$@" -E 2>/dev/null |
|
|
+ sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile"
|
|
rm -f "$depfile"
|
|
echo "$object : \\" > "$depfile"
|
|
- . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile"
|
|
+ sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile"
|
|
echo " " >> "$depfile"
|
|
- . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile"
|
|
+ sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile"
|
|
rm -f "$tmpdepfile"
|
|
;;
|
|
|
|
+msvcmsys)
|
|
+ # This case exists only to let depend.m4 do its work. It works by
|
|
+ # looking at the text of this script. This case will never be run,
|
|
+ # since it is checked for above.
|
|
+ exit 1
|
|
+ ;;
|
|
+
|
|
none)
|
|
exec "$@"
|
|
;;
|
|
@@ -585,5 +625,6 @@ exit 0
|
|
# eval: (add-hook 'write-file-hooks 'time-stamp)
|
|
# time-stamp-start: "scriptversion="
|
|
# time-stamp-format: "%:y-%02m-%02d.%02H"
|
|
-# time-stamp-end: "$"
|
|
+# time-stamp-time-zone: "UTC"
|
|
+# time-stamp-end: "; # UTC"
|
|
# End:
|
|
Index: libgtop-2.28.0/doc/Makefile.in
|
|
===================================================================
|
|
--- libgtop-2.28.0.orig/doc/Makefile.in 2009-11-22 17:53:40.969192757 +0100
|
|
+++ libgtop-2.28.0/doc/Makefile.in 2009-11-22 17:53:09.497186539 +0100
|
|
@@ -1,8 +1,9 @@
|
|
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
|
|
+# Makefile.in generated by automake 1.11 from Makefile.am.
|
|
# @configure_input@
|
|
|
|
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
|
|
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
|
|
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
|
|
+# Inc.
|
|
# This Makefile.in is free software; the Free Software Foundation
|
|
# gives unlimited permission to copy and/or distribute it,
|
|
# with or without modifications, as long as this notice is preserved.
|
|
@@ -15,8 +16,9 @@
|
|
@SET_MAKE@
|
|
VPATH = @srcdir@
|
|
pkgdatadir = $(datadir)/@PACKAGE@
|
|
-pkglibdir = $(libdir)/@PACKAGE@
|
|
pkgincludedir = $(includedir)/@PACKAGE@
|
|
+pkglibdir = $(libdir)/@PACKAGE@
|
|
+pkglibexecdir = $(libexecdir)/@PACKAGE@
|
|
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
|
|
install_sh_DATA = $(install_sh) -c -m 644
|
|
install_sh_PROGRAM = $(install_sh) -c
|
|
@@ -43,6 +45,7 @@ am__configure_deps = $(am__aclocal_m4_de
|
|
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
|
|
CONFIG_HEADER = $(top_builddir)/config.h
|
|
CONFIG_CLEAN_FILES =
|
|
+CONFIG_CLEAN_VPATH_FILES =
|
|
SOURCES =
|
|
DIST_SOURCES =
|
|
INFO_DEPS = $(srcdir)/libgtop2.info
|
|
@@ -70,13 +73,56 @@ am__vpath_adj = case $$p in \
|
|
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
|
|
*) f=$$p;; \
|
|
esac;
|
|
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
|
|
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
|
|
+am__install_max = 40
|
|
+am__nobase_strip_setup = \
|
|
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
|
|
+am__nobase_strip = \
|
|
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
|
|
+am__nobase_list = $(am__nobase_strip_setup); \
|
|
+ for p in $$list; do echo "$$p $$p"; done | \
|
|
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
|
|
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
|
|
+ if (++n[$$2] == $(am__install_max)) \
|
|
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
|
|
+ END { for (dir in files) print dir, files[dir] }'
|
|
+am__base_list = \
|
|
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
|
|
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
|
|
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
|
|
distclean-recursive maintainer-clean-recursive
|
|
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
|
|
+ $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
|
|
+ distdir
|
|
ETAGS = etags
|
|
CTAGS = ctags
|
|
DIST_SUBDIRS = $(SUBDIRS)
|
|
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
|
|
+am__relativize = \
|
|
+ dir0=`pwd`; \
|
|
+ sed_first='s,^\([^/]*\)/.*$$,\1,'; \
|
|
+ sed_rest='s,^[^/]*/*,,'; \
|
|
+ sed_last='s,^.*/\([^/]*\)$$,\1,'; \
|
|
+ sed_butlast='s,/*[^/]*$$,,'; \
|
|
+ while test -n "$$dir1"; do \
|
|
+ first=`echo "$$dir1" | sed -e "$$sed_first"`; \
|
|
+ if test "$$first" != "."; then \
|
|
+ if test "$$first" = ".."; then \
|
|
+ dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
|
|
+ dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
|
|
+ else \
|
|
+ first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
|
|
+ if test "$$first2" = "$$first"; then \
|
|
+ dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
|
|
+ else \
|
|
+ dir2="../$$dir2"; \
|
|
+ fi; \
|
|
+ dir0="$$dir0"/"$$first"; \
|
|
+ fi; \
|
|
+ fi; \
|
|
+ dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
|
|
+ done; \
|
|
+ reldir="$$dir2"
|
|
ACLOCAL = @ACLOCAL@
|
|
ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
|
|
ALLOCA = @ALLOCA@
|
|
@@ -125,29 +171,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
|
|
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
|
|
INSTOBJEXT = @INSTOBJEXT@
|
|
INTLLIBS = @INTLLIBS@
|
|
-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
|
|
-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
|
|
-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
|
|
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
|
|
-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
|
|
-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
|
|
INTLTOOL_MERGE = @INTLTOOL_MERGE@
|
|
-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@
|
|
-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
|
|
-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
|
|
-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
|
|
-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
|
|
-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
|
|
-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
|
|
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
|
|
-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
|
|
-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
|
|
-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
|
|
KVM_LIBS = @KVM_LIBS@
|
|
LD = @LD@
|
|
LDFLAGS = @LDFLAGS@
|
|
@@ -186,6 +213,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
|
|
PACKAGE_NAME = @PACKAGE_NAME@
|
|
PACKAGE_STRING = @PACKAGE_STRING@
|
|
PACKAGE_TARNAME = @PACKAGE_TARNAME@
|
|
+PACKAGE_URL = @PACKAGE_URL@
|
|
PACKAGE_VERSION = @PACKAGE_VERSION@
|
|
PATH_SEPARATOR = @PATH_SEPARATOR@
|
|
PERL = @PERL@
|
|
@@ -267,6 +295,7 @@ sysconfdir = @sysconfdir@
|
|
sysdeps_dir = @sysdeps_dir@
|
|
sysdeps_suid_lib = @sysdeps_suid_lib@
|
|
target_alias = @target_alias@
|
|
+top_build_prefix = @top_build_prefix@
|
|
top_builddir = @top_builddir@
|
|
top_srcdir = @top_srcdir@
|
|
SUBDIRS = reference
|
|
@@ -288,9 +317,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefi
|
|
exit 1;; \
|
|
esac; \
|
|
done; \
|
|
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile'; \
|
|
- cd $(top_srcdir) && \
|
|
- $(AUTOMAKE) --gnu doc/Makefile
|
|
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile'; \
|
|
+ $(am__cd) $(top_srcdir) && \
|
|
+ $(AUTOMAKE) --gnu doc/Makefile
|
|
.PRECIOUS: Makefile
|
|
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
|
|
@case '$?' in \
|
|
@@ -308,6 +337,7 @@ $(top_srcdir)/configure: $(am__configur
|
|
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
|
|
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
|
|
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
|
|
+$(am__aclocal_m4_deps):
|
|
|
|
mostlyclean-libtool:
|
|
-rm -f *.lo
|
|
@@ -317,7 +347,7 @@ clean-libtool:
|
|
|
|
.texi.info:
|
|
restore=: && backupdir="$(am__leading_dot)am$$$$" && \
|
|
- am__cwd=`pwd` && cd $(srcdir) && \
|
|
+ am__cwd=`pwd` && $(am__cd) $(srcdir) && \
|
|
rm -rf $$backupdir && mkdir $$backupdir && \
|
|
if ($(MAKEINFO) --version) >/dev/null 2>&1; then \
|
|
for f in $@ $@-[0-9] $@-[0-9][0-9] $(@:.info=).i[0-9] $(@:.info=).i[0-9][0-9]; do \
|
|
@@ -329,10 +359,10 @@ clean-libtool:
|
|
-o $@ $<; \
|
|
then \
|
|
rc=0; \
|
|
- cd $(srcdir); \
|
|
+ $(am__cd) $(srcdir); \
|
|
else \
|
|
rc=$$?; \
|
|
- cd $(srcdir) && \
|
|
+ $(am__cd) $(srcdir) && \
|
|
$$restore $$backupdir/* `echo "./$@" | sed 's|[^/]*$$||'`; \
|
|
fi; \
|
|
rm -rf $$backupdir; exit $$rc
|
|
@@ -389,16 +419,18 @@ maintainer-clean-vti:
|
|
|
|
uninstall-dvi-am:
|
|
@$(NORMAL_UNINSTALL)
|
|
- @list='$(DVIS)'; for p in $$list; do \
|
|
- f=$(am__strip_dir) \
|
|
+ @list='$(DVIS)'; test -n "$(dvidir)" || list=; \
|
|
+ for p in $$list; do \
|
|
+ $(am__strip_dir) \
|
|
echo " rm -f '$(DESTDIR)$(dvidir)/$$f'"; \
|
|
rm -f "$(DESTDIR)$(dvidir)/$$f"; \
|
|
done
|
|
|
|
uninstall-html-am:
|
|
@$(NORMAL_UNINSTALL)
|
|
- @list='$(HTMLS)'; for p in $$list; do \
|
|
- f=$(am__strip_dir) \
|
|
+ @list='$(HTMLS)'; test -n "$(htmldir)" || list=; \
|
|
+ for p in $$list; do \
|
|
+ $(am__strip_dir) \
|
|
echo " rm -rf '$(DESTDIR)$(htmldir)/$$f'"; \
|
|
rm -rf "$(DESTDIR)$(htmldir)/$$f"; \
|
|
done
|
|
@@ -412,7 +444,8 @@ uninstall-info-am:
|
|
for file in $$list; do \
|
|
relfile=`echo "$$file" | sed 's|^.*/||'`; \
|
|
echo " install-info --info-dir='$(DESTDIR)$(infodir)' --remove '$(DESTDIR)$(infodir)/$$relfile'"; \
|
|
- install-info --info-dir="$(DESTDIR)$(infodir)" --remove "$(DESTDIR)$(infodir)/$$relfile"; \
|
|
+ if install-info --info-dir="$(DESTDIR)$(infodir)" --remove "$(DESTDIR)$(infodir)/$$relfile"; \
|
|
+ then :; else test ! -f "$(DESTDIR)$(infodir)/$$relfile" || exit 1; fi; \
|
|
done; \
|
|
else :; fi
|
|
@$(NORMAL_UNINSTALL)
|
|
@@ -428,16 +461,18 @@ uninstall-info-am:
|
|
|
|
uninstall-pdf-am:
|
|
@$(NORMAL_UNINSTALL)
|
|
- @list='$(PDFS)'; for p in $$list; do \
|
|
- f=$(am__strip_dir) \
|
|
+ @list='$(PDFS)'; test -n "$(pdfdir)" || list=; \
|
|
+ for p in $$list; do \
|
|
+ $(am__strip_dir) \
|
|
echo " rm -f '$(DESTDIR)$(pdfdir)/$$f'"; \
|
|
rm -f "$(DESTDIR)$(pdfdir)/$$f"; \
|
|
done
|
|
|
|
uninstall-ps-am:
|
|
@$(NORMAL_UNINSTALL)
|
|
- @list='$(PSS)'; for p in $$list; do \
|
|
- f=$(am__strip_dir) \
|
|
+ @list='$(PSS)'; test -n "$(psdir)" || list=; \
|
|
+ for p in $$list; do \
|
|
+ $(am__strip_dir) \
|
|
echo " rm -f '$(DESTDIR)$(psdir)/$$f'"; \
|
|
rm -f "$(DESTDIR)$(psdir)/$$f"; \
|
|
done
|
|
@@ -454,8 +489,8 @@ dist-info: $(INFO_DEPS)
|
|
for file in $$d/$$base $$d/$$base-[0-9] $$d/$$base-[0-9][0-9] $$d/$$base_i[0-9] $$d/$$base_i[0-9][0-9]; do \
|
|
if test -f $$file; then \
|
|
relfile=`expr "$$file" : "$$d/\(.*\)"`; \
|
|
- test -f $(distdir)/$$relfile || \
|
|
- cp -p $$file $(distdir)/$$relfile; \
|
|
+ test -f "$(distdir)/$$relfile" || \
|
|
+ cp -p $$file "$(distdir)/$$relfile"; \
|
|
else :; fi; \
|
|
done; \
|
|
done
|
|
@@ -464,8 +499,11 @@ mostlyclean-aminfo:
|
|
-rm -rf libgtop2.aux libgtop2.cp libgtop2.cps libgtop2.fn libgtop2.fns \
|
|
libgtop2.ky libgtop2.kys libgtop2.log libgtop2.pg \
|
|
libgtop2.pgs libgtop2.tmp libgtop2.toc libgtop2.tp \
|
|
- libgtop2.tps libgtop2.vr libgtop2.vrs libgtop2.dvi \
|
|
- libgtop2.pdf libgtop2.ps libgtop2.html
|
|
+ libgtop2.tps libgtop2.vr libgtop2.vrs
|
|
+
|
|
+clean-aminfo:
|
|
+ -test -z "libgtop2.dvi libgtop2.pdf libgtop2.ps libgtop2.html" \
|
|
+ || rm -rf libgtop2.dvi libgtop2.pdf libgtop2.ps libgtop2.html
|
|
|
|
maintainer-clean-aminfo:
|
|
@list='$(INFO_DEPS)'; for i in $$list; do \
|
|
@@ -498,7 +536,7 @@ $(RECURSIVE_TARGETS):
|
|
else \
|
|
local_target="$$target"; \
|
|
fi; \
|
|
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
|
|
+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
|
|
|| eval $$failcom; \
|
|
done; \
|
|
if test "$$dot_seen" = "no"; then \
|
|
@@ -532,16 +570,16 @@ $(RECURSIVE_CLEAN_TARGETS):
|
|
else \
|
|
local_target="$$target"; \
|
|
fi; \
|
|
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
|
|
+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
|
|
|| eval $$failcom; \
|
|
done && test -z "$$fail"
|
|
tags-recursive:
|
|
list='$(SUBDIRS)'; for subdir in $$list; do \
|
|
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
|
|
+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
|
|
done
|
|
ctags-recursive:
|
|
list='$(SUBDIRS)'; for subdir in $$list; do \
|
|
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
|
|
+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
|
|
done
|
|
|
|
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
|
|
@@ -556,7 +594,7 @@ tags: TAGS
|
|
|
|
TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
|
|
$(TAGS_FILES) $(LISP)
|
|
- tags=; \
|
|
+ set x; \
|
|
here=`pwd`; \
|
|
if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
|
|
include_option=--etags-include; \
|
|
@@ -568,7 +606,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE
|
|
list='$(SUBDIRS)'; for subdir in $$list; do \
|
|
if test "$$subdir" = .; then :; else \
|
|
test ! -f $$subdir/TAGS || \
|
|
- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
|
|
+ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
|
|
fi; \
|
|
done; \
|
|
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
|
|
@@ -577,29 +615,34 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE
|
|
done | \
|
|
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
|
|
END { if (nonempty) { for (i in files) print i; }; }'`; \
|
|
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
|
|
+ shift; \
|
|
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
|
|
test -n "$$unique" || unique=$$empty_fix; \
|
|
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
|
|
- $$tags $$unique; \
|
|
+ if test $$# -gt 0; then \
|
|
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
|
|
+ "$$@" $$unique; \
|
|
+ else \
|
|
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
|
|
+ $$unique; \
|
|
+ fi; \
|
|
fi
|
|
ctags: CTAGS
|
|
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
|
|
$(TAGS_FILES) $(LISP)
|
|
- tags=; \
|
|
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
|
|
unique=`for i in $$list; do \
|
|
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
|
|
done | \
|
|
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
|
|
END { if (nonempty) { for (i in files) print i; }; }'`; \
|
|
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
|
|
+ test -z "$(CTAGS_ARGS)$$unique" \
|
|
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
|
|
- $$tags $$unique
|
|
+ $$unique
|
|
|
|
GTAGS:
|
|
here=`$(am__cd) $(top_builddir) && pwd` \
|
|
- && cd $(top_srcdir) \
|
|
- && gtags -i $(GTAGS_ARGS) $$here
|
|
+ && $(am__cd) $(top_srcdir) \
|
|
+ && gtags -i $(GTAGS_ARGS) "$$here"
|
|
|
|
distclean-tags:
|
|
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
|
|
@@ -620,29 +663,44 @@ distdir: $(DISTFILES)
|
|
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
|
|
if test -d $$d/$$file; then \
|
|
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
|
|
+ if test -d "$(distdir)/$$file"; then \
|
|
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
|
|
+ fi; \
|
|
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
|
|
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
|
|
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
|
|
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
|
|
fi; \
|
|
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
|
|
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
|
|
else \
|
|
- test -f $(distdir)/$$file \
|
|
- || cp -p $$d/$$file $(distdir)/$$file \
|
|
+ test -f "$(distdir)/$$file" \
|
|
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|
|
|| exit 1; \
|
|
fi; \
|
|
done
|
|
- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
|
|
+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
|
|
if test "$$subdir" = .; then :; else \
|
|
test -d "$(distdir)/$$subdir" \
|
|
|| $(MKDIR_P) "$(distdir)/$$subdir" \
|
|
|| exit 1; \
|
|
- distdir=`$(am__cd) $(distdir) && pwd`; \
|
|
- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
|
|
- (cd $$subdir && \
|
|
+ fi; \
|
|
+ done
|
|
+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
|
|
+ if test "$$subdir" = .; then :; else \
|
|
+ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
|
|
+ $(am__relativize); \
|
|
+ new_distdir=$$reldir; \
|
|
+ dir1=$$subdir; dir2="$(top_distdir)"; \
|
|
+ $(am__relativize); \
|
|
+ new_top_distdir=$$reldir; \
|
|
+ echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
|
|
+ echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
|
|
+ ($(am__cd) $$subdir && \
|
|
$(MAKE) $(AM_MAKEFLAGS) \
|
|
- top_distdir="$$top_distdir" \
|
|
- distdir="$$distdir/$$subdir" \
|
|
+ top_distdir="$$new_top_distdir" \
|
|
+ distdir="$$new_distdir" \
|
|
am__remove_distdir=: \
|
|
am__skip_length_check=: \
|
|
+ am__skip_mode_fix=: \
|
|
distdir) \
|
|
|| exit 1; \
|
|
fi; \
|
|
@@ -678,13 +736,14 @@ clean-generic:
|
|
|
|
distclean-generic:
|
|
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
|
|
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
|
|
|
|
maintainer-clean-generic:
|
|
@echo "This command is intended for maintainers to use"
|
|
@echo "it deletes files that may require special tools to rebuild."
|
|
clean: clean-recursive
|
|
|
|
-clean-am: clean-generic clean-libtool mostlyclean-am
|
|
+clean-am: clean-aminfo clean-generic clean-libtool mostlyclean-am
|
|
|
|
distclean: distclean-recursive
|
|
-rm -f Makefile
|
|
@@ -709,11 +768,14 @@ install-dvi: install-dvi-recursive
|
|
install-dvi-am: $(DVIS)
|
|
@$(NORMAL_INSTALL)
|
|
test -z "$(dvidir)" || $(MKDIR_P) "$(DESTDIR)$(dvidir)"
|
|
- @list='$(DVIS)'; for p in $$list; do \
|
|
+ @list='$(DVIS)'; test -n "$(dvidir)" || list=; \
|
|
+ for p in $$list; do \
|
|
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
|
|
- f=$(am__strip_dir) \
|
|
- echo " $(INSTALL_DATA) '$$d$$p' '$(DESTDIR)$(dvidir)/$$f'"; \
|
|
- $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(dvidir)/$$f"; \
|
|
+ echo "$$d$$p"; \
|
|
+ done | $(am__base_list) | \
|
|
+ while read files; do \
|
|
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(dvidir)'"; \
|
|
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(dvidir)" || exit $$?; \
|
|
done
|
|
install-exec-am:
|
|
|
|
@@ -722,26 +784,31 @@ install-html: install-html-recursive
|
|
install-html-am: $(HTMLS)
|
|
@$(NORMAL_INSTALL)
|
|
test -z "$(htmldir)" || $(MKDIR_P) "$(DESTDIR)$(htmldir)"
|
|
- @list='$(HTMLS)'; for p in $$list; do \
|
|
+ @list='$(HTMLS)'; list2=; test -n "$(htmldir)" || list=; \
|
|
+ for p in $$list; do \
|
|
if test -f "$$p" || test -d "$$p"; then d=; else d="$(srcdir)/"; fi; \
|
|
- f=$(am__strip_dir) \
|
|
+ $(am__strip_dir) \
|
|
if test -d "$$d$$p"; then \
|
|
echo " $(MKDIR_P) '$(DESTDIR)$(htmldir)/$$f'"; \
|
|
$(MKDIR_P) "$(DESTDIR)$(htmldir)/$$f" || exit 1; \
|
|
echo " $(INSTALL_DATA) '$$d$$p'/* '$(DESTDIR)$(htmldir)/$$f'"; \
|
|
- $(INSTALL_DATA) "$$d$$p"/* "$(DESTDIR)$(htmldir)/$$f"; \
|
|
+ $(INSTALL_DATA) "$$d$$p"/* "$(DESTDIR)$(htmldir)/$$f" || exit $$?; \
|
|
else \
|
|
- echo " $(INSTALL_DATA) '$$d$$p' '$(DESTDIR)$(htmldir)/$$f'"; \
|
|
- $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(htmldir)/$$f"; \
|
|
+ list2="$$list2 $$d$$p"; \
|
|
fi; \
|
|
- done
|
|
+ done; \
|
|
+ test -z "$$list2" || { echo "$$list2" | $(am__base_list) | \
|
|
+ while read files; do \
|
|
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(htmldir)'"; \
|
|
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(htmldir)" || exit $$?; \
|
|
+ done; }
|
|
install-info: install-info-recursive
|
|
|
|
install-info-am: $(INFO_DEPS)
|
|
@$(NORMAL_INSTALL)
|
|
test -z "$(infodir)" || $(MKDIR_P) "$(DESTDIR)$(infodir)"
|
|
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
|
|
- list='$(INFO_DEPS)'; \
|
|
+ list='$(INFO_DEPS)'; test -n "$(infodir)" || list=; \
|
|
for file in $$list; do \
|
|
case $$file in \
|
|
$(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
|
|
@@ -749,18 +816,19 @@ install-info-am: $(INFO_DEPS)
|
|
if test -f $$file; then d=.; else d=$(srcdir); fi; \
|
|
file_i=`echo "$$file" | sed 's|\.info$$||;s|$$|.i|'`; \
|
|
for ifile in $$d/$$file $$d/$$file-[0-9] $$d/$$file-[0-9][0-9] \
|
|
- $$d/$$file_i[0-9] $$d/$$file_i[0-9][0-9] ; do \
|
|
+ $$d/$$file_i[0-9] $$d/$$file_i[0-9][0-9] ; do \
|
|
if test -f $$ifile; then \
|
|
- relfile=`echo "$$ifile" | sed 's|^.*/||'`; \
|
|
- echo " $(INSTALL_DATA) '$$ifile' '$(DESTDIR)$(infodir)/$$relfile'"; \
|
|
- $(INSTALL_DATA) "$$ifile" "$(DESTDIR)$(infodir)/$$relfile"; \
|
|
+ echo "$$ifile"; \
|
|
else : ; fi; \
|
|
done; \
|
|
- done
|
|
+ done | $(am__base_list) | \
|
|
+ while read files; do \
|
|
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(infodir)'"; \
|
|
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(infodir)" || exit $$?; done
|
|
@$(POST_INSTALL)
|
|
@if (install-info --version && \
|
|
install-info --version 2>&1 | sed 1q | grep -i -v debian) >/dev/null 2>&1; then \
|
|
- list='$(INFO_DEPS)'; \
|
|
+ list='$(INFO_DEPS)'; test -n "$(infodir)" || list=; \
|
|
for file in $$list; do \
|
|
relfile=`echo "$$file" | sed 's|^.*/||'`; \
|
|
echo " install-info --info-dir='$(DESTDIR)$(infodir)' '$(DESTDIR)$(infodir)/$$relfile'";\
|
|
@@ -774,23 +842,27 @@ install-pdf: install-pdf-recursive
|
|
install-pdf-am: $(PDFS)
|
|
@$(NORMAL_INSTALL)
|
|
test -z "$(pdfdir)" || $(MKDIR_P) "$(DESTDIR)$(pdfdir)"
|
|
- @list='$(PDFS)'; for p in $$list; do \
|
|
+ @list='$(PDFS)'; test -n "$(pdfdir)" || list=; \
|
|
+ for p in $$list; do \
|
|
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
|
|
- f=$(am__strip_dir) \
|
|
- echo " $(INSTALL_DATA) '$$d$$p' '$(DESTDIR)$(pdfdir)/$$f'"; \
|
|
- $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(pdfdir)/$$f"; \
|
|
- done
|
|
+ echo "$$d$$p"; \
|
|
+ done | $(am__base_list) | \
|
|
+ while read files; do \
|
|
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pdfdir)'"; \
|
|
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(pdfdir)" || exit $$?; done
|
|
install-ps: install-ps-recursive
|
|
|
|
install-ps-am: $(PSS)
|
|
@$(NORMAL_INSTALL)
|
|
test -z "$(psdir)" || $(MKDIR_P) "$(DESTDIR)$(psdir)"
|
|
- @list='$(PSS)'; for p in $$list; do \
|
|
+ @list='$(PSS)'; test -n "$(psdir)" || list=; \
|
|
+ for p in $$list; do \
|
|
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
|
|
- f=$(am__strip_dir) \
|
|
- echo " $(INSTALL_DATA) '$$d$$p' '$(DESTDIR)$(psdir)/$$f'"; \
|
|
- $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(psdir)/$$f"; \
|
|
- done
|
|
+ echo "$$d$$p"; \
|
|
+ done | $(am__base_list) | \
|
|
+ while read files; do \
|
|
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(psdir)'"; \
|
|
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(psdir)" || exit $$?; done
|
|
installcheck-am:
|
|
|
|
maintainer-clean: maintainer-clean-recursive
|
|
@@ -814,25 +886,26 @@ ps-am: $(PSS)
|
|
uninstall-am: uninstall-dvi-am uninstall-html-am uninstall-info-am \
|
|
uninstall-pdf-am uninstall-ps-am
|
|
|
|
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
|
|
- install-strip
|
|
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
|
|
+ install-am install-strip tags-recursive
|
|
|
|
.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
|
|
- all all-am check check-am clean clean-generic clean-libtool \
|
|
- ctags ctags-recursive dist-info distclean distclean-generic \
|
|
- distclean-libtool distclean-tags distdir dvi dvi-am html \
|
|
- html-am info info-am install install-am install-data \
|
|
- install-data-am install-dvi install-dvi-am install-exec \
|
|
- install-exec-am install-html install-html-am install-info \
|
|
- install-info-am install-man install-pdf install-pdf-am \
|
|
- install-ps install-ps-am install-strip installcheck \
|
|
- installcheck-am installdirs installdirs-am maintainer-clean \
|
|
- maintainer-clean-aminfo maintainer-clean-generic \
|
|
- maintainer-clean-vti mostlyclean mostlyclean-aminfo \
|
|
- mostlyclean-generic mostlyclean-libtool mostlyclean-vti pdf \
|
|
- pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
|
|
- uninstall-dvi-am uninstall-html-am uninstall-info-am \
|
|
- uninstall-pdf-am uninstall-ps-am
|
|
+ all all-am check check-am clean clean-aminfo clean-generic \
|
|
+ clean-libtool ctags ctags-recursive dist-info distclean \
|
|
+ distclean-generic distclean-libtool distclean-tags distdir dvi \
|
|
+ dvi-am html html-am info info-am install install-am \
|
|
+ install-data install-data-am install-dvi install-dvi-am \
|
|
+ install-exec install-exec-am install-html install-html-am \
|
|
+ install-info install-info-am install-man install-pdf \
|
|
+ install-pdf-am install-ps install-ps-am install-strip \
|
|
+ installcheck installcheck-am installdirs installdirs-am \
|
|
+ maintainer-clean maintainer-clean-aminfo \
|
|
+ maintainer-clean-generic maintainer-clean-vti mostlyclean \
|
|
+ mostlyclean-aminfo mostlyclean-generic mostlyclean-libtool \
|
|
+ mostlyclean-vti pdf pdf-am ps ps-am tags tags-recursive \
|
|
+ uninstall uninstall-am uninstall-dvi-am uninstall-html-am \
|
|
+ uninstall-info-am uninstall-pdf-am uninstall-ps-am
|
|
+
|
|
|
|
# Tell versions [3.59,3.63) of GNU make to not export all variables.
|
|
# Otherwise a system limit (for SysV at least) may be exceeded.
|
|
Index: libgtop-2.28.0/doc/mdate-sh
|
|
===================================================================
|
|
--- libgtop-2.28.0.orig/doc/mdate-sh 2009-11-22 17:53:41.173192927 +0100
|
|
+++ libgtop-2.28.0/doc/mdate-sh 2009-11-22 17:53:09.345691099 +0100
|
|
@@ -1,10 +1,10 @@
|
|
#!/bin/sh
|
|
# Get modification time of a file or directory and pretty-print it.
|
|
|
|
-scriptversion=2007-03-30.02
|
|
+scriptversion=2009-04-28.21; # UTC
|
|
|
|
-# Copyright (C) 1995, 1996, 1997, 2003, 2004, 2005, 2007 Free Software
|
|
-# Foundation, Inc.
|
|
+# Copyright (C) 1995, 1996, 1997, 2003, 2004, 2005, 2007, 2009 Free
|
|
+# Software Foundation, Inc.
|
|
# written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, June 1995
|
|
#
|
|
# This program is free software; you can redistribute it and/or modify
|
|
@@ -18,8 +18,7 @@ scriptversion=2007-03-30.02
|
|
# GNU General Public License for more details.
|
|
#
|
|
# You should have received a copy of the GNU General Public License
|
|
-# along with this program; if not, write to the Free Software Foundation,
|
|
-# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
|
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
# As a special exception to the GNU General Public License, if you
|
|
# distribute this file as part of a program that contains a
|
|
@@ -201,5 +200,6 @@ echo $day $month $year
|
|
# eval: (add-hook 'write-file-hooks 'time-stamp)
|
|
# time-stamp-start: "scriptversion="
|
|
# time-stamp-format: "%:y-%02m-%02d.%02H"
|
|
-# time-stamp-end: "$"
|
|
+# time-stamp-time-zone: "UTC"
|
|
+# time-stamp-end: "; # UTC"
|
|
# End:
|
|
Index: libgtop-2.28.0/doc/reference/Makefile.in
|
|
===================================================================
|
|
--- libgtop-2.28.0.orig/doc/reference/Makefile.in 2009-11-22 17:53:41.281195828 +0100
|
|
+++ libgtop-2.28.0/doc/reference/Makefile.in 2009-11-22 17:53:09.601182513 +0100
|
|
@@ -1,8 +1,9 @@
|
|
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
|
|
+# Makefile.in generated by automake 1.11 from Makefile.am.
|
|
# @configure_input@
|
|
|
|
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
|
|
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
|
|
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
|
|
+# Inc.
|
|
# This Makefile.in is free software; the Free Software Foundation
|
|
# gives unlimited permission to copy and/or distribute it,
|
|
# with or without modifications, as long as this notice is preserved.
|
|
@@ -21,8 +22,9 @@
|
|
####################################
|
|
VPATH = @srcdir@
|
|
pkgdatadir = $(datadir)/@PACKAGE@
|
|
-pkglibdir = $(libdir)/@PACKAGE@
|
|
pkgincludedir = $(includedir)/@PACKAGE@
|
|
+pkglibdir = $(libdir)/@PACKAGE@
|
|
+pkglibexecdir = $(libexecdir)/@PACKAGE@
|
|
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
|
|
install_sh_DATA = $(install_sh) -c -m 644
|
|
install_sh_PROGRAM = $(install_sh) -c
|
|
@@ -48,6 +50,7 @@ am__configure_deps = $(am__aclocal_m4_de
|
|
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
|
|
CONFIG_HEADER = $(top_builddir)/config.h
|
|
CONFIG_CLEAN_FILES = version.xml
|
|
+CONFIG_CLEAN_VPATH_FILES =
|
|
SOURCES =
|
|
DIST_SOURCES =
|
|
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
|
|
@@ -105,29 +108,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
|
|
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
|
|
INSTOBJEXT = @INSTOBJEXT@
|
|
INTLLIBS = @INTLLIBS@
|
|
-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
|
|
-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
|
|
-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
|
|
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
|
|
-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
|
|
-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
|
|
INTLTOOL_MERGE = @INTLTOOL_MERGE@
|
|
-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@
|
|
-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
|
|
-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
|
|
-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
|
|
-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
|
|
-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
|
|
-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
|
|
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
|
|
-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
|
|
-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
|
|
-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
|
|
KVM_LIBS = @KVM_LIBS@
|
|
LD = @LD@
|
|
LDFLAGS = @LDFLAGS@
|
|
@@ -166,6 +150,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
|
|
PACKAGE_NAME = @PACKAGE_NAME@
|
|
PACKAGE_STRING = @PACKAGE_STRING@
|
|
PACKAGE_TARNAME = @PACKAGE_TARNAME@
|
|
+PACKAGE_URL = @PACKAGE_URL@
|
|
PACKAGE_VERSION = @PACKAGE_VERSION@
|
|
PATH_SEPARATOR = @PATH_SEPARATOR@
|
|
PERL = @PERL@
|
|
@@ -247,6 +232,7 @@ sysconfdir = @sysconfdir@
|
|
sysdeps_dir = @sysdeps_dir@
|
|
sysdeps_suid_lib = @sysdeps_suid_lib@
|
|
target_alias = @target_alias@
|
|
+top_build_prefix = @top_build_prefix@
|
|
top_builddir = @top_builddir@
|
|
top_srcdir = @top_srcdir@
|
|
AUTOMAKE_OPTIONS = 1.6
|
|
@@ -342,9 +328,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefi
|
|
exit 1;; \
|
|
esac; \
|
|
done; \
|
|
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/reference/Makefile'; \
|
|
- cd $(top_srcdir) && \
|
|
- $(AUTOMAKE) --gnu doc/reference/Makefile
|
|
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/reference/Makefile'; \
|
|
+ $(am__cd) $(top_srcdir) && \
|
|
+ $(AUTOMAKE) --gnu doc/reference/Makefile
|
|
.PRECIOUS: Makefile
|
|
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
|
|
@case '$?' in \
|
|
@@ -362,6 +348,7 @@ $(top_srcdir)/configure: $(am__configur
|
|
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
|
|
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
|
|
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
|
|
+$(am__aclocal_m4_deps):
|
|
version.xml: $(top_builddir)/config.status $(srcdir)/version.xml.in
|
|
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
|
|
|
|
@@ -393,13 +380,17 @@ distdir: $(DISTFILES)
|
|
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
|
|
if test -d $$d/$$file; then \
|
|
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
|
|
+ if test -d "$(distdir)/$$file"; then \
|
|
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
|
|
+ fi; \
|
|
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
|
|
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
|
|
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
|
|
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
|
|
fi; \
|
|
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
|
|
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
|
|
else \
|
|
- test -f $(distdir)/$$file \
|
|
- || cp -p $$d/$$file $(distdir)/$$file \
|
|
+ test -f "$(distdir)/$$file" \
|
|
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|
|
|| exit 1; \
|
|
fi; \
|
|
done
|
|
@@ -431,6 +422,7 @@ clean-generic:
|
|
|
|
distclean-generic:
|
|
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
|
|
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
|
|
|
|
maintainer-clean-generic:
|
|
@echo "This command is intended for maintainers to use"
|
|
@@ -449,6 +441,8 @@ dvi-am:
|
|
|
|
html: html-am
|
|
|
|
+html-am:
|
|
+
|
|
info: info-am
|
|
|
|
info-am:
|
|
@@ -457,18 +451,28 @@ install-data-am: install-data-local
|
|
|
|
install-dvi: install-dvi-am
|
|
|
|
+install-dvi-am:
|
|
+
|
|
install-exec-am:
|
|
|
|
install-html: install-html-am
|
|
|
|
+install-html-am:
|
|
+
|
|
install-info: install-info-am
|
|
|
|
+install-info-am:
|
|
+
|
|
install-man:
|
|
|
|
install-pdf: install-pdf-am
|
|
|
|
+install-pdf-am:
|
|
+
|
|
install-ps: install-ps-am
|
|
|
|
+install-ps-am:
|
|
+
|
|
installcheck-am:
|
|
|
|
maintainer-clean: maintainer-clean-am
|
|
@@ -647,6 +651,7 @@ dist-hook: dist-check-gtkdoc dist-hook-l
|
|
gtkdoc-rebase --online --relative --html-dir=$(distdir)/html
|
|
|
|
.PHONY : dist-hook-local docs
|
|
+
|
|
# Tell versions [3.59,3.63) of GNU make to not export all variables.
|
|
# Otherwise a system limit (for SysV at least) may be exceeded.
|
|
.NOEXPORT:
|
|
Index: libgtop-2.28.0/doc/texinfo.tex
|
|
===================================================================
|
|
--- libgtop-2.28.0.orig/doc/texinfo.tex 2009-11-22 17:53:41.077191752 +0100
|
|
+++ libgtop-2.28.0/doc/texinfo.tex 2009-11-22 17:53:09.365682744 +0100
|
|
@@ -3,11 +3,11 @@
|
|
% Load plain if necessary, i.e., if running under initex.
|
|
\expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
|
|
%
|
|
-\def\texinfoversion{2008-11-17.21}
|
|
+\def\texinfoversion{2009-05-16.16}
|
|
%
|
|
-% Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
|
|
+% Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
|
|
% 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
|
|
-% 2007, 2008 Free Software Foundation, Inc.
|
|
+% 2007, 2008, 2009 Free Software Foundation, Inc.
|
|
%
|
|
% This texinfo.tex file is free software: you can redistribute it and/or
|
|
% modify it under the terms of the GNU General Public License as
|
|
@@ -100,6 +100,7 @@
|
|
\let\ptextop=\top
|
|
{\catcode`\'=\active
|
|
\global\let\ptexquoteright'}% Math-mode def from plain.tex.
|
|
+\let\ptexraggedright=\raggedright
|
|
|
|
% If this character appears in an error message or help string, it
|
|
% starts a new line in the output.
|
|
@@ -357,7 +358,7 @@
|
|
% We don't want .vr (or whatever) entries like this:
|
|
% \entry{{\tt \indexbackslash }acronym}{32}{\code {\acronym}}
|
|
% "\acronym" won't work when it's read back in;
|
|
- % it needs to be
|
|
+ % it needs to be
|
|
% {\code {{\tt \backslashcurfont }acronym}
|
|
\shipout\vbox{%
|
|
% Do this early so pdf references go to the beginning of the page.
|
|
@@ -708,7 +709,7 @@
|
|
\def\?{?\spacefactor=\endofsentencespacefactor\space}
|
|
|
|
% @frenchspacing on|off says whether to put extra space after punctuation.
|
|
-%
|
|
+%
|
|
\def\onword{on}
|
|
\def\offword{off}
|
|
%
|
|
@@ -1284,7 +1285,7 @@ where each line of input produces a line
|
|
% that's what we do).
|
|
|
|
% double active backslashes.
|
|
-%
|
|
+%
|
|
{\catcode`\@=0 \catcode`\\=\active
|
|
@gdef@activebackslashdouble{%
|
|
@catcode`@\=@active
|
|
@@ -1296,11 +1297,11 @@ where each line of input produces a line
|
|
% us) handles it with this amazing macro to replace tokens, with minor
|
|
% changes for Texinfo. It is included here under the GPL by permission
|
|
% from the author, Heiko Oberdiek.
|
|
-%
|
|
+%
|
|
% #1 is the tokens to replace.
|
|
% #2 is the replacement.
|
|
% #3 is the control sequence with the string.
|
|
-%
|
|
+%
|
|
\def\HyPsdSubst#1#2#3{%
|
|
\def\HyPsdReplace##1#1##2\END{%
|
|
##1%
|
|
@@ -1335,7 +1336,10 @@ output) for that.)}
|
|
\def\cmykDarkRed{0.28 1 1 0.35}
|
|
\def\cmykBlack{0 0 0 1}
|
|
%
|
|
- \def\pdfsetcolor#1{\pdfliteral{#1 k}}
|
|
+ % k sets the color for filling (usual text, etc.);
|
|
+ % K sets the color for stroking (thin rules, e.g., normal _'s).
|
|
+ \def\pdfsetcolor#1{\pdfliteral{#1 k #1 K}}
|
|
+ %
|
|
% Set color, and create a mark which defines \thiscolor accordingly,
|
|
% so that \makeheadline knows which color to restore.
|
|
\def\setcolor#1{%
|
|
@@ -1569,11 +1573,15 @@ output) for that.)}
|
|
% tried to figure out what each command should do in the context
|
|
% of @url. for now, just make @/ a no-op, that's the only one
|
|
% people have actually reported a problem with.
|
|
- %
|
|
+ %
|
|
\normalturnoffactive
|
|
\def\@{@}%
|
|
\let\/=\empty
|
|
\makevalueexpandable
|
|
+ % do we want to go so far as to use \indexnofonts instead of just
|
|
+ % special-casing \var here?
|
|
+ \def\var##1{##1}%
|
|
+ %
|
|
\leavevmode\setcolor{\urlcolor}%
|
|
\startlink attr{/Border [0 0 0]}%
|
|
user{/Subtype /Link /A << /S /URI /URI (#1) >>}%
|
|
@@ -1604,6 +1612,7 @@ output) for that.)}
|
|
\setcolor{\linkcolor}#1\endlink}
|
|
\def\done{\edef\st{\global\noexpand\toksA={\the\toksB}}\st}
|
|
\else
|
|
+ % non-pdf mode
|
|
\let\pdfmkdest = \gobble
|
|
\let\pdfurl = \gobble
|
|
\let\endlink = \relax
|
|
@@ -1972,7 +1981,7 @@ end
|
|
|
|
% Definitions for a main text size of 11pt. This is the default in
|
|
% Texinfo.
|
|
-%
|
|
+%
|
|
\def\definetextfontsizexi{%
|
|
% Text fonts (11.2pt, magstep1).
|
|
\def\textnominalsize{11pt}
|
|
@@ -2103,7 +2112,7 @@ end
|
|
% section, chapter, etc., sizes following suit. This is for the GNU
|
|
% Press printing of the Emacs 22 manual. Maybe other manuals in the
|
|
% future. Used with @smallbook, which sets the leading to 12pt.
|
|
-%
|
|
+%
|
|
\def\definetextfontsizex{%
|
|
% Text fonts (10pt).
|
|
\def\textnominalsize{10pt}
|
|
@@ -2192,7 +2201,7 @@ end
|
|
\setfont\secsf\sfbshape{12}{1000}{OT1}
|
|
\let\secbf\secrm
|
|
\setfont\secsc\scbshape{10}{\magstep1}{OT1}
|
|
-\font\seci=cmmi12
|
|
+\font\seci=cmmi12
|
|
\font\secsy=cmsy10 scaled \magstep1
|
|
\def\sececsize{1200}
|
|
|
|
@@ -2236,7 +2245,7 @@ end
|
|
% We provide the user-level command
|
|
% @fonttextsize 10
|
|
% (or 11) to redefine the text font size. pt is assumed.
|
|
-%
|
|
+%
|
|
\def\xword{10}
|
|
\def\xiword{11}
|
|
%
|
|
@@ -2246,7 +2255,7 @@ end
|
|
%
|
|
% Set \globaldefs so that documents can use this inside @tex, since
|
|
% makeinfo 4.8 does not support it, but we need it nonetheless.
|
|
- %
|
|
+ %
|
|
\begingroup \globaldefs=1
|
|
\ifx\textsizearg\xword \definetextfontsizex
|
|
\else \ifx\textsizearg\xiword \definetextfontsizexi
|
|
@@ -2348,6 +2357,16 @@ end
|
|
\def\lsize{smaller}\def\lllsize{smaller}%
|
|
\resetmathfonts \setleading{9.5pt}}
|
|
|
|
+% Fonts for short table of contents.
|
|
+\setfont\shortcontrm\rmshape{12}{1000}{OT1}
|
|
+\setfont\shortcontbf\bfshape{10}{\magstep1}{OT1} % no cmb12
|
|
+\setfont\shortcontsl\slshape{12}{1000}{OT1}
|
|
+\setfont\shortconttt\ttshape{12}{1000}{OT1TT}
|
|
+
|
|
+% Define these just so they can be easily changed for other fonts.
|
|
+\def\angleleft{$\langle$}
|
|
+\def\angleright{$\rangle$}
|
|
+
|
|
% Set the fonts to use with the @small... environments.
|
|
\let\smallexamplefonts = \smallfonts
|
|
|
|
@@ -2361,28 +2380,128 @@ end
|
|
%
|
|
% By the way, for comparison, here's what fits with @example (10pt):
|
|
% 8.5x11=71 smallbook=60 a4=75 a5=58
|
|
-%
|
|
-% I wish the USA used A4 paper.
|
|
% --karl, 24jan03.
|
|
|
|
-
|
|
% Set up the default fonts, so we can use them for creating boxes.
|
|
%
|
|
\definetextfontsizexi
|
|
|
|
-% Define these so they can be easily changed for other fonts.
|
|
-\def\angleleft{$\langle$}
|
|
-\def\angleright{$\rangle$}
|
|
+
|
|
+\message{markup,}
|
|
+
|
|
+% Check if we are currently using a typewriter font. Since all the
|
|
+% Computer Modern typewriter fonts have zero interword stretch (and
|
|
+% shrink), and it is reasonable to expect all typewriter fonts to have
|
|
+% this property, we can check that font parameter.
|
|
+%
|
|
+\def\ifmonospace{\ifdim\fontdimen3\font=0pt }
|
|
+
|
|
+% Markup style infrastructure. \defmarkupstylesetup\INITMACRO will
|
|
+% define and register \INITMACRO to be called on markup style changes.
|
|
+% \INITMACRO can check \currentmarkupstyle for the innermost
|
|
+% style and the set of \ifmarkupSTYLE switches for all styles
|
|
+% currently in effect.
|
|
+\newif\ifmarkupvar
|
|
+\newif\ifmarkupsamp
|
|
+\newif\ifmarkupkey
|
|
+%\newif\ifmarkupfile % @file == @samp.
|
|
+%\newif\ifmarkupoption % @option == @samp.
|
|
+\newif\ifmarkupcode
|
|
+\newif\ifmarkupkbd
|
|
+%\newif\ifmarkupenv % @env == @code.
|
|
+%\newif\ifmarkupcommand % @command == @code.
|
|
+\newif\ifmarkuptex % @tex (and part of @math, for now).
|
|
+\newif\ifmarkupexample
|
|
+\newif\ifmarkupverb
|
|
+\newif\ifmarkupverbatim
|
|
+
|
|
+\let\currentmarkupstyle\empty
|
|
+
|
|
+\def\setupmarkupstyle#1{%
|
|
+ \csname markup#1true\endcsname
|
|
+ \def\currentmarkupstyle{#1}%
|
|
+ \markupstylesetup
|
|
+}
|
|
+
|
|
+\let\markupstylesetup\empty
|
|
+
|
|
+\def\defmarkupstylesetup#1{%
|
|
+ \expandafter\def\expandafter\markupstylesetup
|
|
+ \expandafter{\markupstylesetup #1}%
|
|
+ \def#1%
|
|
+}
|
|
+
|
|
+% Markup style setup for left and right quotes.
|
|
+\defmarkupstylesetup\markupsetuplq{%
|
|
+ \expandafter\let\expandafter \temp \csname markupsetuplq\currentmarkupstyle\endcsname
|
|
+ \ifx\temp\relax \markupsetuplqdefault \else \temp \fi
|
|
+}
|
|
+
|
|
+\defmarkupstylesetup\markupsetuprq{%
|
|
+ \expandafter\let\expandafter \temp \csname markupsetuprq\currentmarkupstyle\endcsname
|
|
+ \ifx\temp\relax \markupsetuprqdefault \else \temp \fi
|
|
+}
|
|
+
|
|
+{
|
|
+\catcode`\'=\active
|
|
+\catcode`\`=\active
|
|
+
|
|
+\gdef\markupsetuplqdefault{\let`\lq}
|
|
+\gdef\markupsetuprqdefault{\let'\rq}
|
|
+
|
|
+\gdef\markupsetcodequoteleft{\let`\codequoteleft}
|
|
+\gdef\markupsetcodequoteright{\let'\codequoteright}
|
|
+
|
|
+\gdef\markupsetnoligaturesquoteleft{\let`\noligaturesquoteleft}
|
|
+}
|
|
+
|
|
+\let\markupsetuplqcode \markupsetcodequoteleft
|
|
+\let\markupsetuprqcode \markupsetcodequoteright
|
|
+\let\markupsetuplqexample \markupsetcodequoteleft
|
|
+\let\markupsetuprqexample \markupsetcodequoteright
|
|
+\let\markupsetuplqverb \markupsetcodequoteleft
|
|
+\let\markupsetuprqverb \markupsetcodequoteright
|
|
+\let\markupsetuplqverbatim \markupsetcodequoteleft
|
|
+\let\markupsetuprqverbatim \markupsetcodequoteright
|
|
+
|
|
+\let\markupsetuplqsamp \markupsetnoligaturesquoteleft
|
|
+\let\markupsetuplqkbd \markupsetnoligaturesquoteleft
|
|
+
|
|
+% Allow an option to not replace quotes with a regular directed right
|
|
+% quote/apostrophe (char 0x27), but instead use the undirected quote
|
|
+% from cmtt (char 0x0d). The undirected quote is ugly, so don't make it
|
|
+% the default, but it works for pasting with more pdf viewers (at least
|
|
+% evince), the lilypond developers report. xpdf does work with the
|
|
+% regular 0x27.
|
|
+%
|
|
+\def\codequoteright{%
|
|
+ \expandafter\ifx\csname SETtxicodequoteundirected\endcsname\relax
|
|
+ \expandafter\ifx\csname SETcodequoteundirected\endcsname\relax
|
|
+ '%
|
|
+ \else \char'15 \fi
|
|
+ \else \char'15 \fi
|
|
+}
|
|
+%
|
|
+% and a similar option for the left quote char vs. a grave accent.
|
|
+% Modern fonts display ASCII 0x60 as a grave accent, so some people like
|
|
+% the code environments to do likewise.
|
|
+%
|
|
+\def\codequoteleft{%
|
|
+ \expandafter\ifx\csname SETtxicodequotebacktick\endcsname\relax
|
|
+ \expandafter\ifx\csname SETcodequotebacktick\endcsname\relax
|
|
+ % [Knuth] pp. 380,381,391
|
|
+ % \relax disables Spanish ligatures ?` and !` of \tt font.
|
|
+ \relax`%
|
|
+ \else \char'22 \fi
|
|
+ \else \char'22 \fi
|
|
+}
|
|
+
|
|
+% [Knuth] pp. 380,381,391, disable Spanish ligatures ?` and !` of \tt font.
|
|
+\def\noligaturesquoteleft{\relax\lq}
|
|
|
|
% Count depth in font-changes, for error checks
|
|
\newcount\fontdepth \fontdepth=0
|
|
|
|
-% Fonts for short table of contents.
|
|
-\setfont\shortcontrm\rmshape{12}{1000}{OT1}
|
|
-\setfont\shortcontbf\bfshape{10}{\magstep1}{OT1} % no cmb12
|
|
-\setfont\shortcontsl\slshape{12}{1000}{OT1}
|
|
-\setfont\shortconttt\ttshape{12}{1000}{OT1TT}
|
|
-
|
|
%% Add scribe-like font environments, plus @l for inline lisp (usually sans
|
|
%% serif) and @ii for TeX italic
|
|
|
|
@@ -2397,7 +2516,7 @@ end
|
|
% @var is set to this for defun arguments.
|
|
\def\ttslanted#1{{\ttsl #1}\futurelet\next\smartitalicx}
|
|
|
|
-% like \smartslanted except unconditionally use \sl. We never want
|
|
+% @cite is like \smartslanted except unconditionally use \sl. We never want
|
|
% ttsl for book titles, do we?
|
|
\def\cite#1{{\sl #1}\futurelet\next\smartitalicx}
|
|
|
|
@@ -2407,7 +2526,12 @@ end
|
|
\let\dfn=\smartslanted
|
|
\let\emph=\smartitalic
|
|
|
|
-% @b, explicit bold.
|
|
+% Explicit font changes: @r, @sc, undocumented @ii.
|
|
+\def\r#1{{\rm #1}} % roman font
|
|
+\def\sc#1{{\smallcaps#1}} % smallcaps font
|
|
+\def\ii#1{{\it #1}} % italic font
|
|
+
|
|
+% @b, explicit bold. Also @strong.
|
|
\def\b#1{{\bf #1}}
|
|
\let\strong=\b
|
|
|
|
@@ -2439,22 +2563,35 @@ end
|
|
\catcode`@=\other
|
|
\def\endofsentencespacefactor{3000}% default
|
|
|
|
+% @t, explicit typewriter.
|
|
\def\t#1{%
|
|
{\tt \rawbackslash \plainfrenchspacing #1}%
|
|
\null
|
|
}
|
|
+
|
|
+% @samp.
|
|
\def\samp#1{{\setupmarkupstyle{samp}\lq\tclose{#1}\rq\null}}
|
|
-\setfont\keyrm\rmshape{8}{1000}{OT1}
|
|
-\font\keysy=cmsy9
|
|
-\def\key#1{{\keyrm\textfont2=\keysy \leavevmode\hbox{%
|
|
- \raise0.4pt\hbox{\angleleft}\kern-.08em\vtop{%
|
|
- \vbox{\hrule\kern-0.4pt
|
|
- \hbox{\raise0.4pt\hbox{\vphantom{\angleleft}}#1}}%
|
|
- \kern-0.4pt\hrule}%
|
|
- \kern-.06em\raise0.4pt\hbox{\angleright}}}}
|
|
-\def\key #1{{\setupmarkupstyle{key}\nohyphenation \uppercase{#1}}\null}
|
|
-% The old definition, with no lozenge:
|
|
-%\def\key #1{{\ttsl \nohyphenation \uppercase{#1}}\null}
|
|
+
|
|
+% definition of @key that produces a lozenge. Doesn't adjust to text size.
|
|
+%\setfont\keyrm\rmshape{8}{1000}{OT1}
|
|
+%\font\keysy=cmsy9
|
|
+%\def\key#1{{\keyrm\textfont2=\keysy \leavevmode\hbox{%
|
|
+% \raise0.4pt\hbox{\angleleft}\kern-.08em\vtop{%
|
|
+% \vbox{\hrule\kern-0.4pt
|
|
+% \hbox{\raise0.4pt\hbox{\vphantom{\angleleft}}#1}}%
|
|
+% \kern-0.4pt\hrule}%
|
|
+% \kern-.06em\raise0.4pt\hbox{\angleright}}}}
|
|
+
|
|
+% definition of @key with no lozenge. If the current font is already
|
|
+% monospace, don't change it; that way, we respect @kbdinputstyle. But
|
|
+% if it isn't monospace, then use \tt.
|
|
+%
|
|
+\def\key#1{{\setupmarkupstyle{key}%
|
|
+ \nohyphenation
|
|
+ \ifmonospace\else\tt\fi
|
|
+ #1}\null}
|
|
+
|
|
+% ctrl is no longer a Texinfo command.
|
|
\def\ctrl #1{{\tt \rawbackslash \hat}#1}
|
|
|
|
% @file, @option are the same as @samp.
|
|
@@ -2532,7 +2669,7 @@ end
|
|
% each of the four underscores in __typeof__. This is undesirable in
|
|
% some manuals, especially if they don't have long identifiers in
|
|
% general. @allowcodebreaks provides a way to control this.
|
|
-%
|
|
+%
|
|
\newif\ifallowcodebreaks \allowcodebreakstrue
|
|
|
|
\def\keywordtrue{true}
|
|
@@ -2552,6 +2689,7 @@ end
|
|
|
|
% @kbd is like @code, except that if the argument is just one @key command,
|
|
% then @kbd has no effect.
|
|
+\def\kbd#1{{\setupmarkupstyle{kbd}\def\look{#1}\expandafter\kbdfoo\look??\par}}
|
|
|
|
% @kbdinputstyle -- arg is `distinct' (@kbd uses slanted tty font always),
|
|
% `example' (@kbd uses ttsl only inside of @example and friends),
|
|
@@ -2573,7 +2711,7 @@ end
|
|
\def\wordexample{example}
|
|
\def\wordcode{code}
|
|
|
|
-% Default is `distinct.'
|
|
+% Default is `distinct'.
|
|
\kbdinputstyle distinct
|
|
|
|
\def\xkey{\key}
|
|
@@ -2643,34 +2781,20 @@ end
|
|
\let\email=\uref
|
|
\fi
|
|
|
|
-% Check if we are currently using a typewriter font. Since all the
|
|
-% Computer Modern typewriter fonts have zero interword stretch (and
|
|
-% shrink), and it is reasonable to expect all typewriter fonts to have
|
|
-% this property, we can check that font parameter.
|
|
-%
|
|
-\def\ifmonospace{\ifdim\fontdimen3\font=0pt }
|
|
-
|
|
% Typeset a dimension, e.g., `in' or `pt'. The only reason for the
|
|
% argument is to make the input look right: @dmn{pt} instead of @dmn{}pt.
|
|
%
|
|
\def\dmn#1{\thinspace #1}
|
|
|
|
-\def\kbd#1{{\setupmarkupstyle{kbd}\def\look{#1}\expandafter\kbdfoo\look??\par}}
|
|
-
|
|
% @l was never documented to mean ``switch to the Lisp font'',
|
|
% and it is not used as such in any manual I can find. We need it for
|
|
% Polish suppressed-l. --karl, 22sep96.
|
|
%\def\l#1{{\li #1}\null}
|
|
|
|
-% Explicit font changes: @r, @sc, undocumented @ii.
|
|
-\def\r#1{{\rm #1}} % roman font
|
|
-\def\sc#1{{\smallcaps#1}} % smallcaps font
|
|
-\def\ii#1{{\it #1}} % italic font
|
|
-
|
|
% @acronym for "FBI", "NATO", and the like.
|
|
% We print this one point size smaller, since it's intended for
|
|
% all-uppercase.
|
|
-%
|
|
+%
|
|
\def\acronym#1{\doacronym #1,,\finish}
|
|
\def\doacronym#1,#2,#3\finish{%
|
|
{\selectfonts\lsize #1}%
|
|
@@ -2682,7 +2806,7 @@ end
|
|
|
|
% @abbr for "Comput. J." and the like.
|
|
% No font change, but don't do end-of-sentence spacing.
|
|
-%
|
|
+%
|
|
\def\abbr#1{\doabbr #1,,\finish}
|
|
\def\doabbr#1,#2,#3\finish{%
|
|
{\plainfrenchspacing #1}%
|
|
@@ -2692,6 +2816,44 @@ end
|
|
\fi
|
|
}
|
|
|
|
+
|
|
+\message{glyphs,}
|
|
+
|
|
+% @point{}, @result{}, @expansion{}, @print{}, @equiv{}.
|
|
+%
|
|
+% Since these characters are used in examples, they should be an even number of
|
|
+% \tt widths. Each \tt character is 1en, so two makes it 1em.
|
|
+%
|
|
+\def\point{$\star$}
|
|
+\def\arrow{\leavevmode\raise.05ex\hbox to 1em{\hfil$\rightarrow$\hfil}}
|
|
+\def\result{\leavevmode\raise.05ex\hbox to 1em{\hfil$\Rightarrow$\hfil}}
|
|
+\def\expansion{\leavevmode\hbox to 1em{\hfil$\mapsto$\hfil}}
|
|
+\def\print{\leavevmode\lower.1ex\hbox to 1em{\hfil$\dashv$\hfil}}
|
|
+\def\equiv{\leavevmode\hbox to 1em{\hfil$\ptexequiv$\hfil}}
|
|
+
|
|
+% The @error{} command.
|
|
+% Adapted from the TeXbook's \boxit.
|
|
+%
|
|
+\newbox\errorbox
|
|
+%
|
|
+{\tentt \global\dimen0 = 3em}% Width of the box.
|
|
+\dimen2 = .55pt % Thickness of rules
|
|
+% The text. (`r' is open on the right, `e' somewhat less so on the left.)
|
|
+\setbox0 = \hbox{\kern-.75pt \reducedsf error\kern-1.5pt}
|
|
+%
|
|
+\setbox\errorbox=\hbox to \dimen0{\hfil
|
|
+ \hsize = \dimen0 \advance\hsize by -5.8pt % Space to left+right.
|
|
+ \advance\hsize by -2\dimen2 % Rules.
|
|
+ \vbox{%
|
|
+ \hrule height\dimen2
|
|
+ \hbox{\vrule width\dimen2 \kern3pt % Space to left of text.
|
|
+ \vtop{\kern2.4pt \box0 \kern2.4pt}% Space above/below.
|
|
+ \kern3pt\vrule width\dimen2}% Space to right.
|
|
+ \hrule height\dimen2}
|
|
+ \hfil}
|
|
+%
|
|
+\def\error{\leavevmode\lower.7ex\copy\errorbox}
|
|
+
|
|
% @pounds{} is a sterling sign, which Knuth put in the CM italic font.
|
|
%
|
|
\def\pounds{{\it\$}}
|
|
@@ -2701,52 +2863,59 @@ end
|
|
% Theiling, which support regular, slanted, bold and bold slanted (and
|
|
% "outlined" (blackboard board, sort of) versions, which we don't need).
|
|
% It is available from http://www.ctan.org/tex-archive/fonts/eurosym.
|
|
-%
|
|
+%
|
|
% Although only regular is the truly official Euro symbol, we ignore
|
|
% that. The Euro is designed to be slightly taller than the regular
|
|
% font height.
|
|
-%
|
|
+%
|
|
% feymr - regular
|
|
% feymo - slanted
|
|
% feybr - bold
|
|
% feybo - bold slanted
|
|
-%
|
|
+%
|
|
% There is no good (free) typewriter version, to my knowledge.
|
|
% A feymr10 euro is ~7.3pt wide, while a normal cmtt10 char is ~5.25pt wide.
|
|
% Hmm.
|
|
-%
|
|
+%
|
|
% Also doesn't work in math. Do we need to do math with euro symbols?
|
|
% Hope not.
|
|
-%
|
|
-%
|
|
+%
|
|
+%
|
|
\def\euro{{\eurofont e}}
|
|
\def\eurofont{%
|
|
% We set the font at each command, rather than predefining it in
|
|
% \textfonts and the other font-switching commands, so that
|
|
% installations which never need the symbol don't have to have the
|
|
% font installed.
|
|
- %
|
|
+ %
|
|
% There is only one designed size (nominal 10pt), so we always scale
|
|
% that to the current nominal size.
|
|
- %
|
|
+ %
|
|
% By the way, simply using "at 1em" works for cmr10 and the like, but
|
|
% does not work for cmbx10 and other extended/shrunken fonts.
|
|
- %
|
|
+ %
|
|
\def\eurosize{\csname\curfontsize nominalsize\endcsname}%
|
|
%
|
|
- \ifx\curfontstyle\bfstylename
|
|
+ \ifx\curfontstyle\bfstylename
|
|
% bold:
|
|
\font\thiseurofont = \ifusingit{feybo10}{feybr10} at \eurosize
|
|
- \else
|
|
+ \else
|
|
% regular:
|
|
\font\thiseurofont = \ifusingit{feymo10}{feymr10} at \eurosize
|
|
\fi
|
|
\thiseurofont
|
|
}
|
|
|
|
-% Hacks for glyphs from the EC fonts similar to \euro. We don't
|
|
-% use \let for the aliases, because sometimes we redefine the original
|
|
-% macro, and the alias should reflect the redefinition.
|
|
+% Glyphs from the EC fonts. We don't use \let for the aliases, because
|
|
+% sometimes we redefine the original macro, and the alias should reflect
|
|
+% the redefinition.
|
|
+%
|
|
+% Use LaTeX names for the Icelandic letters.
|
|
+\def\DH{{\ecfont \char"D0}} % Eth
|
|
+\def\dh{{\ecfont \char"F0}} % eth
|
|
+\def\TH{{\ecfont \char"DE}} % Thorn
|
|
+\def\th{{\ecfont \char"FE}} % thorn
|
|
+%
|
|
\def\guillemetleft{{\ecfont \char"13}}
|
|
\def\guillemotleft{\guillemetleft}
|
|
\def\guillemetright{{\ecfont \char"14}}
|
|
@@ -2760,7 +2929,7 @@ end
|
|
% we have the precomposed glyphs for the most common cases. We put the
|
|
% tests to use those glyphs in the single \ogonek macro so we have fewer
|
|
% dummy definitions to worry about for index entries, etc.
|
|
-%
|
|
+%
|
|
% ogonek is also used with other letters in Lithuanian (IOU), but using
|
|
% the precomposed glyphs for those is not so easy since they aren't in
|
|
% the same EC font.
|
|
@@ -2783,6 +2952,7 @@ end
|
|
\def\Eogonek{{\ecfont \char"86}}\def\macrocharE{E}
|
|
\def\eogonek{{\ecfont \char"A6}}\def\macrochare{e}
|
|
%
|
|
+% Use the ec* fonts (cm-super in outline format) for non-CM glyphs.
|
|
\def\ecfont{%
|
|
% We can't distinguish serif/sans and italic/slanted, but this
|
|
% is used for crude hacks anyway (like adding French and German
|
|
@@ -2817,7 +2987,7 @@ end
|
|
% Laurent Siebenmann reports \Orb undefined with:
|
|
% Textures 1.7.7 (preloaded format=plain 93.10.14) (68K) 16 APR 2004 02:38
|
|
% so we'll define it if necessary.
|
|
-%
|
|
+%
|
|
\ifx\Orb\undefined
|
|
\def\Orb{\mathhexbox20D}
|
|
\fi
|
|
@@ -3163,7 +3333,7 @@ end
|
|
% cause the example and the item to crash together. So we use this
|
|
% bizarre value of 10001 as a signal to \aboveenvbreak to insert
|
|
% \parskip glue after all. Section titles are handled this way also.
|
|
- %
|
|
+ %
|
|
\penalty 10001
|
|
\endgroup
|
|
\itemxneedsnegativevskipfalse
|
|
@@ -3257,9 +3427,18 @@ end
|
|
\parindent=0pt
|
|
\parskip=\smallskipamount
|
|
\ifdim\parskip=0pt \parskip=2pt \fi
|
|
+ %
|
|
+ % Try typesetting the item mark that if the document erroneously says
|
|
+ % something like @itemize @samp (intending @table), there's an error
|
|
+ % right away at the @itemize. It's not the best error message in the
|
|
+ % world, but it's better than leaving it to the @item. This means if
|
|
+ % the user wants an empty mark, they have to say @w{} not just @w.
|
|
\def\itemcontents{#1}%
|
|
+ \setbox0 = \hbox{\itemcontents}%
|
|
+ %
|
|
% @itemize with no arg is equivalent to @itemize @bullet.
|
|
\ifx\itemcontents\empty\def\itemcontents{\bullet}\fi
|
|
+ %
|
|
\let\item=\itemizeitem
|
|
}
|
|
|
|
@@ -3280,6 +3459,7 @@ end
|
|
\ifnum\lastpenalty<10000 \parskip=0in \fi
|
|
\noindent
|
|
\hbox to 0pt{\hss \itemcontents \kern\itemmargin}%
|
|
+ %
|
|
\vadjust{\penalty 1200}}% not good to break after first line of item.
|
|
\flushcr
|
|
}
|
|
@@ -3501,12 +3681,19 @@ end
|
|
%
|
|
% @headitem starts a heading row, which we typeset in bold.
|
|
% Assignments have to be global since we are inside the implicit group
|
|
-% of an alignment entry. Note that \everycr resets \everytab.
|
|
-\def\headitem{\checkenv\multitable \crcr \global\everytab={\bf}\the\everytab}%
|
|
+% of an alignment entry. \everycr resets \everytab so we don't have to
|
|
+% undo it ourselves.
|
|
+\def\headitemfont{\b}% for people to use in the template row; not changeable
|
|
+\def\headitem{%
|
|
+ \checkenv\multitable
|
|
+ \crcr
|
|
+ \global\everytab={\bf}% can't use \headitemfont since the parsing differs
|
|
+ \the\everytab % for the first item
|
|
+}%
|
|
%
|
|
% A \tab used to include \hskip1sp. But then the space in a template
|
|
% line is not enough. That is bad. So let's go back to just `&' until
|
|
-% we encounter the problem it was intended to solve again.
|
|
+% we again encounter the problem the 1sp was intended to solve.
|
|
% --karl, nathan@acm.org, 20apr99.
|
|
\def\tab{\checkenv\multitable &\the\everytab}%
|
|
|
|
@@ -3959,7 +4146,7 @@ end
|
|
% processing continues to some further point. On the other hand, it
|
|
% seems \endinput does not hurt in the printed index arg, since that
|
|
% is still getting written without apparent harm.
|
|
- %
|
|
+ %
|
|
% Sample source (mac-idx3.tex, reported by Graham Percival to
|
|
% help-texinfo, 22may06):
|
|
% @macro funindex {WORD}
|
|
@@ -3967,12 +4154,12 @@ end
|
|
% @end macro
|
|
% ...
|
|
% @funindex commtest
|
|
- %
|
|
+ %
|
|
% The above is not enough to reproduce the bug, but it gives the flavor.
|
|
- %
|
|
+ %
|
|
% Sample whatsit resulting:
|
|
% .@write3{\entry{xyz}{@folio }{@code {xyz@endinput }}}
|
|
- %
|
|
+ %
|
|
% So:
|
|
\let\endinput = \empty
|
|
%
|
|
@@ -4024,19 +4211,23 @@ end
|
|
% Non-English letters.
|
|
\definedummyword\AA
|
|
\definedummyword\AE
|
|
+ \definedummyword\DH
|
|
\definedummyword\L
|
|
- \definedummyword\OE
|
|
\definedummyword\O
|
|
+ \definedummyword\OE
|
|
+ \definedummyword\TH
|
|
\definedummyword\aa
|
|
\definedummyword\ae
|
|
+ \definedummyword\dh
|
|
+ \definedummyword\exclamdown
|
|
\definedummyword\l
|
|
- \definedummyword\oe
|
|
\definedummyword\o
|
|
- \definedummyword\ss
|
|
- \definedummyword\exclamdown
|
|
- \definedummyword\questiondown
|
|
+ \definedummyword\oe
|
|
\definedummyword\ordf
|
|
\definedummyword\ordm
|
|
+ \definedummyword\questiondown
|
|
+ \definedummyword\ss
|
|
+ \definedummyword\th
|
|
%
|
|
% Although these internal commands shouldn't show up, sometimes they do.
|
|
\definedummyword\bf
|
|
@@ -4179,19 +4370,23 @@ end
|
|
% Non-English letters.
|
|
\def\AA{AA}%
|
|
\def\AE{AE}%
|
|
+ \def\DH{DZZ}%
|
|
\def\L{L}%
|
|
\def\OE{OE}%
|
|
\def\O{O}%
|
|
+ \def\TH{ZZZ}%
|
|
\def\aa{aa}%
|
|
\def\ae{ae}%
|
|
+ \def\dh{dzz}%
|
|
+ \def\exclamdown{!}%
|
|
\def\l{l}%
|
|
\def\oe{oe}%
|
|
- \def\o{o}%
|
|
- \def\ss{ss}%
|
|
- \def\exclamdown{!}%
|
|
- \def\questiondown{?}%
|
|
\def\ordf{a}%
|
|
\def\ordm{o}%
|
|
+ \def\o{o}%
|
|
+ \def\questiondown{?}%
|
|
+ \def\ss{ss}%
|
|
+ \def\th{zzz}%
|
|
%
|
|
\def\LaTeX{LaTeX}%
|
|
\def\TeX{TeX}%
|
|
@@ -4201,20 +4396,19 @@ end
|
|
\def\bullet{bullet}%
|
|
\def\comma{,}%
|
|
\def\copyright{copyright}%
|
|
- \def\registeredsymbol{R}%
|
|
\def\dots{...}%
|
|
\def\enddots{...}%
|
|
\def\equiv{==}%
|
|
\def\error{error}%
|
|
\def\euro{euro}%
|
|
+ \def\expansion{==>}%
|
|
\def\guillemetleft{<<}%
|
|
\def\guillemetright{>>}%
|
|
\def\guilsinglleft{<}%
|
|
\def\guilsinglright{>}%
|
|
- \def\expansion{==>}%
|
|
\def\minus{-}%
|
|
- \def\pounds{pounds}%
|
|
\def\point{.}%
|
|
+ \def\pounds{pounds}%
|
|
\def\print{-|}%
|
|
\def\quotedblbase{"}%
|
|
\def\quotedblleft{"}%
|
|
@@ -4222,19 +4416,20 @@ end
|
|
\def\quoteleft{`}%
|
|
\def\quoteright{'}%
|
|
\def\quotesinglbase{,}%
|
|
+ \def\registeredsymbol{R}%
|
|
\def\result{=>}%
|
|
- \def\textdegree{degrees}%
|
|
+ \def\textdegree{o}%
|
|
%
|
|
% We need to get rid of all macros, leaving only the arguments (if present).
|
|
% Of course this is not nearly correct, but it is the best we can do for now.
|
|
% makeinfo does not expand macros in the argument to @deffn, which ends up
|
|
% writing an index entry, and texindex isn't prepared for an index sort entry
|
|
% that starts with \.
|
|
- %
|
|
+ %
|
|
% Since macro invocations are followed by braces, we can just redefine them
|
|
% to take a single TeX argument. The case of a macro invocation that
|
|
% goes to end-of-line is not handled.
|
|
- %
|
|
+ %
|
|
\macrolist
|
|
}
|
|
|
|
@@ -4362,7 +4557,7 @@ end
|
|
% to re-insert the same penalty (values >10000 are used for various
|
|
% signals); since we just inserted a non-discardable item, any
|
|
% following glue (such as a \parskip) would be a breakpoint. For example:
|
|
- %
|
|
+ %
|
|
% @deffn deffn-whatever
|
|
% @vindex index-whatever
|
|
% Description.
|
|
@@ -4943,7 +5138,9 @@ end
|
|
\gdef\chaplevelprefix{\the\chapno.}%
|
|
\resetallfloatnos
|
|
%
|
|
- \message{\putwordChapter\space \the\chapno}%
|
|
+ % \putwordChapter can contain complex things in translations.
|
|
+ \toks0=\expandafter{\putwordChapter}%
|
|
+ \message{\the\toks0 \space \the\chapno}%
|
|
%
|
|
% Write the actual heading.
|
|
\chapmacro{#1}{Ynumbered}{\the\chapno}%
|
|
@@ -4954,15 +5151,17 @@ end
|
|
\global\let\subsubsection = \numberedsubsubsec
|
|
}
|
|
|
|
-\outer\parseargdef\appendix{\apphead0{#1}} % normally apphead0 calls appendixzzz
|
|
+\outer\parseargdef\appendix{\apphead0{#1}} % normally calls appendixzzz
|
|
+%
|
|
\def\appendixzzz#1{%
|
|
\global\secno=0 \global\subsecno=0 \global\subsubsecno=0
|
|
\global\advance\appendixno by 1
|
|
\gdef\chaplevelprefix{\appendixletter.}%
|
|
\resetallfloatnos
|
|
%
|
|
- \def\appendixnum{\putwordAppendix\space \appendixletter}%
|
|
- \message{\appendixnum}%
|
|
+ % \putwordAppendix can contain complex things in translations.
|
|
+ \toks0=\expandafter{\putwordAppendix}%
|
|
+ \message{\the\toks0 \space \appendixletter}%
|
|
%
|
|
\chapmacro{#1}{Yappendix}{\appendixletter}%
|
|
%
|
|
@@ -5102,7 +5301,7 @@ end
|
|
\def\chapheading{\chapbreak \parsearg\chapheadingzzz}
|
|
\def\chapheadingzzz#1{%
|
|
{\chapfonts \vbox{\hyphenpenalty=10000\tolerance=5000
|
|
- \parindent=0pt\raggedright
|
|
+ \parindent=0pt\ptexraggedright
|
|
\rmisbold #1\hfill}}%
|
|
\bigskip \par\penalty 200\relax
|
|
\suppressfirstparagraphindent
|
|
@@ -5195,7 +5394,10 @@ end
|
|
\xdef\lastchapterdefs{%
|
|
\gdef\noexpand\thischaptername{\the\toks0}%
|
|
\gdef\noexpand\thischapternum{\appendixletter}%
|
|
- \gdef\noexpand\thischapter{\putwordAppendix{} \noexpand\thischapternum:
|
|
+ % \noexpand\putwordAppendix avoids expanding indigestible
|
|
+ % commands in some of the translations.
|
|
+ \gdef\noexpand\thischapter{\noexpand\putwordAppendix{}
|
|
+ \noexpand\thischapternum:
|
|
\noexpand\thischaptername}%
|
|
}%
|
|
\else
|
|
@@ -5203,7 +5405,10 @@ end
|
|
\xdef\lastchapterdefs{%
|
|
\gdef\noexpand\thischaptername{\the\toks0}%
|
|
\gdef\noexpand\thischapternum{\the\chapno}%
|
|
- \gdef\noexpand\thischapter{\putwordChapter{} \noexpand\thischapternum:
|
|
+ % \noexpand\putwordChapter avoids expanding indigestible
|
|
+ % commands in some of the translations.
|
|
+ \gdef\noexpand\thischapter{\noexpand\putwordChapter{}
|
|
+ \noexpand\thischapternum:
|
|
\noexpand\thischaptername}%
|
|
}%
|
|
\fi\fi\fi
|
|
@@ -5259,7 +5464,7 @@ end
|
|
%
|
|
% Typeset the actual heading.
|
|
\nobreak % Avoid page breaks at the interline glue.
|
|
- \vbox{\hyphenpenalty=10000 \tolerance=5000 \parindent=0pt \raggedright
|
|
+ \vbox{\hyphenpenalty=10000 \tolerance=5000 \parindent=0pt \ptexraggedright
|
|
\hangindent=\wd0 \centerparametersmaybe
|
|
\unhbox0 #1\par}%
|
|
}%
|
|
@@ -5283,7 +5488,7 @@ end
|
|
%
|
|
\def\unnchfopen #1{%
|
|
\chapoddpage {\chapfonts \vbox{\hyphenpenalty=10000\tolerance=5000
|
|
- \parindent=0pt\raggedright
|
|
+ \parindent=0pt\ptexraggedright
|
|
\rmisbold #1\hfill}}\bigskip \par\nobreak
|
|
}
|
|
\def\chfopen #1#2{\chapoddpage {\chapfonts
|
|
@@ -5346,7 +5551,10 @@ end
|
|
\xdef\lastsectiondefs{%
|
|
\gdef\noexpand\thissectionname{\the\toks0}%
|
|
\gdef\noexpand\thissectionnum{#4}%
|
|
- \gdef\noexpand\thissection{\putwordSection{} \noexpand\thissectionnum:
|
|
+ % \noexpand\putwordSection avoids expanding indigestible
|
|
+ % commands in some of the translations.
|
|
+ \gdef\noexpand\thissection{\noexpand\putwordSection{}
|
|
+ \noexpand\thissectionnum:
|
|
\noexpand\thissectionname}%
|
|
}%
|
|
\fi
|
|
@@ -5356,12 +5564,20 @@ end
|
|
\xdef\lastsectiondefs{%
|
|
\gdef\noexpand\thissectionname{\the\toks0}%
|
|
\gdef\noexpand\thissectionnum{#4}%
|
|
- \gdef\noexpand\thissection{\putwordSection{} \noexpand\thissectionnum:
|
|
+ % \noexpand\putwordSection avoids expanding indigestible
|
|
+ % commands in some of the translations.
|
|
+ \gdef\noexpand\thissection{\noexpand\putwordSection{}
|
|
+ \noexpand\thissectionnum:
|
|
\noexpand\thissectionname}%
|
|
}%
|
|
\fi
|
|
\fi\fi\fi
|
|
%
|
|
+ % Go into vertical mode. Usually we'll already be there, but we
|
|
+ % don't want the following whatsit to end up in a preceding paragraph
|
|
+ % if the document didn't happen to have a blank line.
|
|
+ \par
|
|
+ %
|
|
% Output the mark. Pass it through \safewhatsit, to take care of
|
|
% the preceding space.
|
|
\safewhatsit\domark
|
|
@@ -5411,7 +5627,7 @@ end
|
|
\nobreak
|
|
%
|
|
% Output the actual section heading.
|
|
- \vbox{\hyphenpenalty=10000 \tolerance=5000 \parindent=0pt \raggedright
|
|
+ \vbox{\hyphenpenalty=10000 \tolerance=5000 \parindent=0pt \ptexraggedright
|
|
\hangindent=\wd0 % zero if no section number
|
|
\unhbox0 #1}%
|
|
}%
|
|
@@ -5427,11 +5643,11 @@ end
|
|
% glue accumulate. (Not a breakpoint because it's preceded by a
|
|
% discardable item.)
|
|
\vskip-\parskip
|
|
- %
|
|
+ %
|
|
% This is purely so the last item on the list is a known \penalty >
|
|
% 10000. This is so \startdefun can avoid allowing breakpoints after
|
|
% section headings. Otherwise, it would insert a valid breakpoint between:
|
|
- %
|
|
+ %
|
|
% @section sec-whatever
|
|
% @deffn def-whatever
|
|
\penalty 10001
|
|
@@ -5489,7 +5705,7 @@ end
|
|
% These characters do not print properly in the Computer Modern roman
|
|
% fonts, so we must take special care. This is more or less redundant
|
|
% with the Texinfo input format setup at the end of this file.
|
|
-%
|
|
+%
|
|
\def\activecatcodes{%
|
|
\catcode`\"=\active
|
|
\catcode`\$=\active
|
|
@@ -5539,7 +5755,7 @@ end
|
|
|
|
% redefined for the two-volume lispref. We always output on
|
|
% \jobname.toc even if this is redefined.
|
|
-%
|
|
+%
|
|
\def\tocreadfilename{\jobname.toc}
|
|
|
|
% Normal (long) toc.
|
|
@@ -5709,144 +5925,6 @@ end
|
|
\message{environments,}
|
|
% @foo ... @end foo.
|
|
|
|
-% Markup style infrastructure. \defmarkupstylesetup\INITMACRO will
|
|
-% define and register \INITMACRO to be called on markup style changes.
|
|
-% \INITMACRO can check \currentmarkupstyle for the innermost
|
|
-% style and the set of \ifmarkupSTYLE switches for all styles
|
|
-% currently in effect.
|
|
-\newif\ifmarkupvar
|
|
-\newif\ifmarkupsamp
|
|
-\newif\ifmarkupkey
|
|
-%\newif\ifmarkupfile % @file == @samp.
|
|
-%\newif\ifmarkupoption % @option == @samp.
|
|
-\newif\ifmarkupcode
|
|
-\newif\ifmarkupkbd
|
|
-%\newif\ifmarkupenv % @env == @code.
|
|
-%\newif\ifmarkupcommand % @command == @code.
|
|
-\newif\ifmarkuptex % @tex (and part of @math, for now).
|
|
-\newif\ifmarkupexample
|
|
-\newif\ifmarkupverb
|
|
-\newif\ifmarkupverbatim
|
|
-
|
|
-\let\currentmarkupstyle\empty
|
|
-
|
|
-\def\setupmarkupstyle#1{%
|
|
- \csname markup#1true\endcsname
|
|
- \def\currentmarkupstyle{#1}%
|
|
- \markupstylesetup
|
|
-}
|
|
-
|
|
-\let\markupstylesetup\empty
|
|
-
|
|
-\def\defmarkupstylesetup#1{%
|
|
- \expandafter\def\expandafter\markupstylesetup
|
|
- \expandafter{\markupstylesetup #1}%
|
|
- \def#1%
|
|
-}
|
|
-
|
|
-% Markup style setup for left and right quotes.
|
|
-\defmarkupstylesetup\markupsetuplq{%
|
|
- \expandafter\let\expandafter \temp \csname markupsetuplq\currentmarkupstyle\endcsname
|
|
- \ifx\temp\relax \markupsetuplqdefault \else \temp \fi
|
|
-}
|
|
-
|
|
-\defmarkupstylesetup\markupsetuprq{%
|
|
- \expandafter\let\expandafter \temp \csname markupsetuprq\currentmarkupstyle\endcsname
|
|
- \ifx\temp\relax \markupsetuprqdefault \else \temp \fi
|
|
-}
|
|
-
|
|
-{
|
|
-\catcode`\'=\active
|
|
-\catcode`\`=\active
|
|
-
|
|
-\gdef\markupsetuplqdefault{\let`\lq}
|
|
-\gdef\markupsetuprqdefault{\let'\rq}
|
|
-
|
|
-\gdef\markupsetcodequoteleft{\let`\codequoteleft}
|
|
-\gdef\markupsetcodequoteright{\let'\codequoteright}
|
|
-
|
|
-\gdef\markupsetnoligaturesquoteleft{\let`\noligaturesquoteleft}
|
|
-}
|
|
-
|
|
-\let\markupsetuplqcode \markupsetcodequoteleft
|
|
-\let\markupsetuprqcode \markupsetcodequoteright
|
|
-\let\markupsetuplqexample \markupsetcodequoteleft
|
|
-\let\markupsetuprqexample \markupsetcodequoteright
|
|
-\let\markupsetuplqverb \markupsetcodequoteleft
|
|
-\let\markupsetuprqverb \markupsetcodequoteright
|
|
-\let\markupsetuplqverbatim \markupsetcodequoteleft
|
|
-\let\markupsetuprqverbatim \markupsetcodequoteright
|
|
-
|
|
-\let\markupsetuplqsamp \markupsetnoligaturesquoteleft
|
|
-\let\markupsetuplqkbd \markupsetnoligaturesquoteleft
|
|
-
|
|
-% Allow an option to not replace quotes with a regular directed right
|
|
-% quote/apostrophe (char 0x27), but instead use the undirected quote
|
|
-% from cmtt (char 0x0d). The undirected quote is ugly, so don't make it
|
|
-% the default, but it works for pasting with more pdf viewers (at least
|
|
-% evince), the lilypond developers report. xpdf does work with the
|
|
-% regular 0x27.
|
|
-%
|
|
-\def\codequoteright{%
|
|
- \expandafter\ifx\csname SETtxicodequoteundirected\endcsname\relax
|
|
- \expandafter\ifx\csname SETcodequoteundirected\endcsname\relax
|
|
- '%
|
|
- \else \char'15 \fi
|
|
- \else \char'15 \fi
|
|
-}
|
|
-%
|
|
-% and a similar option for the left quote char vs. a grave accent.
|
|
-% Modern fonts display ASCII 0x60 as a grave accent, so some people like
|
|
-% the code environments to do likewise.
|
|
-%
|
|
-\def\codequoteleft{%
|
|
- \expandafter\ifx\csname SETtxicodequotebacktick\endcsname\relax
|
|
- \expandafter\ifx\csname SETcodequotebacktick\endcsname\relax
|
|
- % [Knuth] pp. 380,381,391
|
|
- % \relax disables Spanish ligatures ?` and !` of \tt font.
|
|
- \relax`%
|
|
- \else \char'22 \fi
|
|
- \else \char'22 \fi
|
|
-}
|
|
-
|
|
-% [Knuth] pp. 380,381,391, disable Spanish ligatures ?` and !` of \tt font.
|
|
-\def\noligaturesquoteleft{\relax\lq}
|
|
-
|
|
-% @point{}, @result{}, @expansion{}, @print{}, @equiv{}.
|
|
-%
|
|
-% Since these characters are used in examples, they should be an even number of
|
|
-% \tt widths. Each \tt character is 1en, so two makes it 1em.
|
|
-%
|
|
-\def\point{$\star$}
|
|
-\def\arrow{\leavevmode\raise.05ex\hbox to 1em{\hfil$\rightarrow$\hfil}}
|
|
-\def\result{\leavevmode\raise.05ex\hbox to 1em{\hfil$\Rightarrow$\hfil}}
|
|
-\def\expansion{\leavevmode\hbox to 1em{\hfil$\mapsto$\hfil}}
|
|
-\def\print{\leavevmode\lower.1ex\hbox to 1em{\hfil$\dashv$\hfil}}
|
|
-\def\equiv{\leavevmode\hbox to 1em{\hfil$\ptexequiv$\hfil}}
|
|
-
|
|
-% The @error{} command.
|
|
-% Adapted from the TeXbook's \boxit.
|
|
-%
|
|
-\newbox\errorbox
|
|
-%
|
|
-{\tentt \global\dimen0 = 3em}% Width of the box.
|
|
-\dimen2 = .55pt % Thickness of rules
|
|
-% The text. (`r' is open on the right, `e' somewhat less so on the left.)
|
|
-\setbox0 = \hbox{\kern-.75pt \reducedsf error\kern-1.5pt}
|
|
-%
|
|
-\setbox\errorbox=\hbox to \dimen0{\hfil
|
|
- \hsize = \dimen0 \advance\hsize by -5.8pt % Space to left+right.
|
|
- \advance\hsize by -2\dimen2 % Rules.
|
|
- \vbox{%
|
|
- \hrule height\dimen2
|
|
- \hbox{\vrule width\dimen2 \kern3pt % Space to left of text.
|
|
- \vtop{\kern2.4pt \box0 \kern2.4pt}% Space above/below.
|
|
- \kern3pt\vrule width\dimen2}% Space to right.
|
|
- \hrule height\dimen2}
|
|
- \hfil}
|
|
-%
|
|
-\def\error{\leavevmode\lower.7ex\copy\errorbox}
|
|
-
|
|
% @tex ... @end tex escapes into raw Tex temporarily.
|
|
% One exception: @ is still an escape character, so that @end tex works.
|
|
% But \@ or @@ will get a plain tex @ character.
|
|
@@ -5999,6 +6077,7 @@ end
|
|
|
|
% This macro is called at the beginning of all the @example variants,
|
|
% inside a group.
|
|
+\newdimen\nonfillparindent
|
|
\def\nonfillstart{%
|
|
\aboveenvbreak
|
|
\hfuzz = 12pt % Don't be fussy
|
|
@@ -6006,7 +6085,12 @@ end
|
|
\let\par = \lisppar % don't ignore blank lines
|
|
\obeylines % each line of input is a line of output
|
|
\parskip = 0pt
|
|
+ % Turn off paragraph indentation but redefine \indent to emulate
|
|
+ % the normal \indent.
|
|
+ \nonfillparindent=\parindent
|
|
\parindent = 0pt
|
|
+ \let\indent\nonfillindent
|
|
+ %
|
|
\emergencystretch = 0pt % don't try to avoid overfull boxes
|
|
\ifx\nonarrowing\relax
|
|
\advance \leftskip by \lispnarrowing
|
|
@@ -6017,6 +6101,24 @@ end
|
|
\let\exdent=\nofillexdent
|
|
}
|
|
|
|
+\begingroup
|
|
+\obeyspaces
|
|
+% We want to swallow spaces (but not other tokens) after the fake
|
|
+% @indent in our nonfill-environments, where spaces are normally
|
|
+% active and set to @tie, resulting in them not being ignored after
|
|
+% @indent.
|
|
+\gdef\nonfillindent{\futurelet\temp\nonfillindentcheck}%
|
|
+\gdef\nonfillindentcheck{%
|
|
+\ifx\temp %
|
|
+\expandafter\nonfillindentgobble%
|
|
+\else%
|
|
+\leavevmode\nonfillindentbox%
|
|
+\fi%
|
|
+}%
|
|
+\endgroup
|
|
+\def\nonfillindentgobble#1{\nonfillindent}
|
|
+\def\nonfillindentbox{\hbox to \nonfillparindent{\hss}}
|
|
+
|
|
% If you want all examples etc. small: @set dispenvsize small.
|
|
% If you want even small examples the full size: @set dispenvsize nosmall.
|
|
% This affects the following displayed environments:
|
|
@@ -6103,6 +6205,30 @@ end
|
|
\let\Eflushright = \afterenvbreak
|
|
|
|
|
|
+% @raggedright does more-or-less normal line breaking but no right
|
|
+% justification. From plain.tex.
|
|
+\envdef\raggedright{%
|
|
+ \rightskip0pt plus2em \spaceskip.3333em \xspaceskip.5em\relax
|
|
+}
|
|
+\let\Eraggedright\par
|
|
+
|
|
+\envdef\raggedleft{%
|
|
+ \parindent=0pt \leftskip0pt plus2em
|
|
+ \spaceskip.3333em \xspaceskip.5em \parfillskip=0pt
|
|
+ \hbadness=10000 % Last line will usually be underfull, so turn off
|
|
+ % badness reporting.
|
|
+}
|
|
+\let\Eraggedleft\par
|
|
+
|
|
+\envdef\raggedcenter{%
|
|
+ \parindent=0pt \rightskip0pt plus1em \leftskip0pt plus1em
|
|
+ \spaceskip.3333em \xspaceskip.5em \parfillskip=0pt
|
|
+ \hbadness=10000 % Last line will usually be underfull, so turn off
|
|
+ % badness reporting.
|
|
+}
|
|
+\let\Eraggedcenter\par
|
|
+
|
|
+
|
|
% @quotation does normal linebreaking (hence we can't use \nonfillstart)
|
|
% and narrows the margins. We keep \parskip nonzero in general, since
|
|
% we're doing normal filling. So, when using \aboveenvbreak and
|
|
@@ -6721,7 +6847,7 @@ end
|
|
% This does \let #1 = #2, with \csnames; that is,
|
|
% \let \csname#1\endcsname = \csname#2\endcsname
|
|
% (except of course we have to play expansion games).
|
|
-%
|
|
+%
|
|
\def\cslet#1#2{%
|
|
\expandafter\let
|
|
\csname#1\expandafter\endcsname
|
|
@@ -7881,21 +8007,22 @@ end
|
|
\closein 1
|
|
\endgroup % end raw TeX
|
|
\endgroup}
|
|
-}
|
|
%
|
|
% If they passed de_DE, and txi-de_DE.tex doesn't exist,
|
|
% try txi-de.tex.
|
|
-%
|
|
-\def\documentlanguagetrywithoutunderscore#1_#2\finish{%
|
|
+%
|
|
+\gdef\documentlanguagetrywithoutunderscore#1_#2\finish{%
|
|
\openin 1 txi-#1.tex
|
|
\ifeof 1
|
|
\errhelp = \nolanghelp
|
|
\errmessage{Cannot read language file txi-#1.tex}%
|
|
\else
|
|
+ \globaldefs = 1 % everything in the txi-LL files needs to persist
|
|
\input txi-#1.tex
|
|
\fi
|
|
\closein 1
|
|
}
|
|
+}% end of special _ catcode
|
|
%
|
|
\newhelp\nolanghelp{The given language definition file cannot be found or
|
|
is empty. Maybe you need to install it? Putting it in the current
|
|
@@ -7904,16 +8031,16 @@ directory should work if nowhere else do
|
|
% This macro is called from txi-??.tex files; the first argument is the
|
|
% \language name to set (without the "\lang@" prefix), the second and
|
|
% third args are \{left,right}hyphenmin.
|
|
-%
|
|
+%
|
|
% The language names to pass are determined when the format is built.
|
|
% See the etex.log file created at that time, e.g.,
|
|
% /usr/local/texlive/2008/texmf-var/web2c/pdftex/etex.log.
|
|
-%
|
|
+%
|
|
% With TeX Live 2008, etex now includes hyphenation patterns for all
|
|
% available languages. This means we can support hyphenation in
|
|
% Texinfo, at least to some extent. (This still doesn't solve the
|
|
% accented characters problem.)
|
|
-%
|
|
+%
|
|
\catcode`@=11
|
|
\def\txisetlanguage#1#2#3{%
|
|
% do not set the language if the name is undefined in the current TeX.
|
|
@@ -7968,7 +8095,7 @@ directory should work if nowhere else do
|
|
\setnonasciicharscatcode\active
|
|
\lattwochardefs
|
|
%
|
|
- \else \ifx \declaredencoding \latone
|
|
+ \else \ifx \declaredencoding \latone
|
|
\setnonasciicharscatcode\active
|
|
\latonechardefs
|
|
%
|
|
@@ -7980,7 +8107,7 @@ directory should work if nowhere else do
|
|
\setnonasciicharscatcode\active
|
|
\utfeightchardefs
|
|
%
|
|
- \else
|
|
+ \else
|
|
\message{Unknown document encoding #1, ignoring.}%
|
|
%
|
|
\fi % utfeight
|
|
@@ -7992,7 +8119,7 @@ directory should work if nowhere else do
|
|
|
|
% A message to be logged when using a character that isn't available
|
|
% the default font encoding (OT1).
|
|
-%
|
|
+%
|
|
\def\missingcharmsg#1{\message{Character missing in OT1 encoding: #1.}}
|
|
|
|
% Take account of \c (plain) vs. \, (Texinfo) difference.
|
|
@@ -8005,21 +8132,21 @@ directory should work if nowhere else do
|
|
%
|
|
% Latin1 (ISO-8859-1) character definitions.
|
|
\def\latonechardefs{%
|
|
- \gdef^^a0{~}
|
|
+ \gdef^^a0{~}
|
|
\gdef^^a1{\exclamdown}
|
|
- \gdef^^a2{\missingcharmsg{CENT SIGN}}
|
|
+ \gdef^^a2{\missingcharmsg{CENT SIGN}}
|
|
\gdef^^a3{{\pounds}}
|
|
\gdef^^a4{\missingcharmsg{CURRENCY SIGN}}
|
|
\gdef^^a5{\missingcharmsg{YEN SIGN}}
|
|
- \gdef^^a6{\missingcharmsg{BROKEN BAR}}
|
|
+ \gdef^^a6{\missingcharmsg{BROKEN BAR}}
|
|
\gdef^^a7{\S}
|
|
- \gdef^^a8{\"{}}
|
|
- \gdef^^a9{\copyright}
|
|
+ \gdef^^a8{\"{}}
|
|
+ \gdef^^a9{\copyright}
|
|
\gdef^^aa{\ordf}
|
|
\gdef^^ab{\guillemetleft}
|
|
\gdef^^ac{$\lnot$}
|
|
- \gdef^^ad{\-}
|
|
- \gdef^^ae{\registeredsymbol}
|
|
+ \gdef^^ad{\-}
|
|
+ \gdef^^ae{\registeredsymbol}
|
|
\gdef^^af{\={}}
|
|
%
|
|
\gdef^^b0{\textdegree}
|
|
@@ -8046,7 +8173,7 @@ directory should work if nowhere else do
|
|
\gdef^^c2{\^A}
|
|
\gdef^^c3{\~A}
|
|
\gdef^^c4{\"A}
|
|
- \gdef^^c5{\ringaccent A}
|
|
+ \gdef^^c5{\ringaccent A}
|
|
\gdef^^c6{\AE}
|
|
\gdef^^c7{\cedilla C}
|
|
\gdef^^c8{\`E}
|
|
@@ -8058,7 +8185,7 @@ directory should work if nowhere else do
|
|
\gdef^^ce{\^I}
|
|
\gdef^^cf{\"I}
|
|
%
|
|
- \gdef^^d0{\missingcharmsg{LATIN CAPITAL LETTER ETH}}
|
|
+ \gdef^^d0{\DH}
|
|
\gdef^^d1{\~N}
|
|
\gdef^^d2{\`O}
|
|
\gdef^^d3{\'O}
|
|
@@ -8072,7 +8199,7 @@ directory should work if nowhere else do
|
|
\gdef^^db{\^U}
|
|
\gdef^^dc{\"U}
|
|
\gdef^^dd{\'Y}
|
|
- \gdef^^de{\missingcharmsg{LATIN CAPITAL LETTER THORN}}
|
|
+ \gdef^^de{\TH}
|
|
\gdef^^df{\ss}
|
|
%
|
|
\gdef^^e0{\`a}
|
|
@@ -8092,7 +8219,7 @@ directory should work if nowhere else do
|
|
\gdef^^ee{\^{\dotless i}}
|
|
\gdef^^ef{\"{\dotless i}}
|
|
%
|
|
- \gdef^^f0{\missingcharmsg{LATIN SMALL LETTER ETH}}
|
|
+ \gdef^^f0{\dh}
|
|
\gdef^^f1{\~n}
|
|
\gdef^^f2{\`o}
|
|
\gdef^^f3{\'o}
|
|
@@ -8106,7 +8233,7 @@ directory should work if nowhere else do
|
|
\gdef^^fb{\^u}
|
|
\gdef^^fc{\"u}
|
|
\gdef^^fd{\'y}
|
|
- \gdef^^fe{\missingcharmsg{LATIN SMALL LETTER THORN}}
|
|
+ \gdef^^fe{\th}
|
|
\gdef^^ff{\"y}
|
|
}
|
|
|
|
@@ -8178,7 +8305,7 @@ directory should work if nowhere else do
|
|
\gdef^^ce{\^I}
|
|
\gdef^^cf{\v D}
|
|
%
|
|
- \gdef^^d0{\missingcharmsg{LATIN CAPITAL LETTER D WITH STROKE}}
|
|
+ \gdef^^d0{\DH}
|
|
\gdef^^d1{\'N}
|
|
\gdef^^d2{\v N}
|
|
\gdef^^d3{\'O}
|
|
@@ -8187,7 +8314,7 @@ directory should work if nowhere else do
|
|
\gdef^^d6{\"O}
|
|
\gdef^^d7{$\times$}
|
|
\gdef^^d8{\v R}
|
|
- \gdef^^d9{\ringaccent U}
|
|
+ \gdef^^d9{\ringaccent U}
|
|
\gdef^^da{\'U}
|
|
\gdef^^db{\H U}
|
|
\gdef^^dc{\"U}
|
|
@@ -8212,7 +8339,7 @@ directory should work if nowhere else do
|
|
\gdef^^ee{\^\i}
|
|
\gdef^^ef{\v d}
|
|
%
|
|
- \gdef^^f0{\missingcharmsg{LATIN SMALL LETTER D WITH STROKE}}
|
|
+ \gdef^^f0{\dh}
|
|
\gdef^^f1{\'n}
|
|
\gdef^^f2{\v n}
|
|
\gdef^^f3{\'o}
|
|
@@ -8231,11 +8358,11 @@ directory should work if nowhere else do
|
|
}
|
|
|
|
% UTF-8 character definitions.
|
|
-%
|
|
+%
|
|
% This code to support UTF-8 is based on LaTeX's utf8.def, with some
|
|
% changes for Texinfo conventions. It is included here under the GPL by
|
|
% permission from Frank Mittelbach and the LaTeX team.
|
|
-%
|
|
+%
|
|
\newcount\countUTFx
|
|
\newcount\countUTFy
|
|
\newcount\countUTFz
|
|
@@ -8385,6 +8512,7 @@ directory should work if nowhere else do
|
|
\DeclareUnicodeCharacter{00CE}{\^I}
|
|
\DeclareUnicodeCharacter{00CF}{\"I}
|
|
|
|
+ \DeclareUnicodeCharacter{00D0}{\DH}
|
|
\DeclareUnicodeCharacter{00D1}{\~N}
|
|
\DeclareUnicodeCharacter{00D2}{\`O}
|
|
\DeclareUnicodeCharacter{00D3}{\'O}
|
|
@@ -8397,6 +8525,7 @@ directory should work if nowhere else do
|
|
\DeclareUnicodeCharacter{00DB}{\^U}
|
|
\DeclareUnicodeCharacter{00DC}{\"U}
|
|
\DeclareUnicodeCharacter{00DD}{\'Y}
|
|
+ \DeclareUnicodeCharacter{00DE}{\TH}
|
|
\DeclareUnicodeCharacter{00DF}{\ss}
|
|
|
|
\DeclareUnicodeCharacter{00E0}{\`a}
|
|
@@ -8416,6 +8545,7 @@ directory should work if nowhere else do
|
|
\DeclareUnicodeCharacter{00EE}{\^{\dotless{i}}}
|
|
\DeclareUnicodeCharacter{00EF}{\"{\dotless{i}}}
|
|
|
|
+ \DeclareUnicodeCharacter{00F0}{\dh}
|
|
\DeclareUnicodeCharacter{00F1}{\~n}
|
|
\DeclareUnicodeCharacter{00F2}{\`o}
|
|
\DeclareUnicodeCharacter{00F3}{\'o}
|
|
@@ -8428,6 +8558,7 @@ directory should work if nowhere else do
|
|
\DeclareUnicodeCharacter{00FB}{\^u}
|
|
\DeclareUnicodeCharacter{00FC}{\"u}
|
|
\DeclareUnicodeCharacter{00FD}{\'y}
|
|
+ \DeclareUnicodeCharacter{00FE}{\th}
|
|
\DeclareUnicodeCharacter{00FF}{\"y}
|
|
|
|
\DeclareUnicodeCharacter{0100}{\=A}
|
|
@@ -8972,6 +9103,9 @@ directory should work if nowhere else do
|
|
|
|
\message{and turning on texinfo input format.}
|
|
|
|
+% DEL is a comment character, in case @c does not suffice.
|
|
+\catcode`\^^? = 14
|
|
+
|
|
% Define macros to output various characters with catcode for normal text.
|
|
\catcode`\"=\other
|
|
\catcode`\~=\other
|
|
@@ -9081,7 +9215,7 @@ directory should work if nowhere else do
|
|
|
|
% Same as @turnoffactive except outputs \ as {\tt\char`\\} instead of
|
|
% the literal character `\'.
|
|
-%
|
|
+%
|
|
@def@normalturnoffactive{%
|
|
@let\=@normalbackslash
|
|
@let"=@normaldoublequote
|
|
@@ -9137,9 +9271,13 @@ directory should work if nowhere else do
|
|
@catcode`@`=@active
|
|
@markupsetuplqdefault
|
|
@markupsetuprqdefault
|
|
-
|
|
+
|
|
+@c Gnulib now utterly and painfully insists on no trailing whitespace.
|
|
+@c So we have to nuke it.
|
|
+
|
|
@c Local variables:
|
|
@c eval: (add-hook 'write-file-hooks 'time-stamp)
|
|
+@c eval: (add-hook 'write-file-hooks 'nuke-trailing-whitespace)
|
|
@c page-delimiter: "^\\\\message"
|
|
@c time-stamp-start: "def\\\\texinfoversion{"
|
|
@c time-stamp-format: "%:y-%02m-%02d.%02H"
|
|
Index: libgtop-2.28.0/examples/Makefile.in
|
|
===================================================================
|
|
--- libgtop-2.28.0.orig/examples/Makefile.in 2009-11-22 17:53:40.237186676 +0100
|
|
+++ libgtop-2.28.0/examples/Makefile.in 2009-11-22 17:53:09.785687739 +0100
|
|
@@ -1,8 +1,9 @@
|
|
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
|
|
+# Makefile.in generated by automake 1.11 from Makefile.am.
|
|
# @configure_input@
|
|
|
|
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
|
|
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
|
|
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
|
|
+# Inc.
|
|
# This Makefile.in is free software; the Free Software Foundation
|
|
# gives unlimited permission to copy and/or distribute it,
|
|
# with or without modifications, as long as this notice is preserved.
|
|
@@ -16,8 +17,9 @@
|
|
|
|
VPATH = @srcdir@
|
|
pkgdatadir = $(datadir)/@PACKAGE@
|
|
-pkglibdir = $(libdir)/@PACKAGE@
|
|
pkgincludedir = $(includedir)/@PACKAGE@
|
|
+pkglibdir = $(libdir)/@PACKAGE@
|
|
+pkglibexecdir = $(libexecdir)/@PACKAGE@
|
|
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
|
|
install_sh_DATA = $(install_sh) -c -m 644
|
|
install_sh_PROGRAM = $(install_sh) -c
|
|
@@ -48,6 +50,7 @@ am__configure_deps = $(am__aclocal_m4_de
|
|
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
|
|
CONFIG_HEADER = $(top_builddir)/config.h
|
|
CONFIG_CLEAN_FILES =
|
|
+CONFIG_CLEAN_VPATH_FILES =
|
|
PROGRAMS = $(noinst_PROGRAMS)
|
|
am_affinity_OBJECTS = affinity.$(OBJEXT)
|
|
affinity_OBJECTS = $(am_affinity_OBJECTS)
|
|
@@ -103,6 +106,7 @@ wd_DEPENDENCIES = $(top_builddir)/lib/li
|
|
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
|
|
depcomp = $(SHELL) $(top_srcdir)/depcomp
|
|
am__depfiles_maybe = depfiles
|
|
+am__mv = mv -f
|
|
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
|
|
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
|
|
LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
|
|
@@ -172,29 +176,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
|
|
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
|
|
INSTOBJEXT = @INSTOBJEXT@
|
|
INTLLIBS = @INTLLIBS@
|
|
-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
|
|
-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
|
|
-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
|
|
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
|
|
-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
|
|
-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
|
|
INTLTOOL_MERGE = @INTLTOOL_MERGE@
|
|
-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@
|
|
-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
|
|
-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
|
|
-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
|
|
-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
|
|
-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
|
|
-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
|
|
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
|
|
-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
|
|
-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
|
|
-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
|
|
KVM_LIBS = @KVM_LIBS@
|
|
LD = @LD@
|
|
LDFLAGS = @LDFLAGS@
|
|
@@ -233,6 +218,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
|
|
PACKAGE_NAME = @PACKAGE_NAME@
|
|
PACKAGE_STRING = @PACKAGE_STRING@
|
|
PACKAGE_TARNAME = @PACKAGE_TARNAME@
|
|
+PACKAGE_URL = @PACKAGE_URL@
|
|
PACKAGE_VERSION = @PACKAGE_VERSION@
|
|
PATH_SEPARATOR = @PATH_SEPARATOR@
|
|
PERL = @PERL@
|
|
@@ -314,6 +300,7 @@ sysconfdir = @sysconfdir@
|
|
sysdeps_dir = @sysdeps_dir@
|
|
sysdeps_suid_lib = @sysdeps_suid_lib@
|
|
target_alias = @target_alias@
|
|
+top_build_prefix = @top_build_prefix@
|
|
top_builddir = @top_builddir@
|
|
top_srcdir = @top_srcdir@
|
|
LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
|
|
@@ -364,9 +351,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefi
|
|
exit 1;; \
|
|
esac; \
|
|
done; \
|
|
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu examples/Makefile'; \
|
|
- cd $(top_srcdir) && \
|
|
- $(AUTOMAKE) --gnu examples/Makefile
|
|
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu examples/Makefile'; \
|
|
+ $(am__cd) $(top_srcdir) && \
|
|
+ $(AUTOMAKE) --gnu examples/Makefile
|
|
.PRECIOUS: Makefile
|
|
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
|
|
@case '$?' in \
|
|
@@ -384,13 +371,16 @@ $(top_srcdir)/configure: $(am__configur
|
|
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
|
|
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
|
|
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
|
|
+$(am__aclocal_m4_deps):
|
|
|
|
clean-noinstPROGRAMS:
|
|
- @list='$(noinst_PROGRAMS)'; for p in $$list; do \
|
|
- f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
|
|
- echo " rm -f $$p $$f"; \
|
|
- rm -f $$p $$f ; \
|
|
- done
|
|
+ @list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \
|
|
+ echo " rm -f" $$list; \
|
|
+ rm -f $$list || exit $$?; \
|
|
+ test -n "$(EXEEXT)" || exit 0; \
|
|
+ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
|
|
+ echo " rm -f" $$list; \
|
|
+ rm -f $$list
|
|
affinity$(EXEEXT): $(affinity_OBJECTS) $(affinity_DEPENDENCIES)
|
|
@rm -f affinity$(EXEEXT)
|
|
$(LINK) $(affinity_OBJECTS) $(affinity_LDADD) $(LIBS)
|
|
@@ -469,21 +459,21 @@ distclean-compile:
|
|
|
|
.c.o:
|
|
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
|
|
-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
|
|
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
|
|
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
|
|
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
|
@am__fastdepCC_FALSE@ $(COMPILE) -c $<
|
|
|
|
.c.obj:
|
|
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
|
|
-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
|
|
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
|
|
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
|
|
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
|
@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
|
|
|
|
.c.lo:
|
|
@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
|
|
-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
|
|
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
|
|
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
|
|
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
|
@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
|
|
@@ -506,7 +496,7 @@ tags: TAGS
|
|
|
|
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
|
|
$(TAGS_FILES) $(LISP)
|
|
- tags=; \
|
|
+ set x; \
|
|
here=`pwd`; \
|
|
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
|
|
unique=`for i in $$list; do \
|
|
@@ -514,29 +504,34 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP
|
|
done | \
|
|
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
|
|
END { if (nonempty) { for (i in files) print i; }; }'`; \
|
|
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
|
|
+ shift; \
|
|
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
|
|
test -n "$$unique" || unique=$$empty_fix; \
|
|
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
|
|
- $$tags $$unique; \
|
|
+ if test $$# -gt 0; then \
|
|
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
|
|
+ "$$@" $$unique; \
|
|
+ else \
|
|
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
|
|
+ $$unique; \
|
|
+ fi; \
|
|
fi
|
|
ctags: CTAGS
|
|
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
|
|
$(TAGS_FILES) $(LISP)
|
|
- tags=; \
|
|
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
|
|
unique=`for i in $$list; do \
|
|
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
|
|
done | \
|
|
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
|
|
END { if (nonempty) { for (i in files) print i; }; }'`; \
|
|
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
|
|
+ test -z "$(CTAGS_ARGS)$$unique" \
|
|
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
|
|
- $$tags $$unique
|
|
+ $$unique
|
|
|
|
GTAGS:
|
|
here=`$(am__cd) $(top_builddir) && pwd` \
|
|
- && cd $(top_srcdir) \
|
|
- && gtags -i $(GTAGS_ARGS) $$here
|
|
+ && $(am__cd) $(top_srcdir) \
|
|
+ && gtags -i $(GTAGS_ARGS) "$$here"
|
|
|
|
distclean-tags:
|
|
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
|
|
@@ -557,13 +552,17 @@ distdir: $(DISTFILES)
|
|
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
|
|
if test -d $$d/$$file; then \
|
|
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
|
|
+ if test -d "$(distdir)/$$file"; then \
|
|
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
|
|
+ fi; \
|
|
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
|
|
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
|
|
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
|
|
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
|
|
fi; \
|
|
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
|
|
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
|
|
else \
|
|
- test -f $(distdir)/$$file \
|
|
- || cp -p $$d/$$file $(distdir)/$$file \
|
|
+ test -f "$(distdir)/$$file" \
|
|
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|
|
|| exit 1; \
|
|
fi; \
|
|
done
|
|
@@ -591,6 +590,7 @@ clean-generic:
|
|
|
|
distclean-generic:
|
|
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
|
|
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
|
|
|
|
maintainer-clean-generic:
|
|
@echo "This command is intended for maintainers to use"
|
|
@@ -612,6 +612,8 @@ dvi-am:
|
|
|
|
html: html-am
|
|
|
|
+html-am:
|
|
+
|
|
info: info-am
|
|
|
|
info-am:
|
|
@@ -620,18 +622,28 @@ install-data-am:
|
|
|
|
install-dvi: install-dvi-am
|
|
|
|
+install-dvi-am:
|
|
+
|
|
install-exec-am:
|
|
|
|
install-html: install-html-am
|
|
|
|
+install-html-am:
|
|
+
|
|
install-info: install-info-am
|
|
|
|
+install-info-am:
|
|
+
|
|
install-man:
|
|
|
|
install-pdf: install-pdf-am
|
|
|
|
+install-pdf-am:
|
|
+
|
|
install-ps: install-ps-am
|
|
|
|
+install-ps-am:
|
|
+
|
|
installcheck-am:
|
|
|
|
maintainer-clean: maintainer-clean-am
|
|
@@ -669,6 +681,7 @@ uninstall-am:
|
|
mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
|
|
pdf pdf-am ps ps-am tags uninstall uninstall-am
|
|
|
|
+
|
|
# Tell versions [3.59,3.63) of GNU make to not export all variables.
|
|
# Otherwise a system limit (for SysV at least) may be exceeded.
|
|
.NOEXPORT:
|
|
Index: libgtop-2.28.0/include/Makefile.in
|
|
===================================================================
|
|
--- libgtop-2.28.0.orig/include/Makefile.in 2009-11-22 17:53:40.441187799 +0100
|
|
+++ libgtop-2.28.0/include/Makefile.in 2009-11-22 17:53:09.881684987 +0100
|
|
@@ -1,8 +1,9 @@
|
|
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
|
|
+# Makefile.in generated by automake 1.11 from Makefile.am.
|
|
# @configure_input@
|
|
|
|
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
|
|
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
|
|
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
|
|
+# Inc.
|
|
# This Makefile.in is free software; the Free Software Foundation
|
|
# gives unlimited permission to copy and/or distribute it,
|
|
# with or without modifications, as long as this notice is preserved.
|
|
@@ -15,8 +16,9 @@
|
|
@SET_MAKE@
|
|
VPATH = @srcdir@
|
|
pkgdatadir = $(datadir)/@PACKAGE@
|
|
-pkglibdir = $(libdir)/@PACKAGE@
|
|
pkgincludedir = $(includedir)/@PACKAGE@
|
|
+pkglibdir = $(libdir)/@PACKAGE@
|
|
+pkglibexecdir = $(libexecdir)/@PACKAGE@
|
|
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
|
|
install_sh_DATA = $(install_sh) -c -m 644
|
|
install_sh_PROGRAM = $(install_sh) -c
|
|
@@ -41,6 +43,7 @@ am__configure_deps = $(am__aclocal_m4_de
|
|
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
|
|
CONFIG_HEADER = $(top_builddir)/config.h
|
|
CONFIG_CLEAN_FILES =
|
|
+CONFIG_CLEAN_VPATH_FILES =
|
|
SOURCES =
|
|
DIST_SOURCES =
|
|
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
|
|
@@ -52,10 +55,38 @@ RECURSIVE_TARGETS = all-recursive check-
|
|
ps-recursive uninstall-recursive
|
|
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
|
|
distclean-recursive maintainer-clean-recursive
|
|
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
|
|
+ $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
|
|
+ distdir
|
|
ETAGS = etags
|
|
CTAGS = ctags
|
|
DIST_SUBDIRS = $(SUBDIRS)
|
|
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
|
|
+am__relativize = \
|
|
+ dir0=`pwd`; \
|
|
+ sed_first='s,^\([^/]*\)/.*$$,\1,'; \
|
|
+ sed_rest='s,^[^/]*/*,,'; \
|
|
+ sed_last='s,^.*/\([^/]*\)$$,\1,'; \
|
|
+ sed_butlast='s,/*[^/]*$$,,'; \
|
|
+ while test -n "$$dir1"; do \
|
|
+ first=`echo "$$dir1" | sed -e "$$sed_first"`; \
|
|
+ if test "$$first" != "."; then \
|
|
+ if test "$$first" = ".."; then \
|
|
+ dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
|
|
+ dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
|
|
+ else \
|
|
+ first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
|
|
+ if test "$$first2" = "$$first"; then \
|
|
+ dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
|
|
+ else \
|
|
+ dir2="../$$dir2"; \
|
|
+ fi; \
|
|
+ dir0="$$dir0"/"$$first"; \
|
|
+ fi; \
|
|
+ fi; \
|
|
+ dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
|
|
+ done; \
|
|
+ reldir="$$dir2"
|
|
ACLOCAL = @ACLOCAL@
|
|
ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
|
|
ALLOCA = @ALLOCA@
|
|
@@ -104,29 +135,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
|
|
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
|
|
INSTOBJEXT = @INSTOBJEXT@
|
|
INTLLIBS = @INTLLIBS@
|
|
-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
|
|
-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
|
|
-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
|
|
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
|
|
-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
|
|
-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
|
|
INTLTOOL_MERGE = @INTLTOOL_MERGE@
|
|
-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@
|
|
-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
|
|
-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
|
|
-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
|
|
-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
|
|
-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
|
|
-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
|
|
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
|
|
-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
|
|
-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
|
|
-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
|
|
KVM_LIBS = @KVM_LIBS@
|
|
LD = @LD@
|
|
LDFLAGS = @LDFLAGS@
|
|
@@ -165,6 +177,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
|
|
PACKAGE_NAME = @PACKAGE_NAME@
|
|
PACKAGE_STRING = @PACKAGE_STRING@
|
|
PACKAGE_TARNAME = @PACKAGE_TARNAME@
|
|
+PACKAGE_URL = @PACKAGE_URL@
|
|
PACKAGE_VERSION = @PACKAGE_VERSION@
|
|
PATH_SEPARATOR = @PATH_SEPARATOR@
|
|
PERL = @PERL@
|
|
@@ -246,6 +259,7 @@ sysconfdir = @sysconfdir@
|
|
sysdeps_dir = @sysdeps_dir@
|
|
sysdeps_suid_lib = @sysdeps_suid_lib@
|
|
target_alias = @target_alias@
|
|
+top_build_prefix = @top_build_prefix@
|
|
top_builddir = @top_builddir@
|
|
top_srcdir = @top_srcdir@
|
|
SUBDIRS = glibtop
|
|
@@ -261,9 +275,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefi
|
|
exit 1;; \
|
|
esac; \
|
|
done; \
|
|
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu include/Makefile'; \
|
|
- cd $(top_srcdir) && \
|
|
- $(AUTOMAKE) --gnu include/Makefile
|
|
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu include/Makefile'; \
|
|
+ $(am__cd) $(top_srcdir) && \
|
|
+ $(AUTOMAKE) --gnu include/Makefile
|
|
.PRECIOUS: Makefile
|
|
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
|
|
@case '$?' in \
|
|
@@ -281,6 +295,7 @@ $(top_srcdir)/configure: $(am__configur
|
|
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
|
|
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
|
|
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
|
|
+$(am__aclocal_m4_deps):
|
|
|
|
mostlyclean-libtool:
|
|
-rm -f *.lo
|
|
@@ -312,7 +327,7 @@ $(RECURSIVE_TARGETS):
|
|
else \
|
|
local_target="$$target"; \
|
|
fi; \
|
|
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
|
|
+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
|
|
|| eval $$failcom; \
|
|
done; \
|
|
if test "$$dot_seen" = "no"; then \
|
|
@@ -346,16 +361,16 @@ $(RECURSIVE_CLEAN_TARGETS):
|
|
else \
|
|
local_target="$$target"; \
|
|
fi; \
|
|
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
|
|
+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
|
|
|| eval $$failcom; \
|
|
done && test -z "$$fail"
|
|
tags-recursive:
|
|
list='$(SUBDIRS)'; for subdir in $$list; do \
|
|
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
|
|
+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
|
|
done
|
|
ctags-recursive:
|
|
list='$(SUBDIRS)'; for subdir in $$list; do \
|
|
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
|
|
+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
|
|
done
|
|
|
|
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
|
|
@@ -370,7 +385,7 @@ tags: TAGS
|
|
|
|
TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
|
|
$(TAGS_FILES) $(LISP)
|
|
- tags=; \
|
|
+ set x; \
|
|
here=`pwd`; \
|
|
if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
|
|
include_option=--etags-include; \
|
|
@@ -382,7 +397,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE
|
|
list='$(SUBDIRS)'; for subdir in $$list; do \
|
|
if test "$$subdir" = .; then :; else \
|
|
test ! -f $$subdir/TAGS || \
|
|
- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
|
|
+ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
|
|
fi; \
|
|
done; \
|
|
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
|
|
@@ -391,29 +406,34 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE
|
|
done | \
|
|
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
|
|
END { if (nonempty) { for (i in files) print i; }; }'`; \
|
|
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
|
|
+ shift; \
|
|
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
|
|
test -n "$$unique" || unique=$$empty_fix; \
|
|
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
|
|
- $$tags $$unique; \
|
|
+ if test $$# -gt 0; then \
|
|
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
|
|
+ "$$@" $$unique; \
|
|
+ else \
|
|
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
|
|
+ $$unique; \
|
|
+ fi; \
|
|
fi
|
|
ctags: CTAGS
|
|
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
|
|
$(TAGS_FILES) $(LISP)
|
|
- tags=; \
|
|
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
|
|
unique=`for i in $$list; do \
|
|
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
|
|
done | \
|
|
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
|
|
END { if (nonempty) { for (i in files) print i; }; }'`; \
|
|
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
|
|
+ test -z "$(CTAGS_ARGS)$$unique" \
|
|
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
|
|
- $$tags $$unique
|
|
+ $$unique
|
|
|
|
GTAGS:
|
|
here=`$(am__cd) $(top_builddir) && pwd` \
|
|
- && cd $(top_srcdir) \
|
|
- && gtags -i $(GTAGS_ARGS) $$here
|
|
+ && $(am__cd) $(top_srcdir) \
|
|
+ && gtags -i $(GTAGS_ARGS) "$$here"
|
|
|
|
distclean-tags:
|
|
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
|
|
@@ -434,29 +454,44 @@ distdir: $(DISTFILES)
|
|
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
|
|
if test -d $$d/$$file; then \
|
|
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
|
|
+ if test -d "$(distdir)/$$file"; then \
|
|
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
|
|
+ fi; \
|
|
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
|
|
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
|
|
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
|
|
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
|
|
fi; \
|
|
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
|
|
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
|
|
else \
|
|
- test -f $(distdir)/$$file \
|
|
- || cp -p $$d/$$file $(distdir)/$$file \
|
|
+ test -f "$(distdir)/$$file" \
|
|
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|
|
|| exit 1; \
|
|
fi; \
|
|
done
|
|
- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
|
|
+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
|
|
if test "$$subdir" = .; then :; else \
|
|
test -d "$(distdir)/$$subdir" \
|
|
|| $(MKDIR_P) "$(distdir)/$$subdir" \
|
|
|| exit 1; \
|
|
- distdir=`$(am__cd) $(distdir) && pwd`; \
|
|
- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
|
|
- (cd $$subdir && \
|
|
+ fi; \
|
|
+ done
|
|
+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
|
|
+ if test "$$subdir" = .; then :; else \
|
|
+ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
|
|
+ $(am__relativize); \
|
|
+ new_distdir=$$reldir; \
|
|
+ dir1=$$subdir; dir2="$(top_distdir)"; \
|
|
+ $(am__relativize); \
|
|
+ new_top_distdir=$$reldir; \
|
|
+ echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
|
|
+ echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
|
|
+ ($(am__cd) $$subdir && \
|
|
$(MAKE) $(AM_MAKEFLAGS) \
|
|
- top_distdir="$$top_distdir" \
|
|
- distdir="$$distdir/$$subdir" \
|
|
+ top_distdir="$$new_top_distdir" \
|
|
+ distdir="$$new_distdir" \
|
|
am__remove_distdir=: \
|
|
am__skip_length_check=: \
|
|
+ am__skip_mode_fix=: \
|
|
distdir) \
|
|
|| exit 1; \
|
|
fi; \
|
|
@@ -486,6 +521,7 @@ clean-generic:
|
|
|
|
distclean-generic:
|
|
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
|
|
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
|
|
|
|
maintainer-clean-generic:
|
|
@echo "This command is intended for maintainers to use"
|
|
@@ -504,6 +540,8 @@ dvi-am:
|
|
|
|
html: html-recursive
|
|
|
|
+html-am:
|
|
+
|
|
info: info-recursive
|
|
|
|
info-am:
|
|
@@ -512,18 +550,28 @@ install-data-am:
|
|
|
|
install-dvi: install-dvi-recursive
|
|
|
|
+install-dvi-am:
|
|
+
|
|
install-exec-am:
|
|
|
|
install-html: install-html-recursive
|
|
|
|
+install-html-am:
|
|
+
|
|
install-info: install-info-recursive
|
|
|
|
+install-info-am:
|
|
+
|
|
install-man:
|
|
|
|
install-pdf: install-pdf-recursive
|
|
|
|
+install-pdf-am:
|
|
+
|
|
install-ps: install-ps-recursive
|
|
|
|
+install-ps-am:
|
|
+
|
|
installcheck-am:
|
|
|
|
maintainer-clean: maintainer-clean-recursive
|
|
@@ -544,8 +592,8 @@ ps-am:
|
|
|
|
uninstall-am:
|
|
|
|
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
|
|
- install-strip
|
|
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
|
|
+ install-am install-strip tags-recursive
|
|
|
|
.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
|
|
all all-am check check-am clean clean-generic clean-libtool \
|
|
@@ -561,6 +609,7 @@ uninstall-am:
|
|
mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
|
|
uninstall uninstall-am
|
|
|
|
+
|
|
# Tell versions [3.59,3.63) of GNU make to not export all variables.
|
|
# Otherwise a system limit (for SysV at least) may be exceeded.
|
|
.NOEXPORT:
|
|
Index: libgtop-2.28.0/include/glibtop/Makefile.in
|
|
===================================================================
|
|
--- libgtop-2.28.0.orig/include/glibtop/Makefile.in 2009-11-22 17:53:40.537189948 +0100
|
|
+++ libgtop-2.28.0/include/glibtop/Makefile.in 2009-11-22 17:53:09.977683710 +0100
|
|
@@ -1,8 +1,9 @@
|
|
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
|
|
+# Makefile.in generated by automake 1.11 from Makefile.am.
|
|
# @configure_input@
|
|
|
|
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
|
|
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
|
|
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
|
|
+# Inc.
|
|
# This Makefile.in is free software; the Free Software Foundation
|
|
# gives unlimited permission to copy and/or distribute it,
|
|
# with or without modifications, as long as this notice is preserved.
|
|
@@ -16,8 +17,9 @@
|
|
|
|
VPATH = @srcdir@
|
|
pkgdatadir = $(datadir)/@PACKAGE@
|
|
-pkglibdir = $(libdir)/@PACKAGE@
|
|
pkgincludedir = $(includedir)/@PACKAGE@
|
|
+pkglibdir = $(libdir)/@PACKAGE@
|
|
+pkglibexecdir = $(libexecdir)/@PACKAGE@
|
|
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
|
|
install_sh_DATA = $(install_sh) -c -m 644
|
|
install_sh_PROGRAM = $(install_sh) -c
|
|
@@ -43,6 +45,7 @@ am__configure_deps = $(am__aclocal_m4_de
|
|
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
|
|
CONFIG_HEADER = $(top_builddir)/config.h
|
|
CONFIG_CLEAN_FILES =
|
|
+CONFIG_CLEAN_VPATH_FILES =
|
|
SOURCES =
|
|
DIST_SOURCES =
|
|
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
|
|
@@ -50,9 +53,23 @@ am__vpath_adj = case $$p in \
|
|
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
|
|
*) f=$$p;; \
|
|
esac;
|
|
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
|
|
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
|
|
+am__install_max = 40
|
|
+am__nobase_strip_setup = \
|
|
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
|
|
+am__nobase_strip = \
|
|
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
|
|
+am__nobase_list = $(am__nobase_strip_setup); \
|
|
+ for p in $$list; do echo "$$p $$p"; done | \
|
|
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
|
|
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
|
|
+ if (++n[$$2] == $(am__install_max)) \
|
|
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
|
|
+ END { for (dir in files) print dir, files[dir] }'
|
|
+am__base_list = \
|
|
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
|
|
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
|
|
am__installdirs = "$(DESTDIR)$(glibtopdir)"
|
|
-glibtopHEADERS_INSTALL = $(INSTALL_HEADER)
|
|
HEADERS = $(glibtop_HEADERS) $(noinst_HEADERS)
|
|
ETAGS = etags
|
|
CTAGS = ctags
|
|
@@ -105,29 +122,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
|
|
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
|
|
INSTOBJEXT = @INSTOBJEXT@
|
|
INTLLIBS = @INTLLIBS@
|
|
-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
|
|
-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
|
|
-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
|
|
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
|
|
-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
|
|
-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
|
|
INTLTOOL_MERGE = @INTLTOOL_MERGE@
|
|
-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@
|
|
-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
|
|
-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
|
|
-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
|
|
-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
|
|
-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
|
|
-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
|
|
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
|
|
-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
|
|
-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
|
|
-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
|
|
KVM_LIBS = @KVM_LIBS@
|
|
LD = @LD@
|
|
LDFLAGS = @LDFLAGS@
|
|
@@ -166,6 +164,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
|
|
PACKAGE_NAME = @PACKAGE_NAME@
|
|
PACKAGE_STRING = @PACKAGE_STRING@
|
|
PACKAGE_TARNAME = @PACKAGE_TARNAME@
|
|
+PACKAGE_URL = @PACKAGE_URL@
|
|
PACKAGE_VERSION = @PACKAGE_VERSION@
|
|
PATH_SEPARATOR = @PATH_SEPARATOR@
|
|
PERL = @PERL@
|
|
@@ -247,6 +246,7 @@ sysconfdir = @sysconfdir@
|
|
sysdeps_dir = @sysdeps_dir@
|
|
sysdeps_suid_lib = @sysdeps_suid_lib@
|
|
target_alias = @target_alias@
|
|
+top_build_prefix = @top_build_prefix@
|
|
top_builddir = @top_builddir@
|
|
top_srcdir = @top_srcdir@
|
|
glibtopdir = $(includedir)/libgtop-2.0/glibtop
|
|
@@ -274,9 +274,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefi
|
|
exit 1;; \
|
|
esac; \
|
|
done; \
|
|
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu include/glibtop/Makefile'; \
|
|
- cd $(top_srcdir) && \
|
|
- $(AUTOMAKE) --gnu include/glibtop/Makefile
|
|
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu include/glibtop/Makefile'; \
|
|
+ $(am__cd) $(top_srcdir) && \
|
|
+ $(AUTOMAKE) --gnu include/glibtop/Makefile
|
|
.PRECIOUS: Makefile
|
|
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
|
|
@case '$?' in \
|
|
@@ -294,6 +294,7 @@ $(top_srcdir)/configure: $(am__configur
|
|
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
|
|
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
|
|
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
|
|
+$(am__aclocal_m4_deps):
|
|
|
|
mostlyclean-libtool:
|
|
-rm -f *.lo
|
|
@@ -303,20 +304,23 @@ clean-libtool:
|
|
install-glibtopHEADERS: $(glibtop_HEADERS)
|
|
@$(NORMAL_INSTALL)
|
|
test -z "$(glibtopdir)" || $(MKDIR_P) "$(DESTDIR)$(glibtopdir)"
|
|
- @list='$(glibtop_HEADERS)'; for p in $$list; do \
|
|
+ @list='$(glibtop_HEADERS)'; test -n "$(glibtopdir)" || list=; \
|
|
+ for p in $$list; do \
|
|
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
|
|
- f=$(am__strip_dir) \
|
|
- echo " $(glibtopHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(glibtopdir)/$$f'"; \
|
|
- $(glibtopHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(glibtopdir)/$$f"; \
|
|
+ echo "$$d$$p"; \
|
|
+ done | $(am__base_list) | \
|
|
+ while read files; do \
|
|
+ echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(glibtopdir)'"; \
|
|
+ $(INSTALL_HEADER) $$files "$(DESTDIR)$(glibtopdir)" || exit $$?; \
|
|
done
|
|
|
|
uninstall-glibtopHEADERS:
|
|
@$(NORMAL_UNINSTALL)
|
|
- @list='$(glibtop_HEADERS)'; for p in $$list; do \
|
|
- f=$(am__strip_dir) \
|
|
- echo " rm -f '$(DESTDIR)$(glibtopdir)/$$f'"; \
|
|
- rm -f "$(DESTDIR)$(glibtopdir)/$$f"; \
|
|
- done
|
|
+ @list='$(glibtop_HEADERS)'; test -n "$(glibtopdir)" || list=; \
|
|
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
|
|
+ test -n "$$files" || exit 0; \
|
|
+ echo " ( cd '$(DESTDIR)$(glibtopdir)' && rm -f" $$files ")"; \
|
|
+ cd "$(DESTDIR)$(glibtopdir)" && rm -f $$files
|
|
|
|
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
|
|
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
|
|
@@ -330,7 +334,7 @@ tags: TAGS
|
|
|
|
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
|
|
$(TAGS_FILES) $(LISP)
|
|
- tags=; \
|
|
+ set x; \
|
|
here=`pwd`; \
|
|
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
|
|
unique=`for i in $$list; do \
|
|
@@ -338,29 +342,34 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP
|
|
done | \
|
|
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
|
|
END { if (nonempty) { for (i in files) print i; }; }'`; \
|
|
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
|
|
+ shift; \
|
|
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
|
|
test -n "$$unique" || unique=$$empty_fix; \
|
|
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
|
|
- $$tags $$unique; \
|
|
+ if test $$# -gt 0; then \
|
|
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
|
|
+ "$$@" $$unique; \
|
|
+ else \
|
|
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
|
|
+ $$unique; \
|
|
+ fi; \
|
|
fi
|
|
ctags: CTAGS
|
|
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
|
|
$(TAGS_FILES) $(LISP)
|
|
- tags=; \
|
|
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
|
|
unique=`for i in $$list; do \
|
|
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
|
|
done | \
|
|
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
|
|
END { if (nonempty) { for (i in files) print i; }; }'`; \
|
|
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
|
|
+ test -z "$(CTAGS_ARGS)$$unique" \
|
|
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
|
|
- $$tags $$unique
|
|
+ $$unique
|
|
|
|
GTAGS:
|
|
here=`$(am__cd) $(top_builddir) && pwd` \
|
|
- && cd $(top_srcdir) \
|
|
- && gtags -i $(GTAGS_ARGS) $$here
|
|
+ && $(am__cd) $(top_srcdir) \
|
|
+ && gtags -i $(GTAGS_ARGS) "$$here"
|
|
|
|
distclean-tags:
|
|
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
|
|
@@ -381,13 +390,17 @@ distdir: $(DISTFILES)
|
|
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
|
|
if test -d $$d/$$file; then \
|
|
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
|
|
+ if test -d "$(distdir)/$$file"; then \
|
|
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
|
|
+ fi; \
|
|
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
|
|
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
|
|
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
|
|
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
|
|
fi; \
|
|
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
|
|
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
|
|
else \
|
|
- test -f $(distdir)/$$file \
|
|
- || cp -p $$d/$$file $(distdir)/$$file \
|
|
+ test -f "$(distdir)/$$file" \
|
|
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|
|
|| exit 1; \
|
|
fi; \
|
|
done
|
|
@@ -418,6 +431,7 @@ clean-generic:
|
|
|
|
distclean-generic:
|
|
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
|
|
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
|
|
|
|
maintainer-clean-generic:
|
|
@echo "This command is intended for maintainers to use"
|
|
@@ -436,6 +450,8 @@ dvi-am:
|
|
|
|
html: html-am
|
|
|
|
+html-am:
|
|
+
|
|
info: info-am
|
|
|
|
info-am:
|
|
@@ -444,18 +460,28 @@ install-data-am: install-glibtopHEADERS
|
|
|
|
install-dvi: install-dvi-am
|
|
|
|
+install-dvi-am:
|
|
+
|
|
install-exec-am:
|
|
|
|
install-html: install-html-am
|
|
|
|
+install-html-am:
|
|
+
|
|
install-info: install-info-am
|
|
|
|
+install-info-am:
|
|
+
|
|
install-man:
|
|
|
|
install-pdf: install-pdf-am
|
|
|
|
+install-pdf-am:
|
|
+
|
|
install-ps: install-ps-am
|
|
|
|
+install-ps-am:
|
|
+
|
|
installcheck-am:
|
|
|
|
maintainer-clean: maintainer-clean-am
|
|
@@ -491,6 +517,7 @@ uninstall-am: uninstall-glibtopHEADERS
|
|
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
|
|
tags uninstall uninstall-am uninstall-glibtopHEADERS
|
|
|
|
+
|
|
# Tell versions [3.59,3.63) of GNU make to not export all variables.
|
|
# Otherwise a system limit (for SysV at least) may be exceeded.
|
|
.NOEXPORT:
|
|
Index: libgtop-2.28.0/install-sh
|
|
===================================================================
|
|
--- libgtop-2.28.0.orig/install-sh 2009-11-22 17:53:39.353191841 +0100
|
|
+++ libgtop-2.28.0/install-sh 2009-11-22 17:53:09.257684741 +0100
|
|
@@ -1,7 +1,7 @@
|
|
#!/bin/sh
|
|
# install - install a program, script, or datafile
|
|
|
|
-scriptversion=2006-12-25.00
|
|
+scriptversion=2009-04-28.21; # UTC
|
|
|
|
# This originates from X11R5 (mit/util/scripts/install.sh), which was
|
|
# later released in X11R6 (xc/config/util/install.sh) with the
|
|
@@ -515,5 +515,6 @@ done
|
|
# eval: (add-hook 'write-file-hooks 'time-stamp)
|
|
# time-stamp-start: "scriptversion="
|
|
# time-stamp-format: "%:y-%02m-%02d.%02H"
|
|
-# time-stamp-end: "$"
|
|
+# time-stamp-time-zone: "UTC"
|
|
+# time-stamp-end: "; # UTC"
|
|
# End:
|
|
Index: libgtop-2.28.0/lib/Makefile.in
|
|
===================================================================
|
|
--- libgtop-2.28.0.orig/lib/Makefile.in 2009-11-22 17:53:40.801203187 +0100
|
|
+++ libgtop-2.28.0/lib/Makefile.in 2009-11-22 17:53:10.105683644 +0100
|
|
@@ -1,8 +1,9 @@
|
|
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
|
|
+# Makefile.in generated by automake 1.11 from Makefile.am.
|
|
# @configure_input@
|
|
|
|
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
|
|
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
|
|
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
|
|
+# Inc.
|
|
# This Makefile.in is free software; the Free Software Foundation
|
|
# gives unlimited permission to copy and/or distribute it,
|
|
# with or without modifications, as long as this notice is preserved.
|
|
@@ -16,8 +17,9 @@
|
|
|
|
VPATH = @srcdir@
|
|
pkgdatadir = $(datadir)/@PACKAGE@
|
|
-pkglibdir = $(libdir)/@PACKAGE@
|
|
pkgincludedir = $(includedir)/@PACKAGE@
|
|
+pkglibdir = $(libdir)/@PACKAGE@
|
|
+pkglibexecdir = $(libexecdir)/@PACKAGE@
|
|
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
|
|
install_sh_DATA = $(install_sh) -c -m 644
|
|
install_sh_PROGRAM = $(install_sh) -c
|
|
@@ -42,14 +44,29 @@ am__configure_deps = $(am__aclocal_m4_de
|
|
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
|
|
CONFIG_HEADER = $(top_builddir)/config.h
|
|
CONFIG_CLEAN_FILES =
|
|
+CONFIG_CLEAN_VPATH_FILES =
|
|
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
|
|
am__vpath_adj = case $$p in \
|
|
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
|
|
*) f=$$p;; \
|
|
esac;
|
|
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
|
|
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
|
|
+am__install_max = 40
|
|
+am__nobase_strip_setup = \
|
|
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
|
|
+am__nobase_strip = \
|
|
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
|
|
+am__nobase_list = $(am__nobase_strip_setup); \
|
|
+ for p in $$list; do echo "$$p $$p"; done | \
|
|
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
|
|
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
|
|
+ if (++n[$$2] == $(am__install_max)) \
|
|
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
|
|
+ END { for (dir in files) print dir, files[dir] }'
|
|
+am__base_list = \
|
|
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
|
|
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
|
|
am__installdirs = "$(DESTDIR)$(libdir)"
|
|
-libLTLIBRARIES_INSTALL = $(INSTALL)
|
|
LTLIBRARIES = $(lib_LTLIBRARIES)
|
|
am__DEPENDENCIES_1 =
|
|
libgtop_2_0_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
|
|
@@ -65,6 +82,7 @@ libgtop_2_0_la_LINK = $(LIBTOOL) --tag=C
|
|
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
|
|
depcomp = $(SHELL) $(top_srcdir)/depcomp
|
|
am__depfiles_maybe = depfiles
|
|
+am__mv = mv -f
|
|
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
|
|
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
|
|
LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
|
|
@@ -127,29 +145,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
|
|
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
|
|
INSTOBJEXT = @INSTOBJEXT@
|
|
INTLLIBS = @INTLLIBS@
|
|
-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
|
|
-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
|
|
-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
|
|
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
|
|
-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
|
|
-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
|
|
INTLTOOL_MERGE = @INTLTOOL_MERGE@
|
|
-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@
|
|
-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
|
|
-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
|
|
-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
|
|
-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
|
|
-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
|
|
-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
|
|
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
|
|
-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
|
|
-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
|
|
-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
|
|
KVM_LIBS = @KVM_LIBS@
|
|
LD = @LD@
|
|
LDFLAGS = @LDFLAGS@
|
|
@@ -188,6 +187,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
|
|
PACKAGE_NAME = @PACKAGE_NAME@
|
|
PACKAGE_STRING = @PACKAGE_STRING@
|
|
PACKAGE_TARNAME = @PACKAGE_TARNAME@
|
|
+PACKAGE_URL = @PACKAGE_URL@
|
|
PACKAGE_VERSION = @PACKAGE_VERSION@
|
|
PATH_SEPARATOR = @PATH_SEPARATOR@
|
|
PERL = @PERL@
|
|
@@ -269,6 +269,7 @@ sysconfdir = @sysconfdir@
|
|
sysdeps_dir = @sysdeps_dir@
|
|
sysdeps_suid_lib = @sysdeps_suid_lib@
|
|
target_alias = @target_alias@
|
|
+top_build_prefix = @top_build_prefix@
|
|
top_builddir = @top_builddir@
|
|
top_srcdir = @top_srcdir@
|
|
lib_LTLIBRARIES = libgtop-2.0.la
|
|
@@ -295,9 +296,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefi
|
|
exit 1;; \
|
|
esac; \
|
|
done; \
|
|
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lib/Makefile'; \
|
|
- cd $(top_srcdir) && \
|
|
- $(AUTOMAKE) --gnu lib/Makefile
|
|
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lib/Makefile'; \
|
|
+ $(am__cd) $(top_srcdir) && \
|
|
+ $(AUTOMAKE) --gnu lib/Makefile
|
|
.PRECIOUS: Makefile
|
|
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
|
|
@case '$?' in \
|
|
@@ -315,23 +316,28 @@ $(top_srcdir)/configure: $(am__configur
|
|
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
|
|
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
|
|
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
|
|
+$(am__aclocal_m4_deps):
|
|
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
|
|
@$(NORMAL_INSTALL)
|
|
test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
|
|
- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
|
|
+ @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
|
|
+ list2=; for p in $$list; do \
|
|
if test -f $$p; then \
|
|
- f=$(am__strip_dir) \
|
|
- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
|
|
- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
|
|
+ list2="$$list2 $$p"; \
|
|
else :; fi; \
|
|
- done
|
|
+ done; \
|
|
+ test -z "$$list2" || { \
|
|
+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
|
|
+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
|
|
+ }
|
|
|
|
uninstall-libLTLIBRARIES:
|
|
@$(NORMAL_UNINSTALL)
|
|
- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
|
|
- p=$(am__strip_dir) \
|
|
- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
|
|
- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
|
|
+ @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
|
|
+ for p in $$list; do \
|
|
+ $(am__strip_dir) \
|
|
+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \
|
|
+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \
|
|
done
|
|
|
|
clean-libLTLIBRARIES:
|
|
@@ -364,21 +370,21 @@ distclean-compile:
|
|
|
|
.c.o:
|
|
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
|
|
-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
|
|
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
|
|
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
|
|
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
|
@am__fastdepCC_FALSE@ $(COMPILE) -c $<
|
|
|
|
.c.obj:
|
|
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
|
|
-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
|
|
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
|
|
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
|
|
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
|
@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
|
|
|
|
.c.lo:
|
|
@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
|
|
-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
|
|
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
|
|
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
|
|
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
|
@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
|
|
@@ -401,7 +407,7 @@ tags: TAGS
|
|
|
|
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
|
|
$(TAGS_FILES) $(LISP)
|
|
- tags=; \
|
|
+ set x; \
|
|
here=`pwd`; \
|
|
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
|
|
unique=`for i in $$list; do \
|
|
@@ -409,29 +415,34 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP
|
|
done | \
|
|
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
|
|
END { if (nonempty) { for (i in files) print i; }; }'`; \
|
|
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
|
|
+ shift; \
|
|
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
|
|
test -n "$$unique" || unique=$$empty_fix; \
|
|
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
|
|
- $$tags $$unique; \
|
|
+ if test $$# -gt 0; then \
|
|
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
|
|
+ "$$@" $$unique; \
|
|
+ else \
|
|
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
|
|
+ $$unique; \
|
|
+ fi; \
|
|
fi
|
|
ctags: CTAGS
|
|
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
|
|
$(TAGS_FILES) $(LISP)
|
|
- tags=; \
|
|
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
|
|
unique=`for i in $$list; do \
|
|
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
|
|
done | \
|
|
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
|
|
END { if (nonempty) { for (i in files) print i; }; }'`; \
|
|
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
|
|
+ test -z "$(CTAGS_ARGS)$$unique" \
|
|
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
|
|
- $$tags $$unique
|
|
+ $$unique
|
|
|
|
GTAGS:
|
|
here=`$(am__cd) $(top_builddir) && pwd` \
|
|
- && cd $(top_srcdir) \
|
|
- && gtags -i $(GTAGS_ARGS) $$here
|
|
+ && $(am__cd) $(top_srcdir) \
|
|
+ && gtags -i $(GTAGS_ARGS) "$$here"
|
|
|
|
distclean-tags:
|
|
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
|
|
@@ -452,13 +463,17 @@ distdir: $(DISTFILES)
|
|
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
|
|
if test -d $$d/$$file; then \
|
|
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
|
|
+ if test -d "$(distdir)/$$file"; then \
|
|
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
|
|
+ fi; \
|
|
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
|
|
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
|
|
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
|
|
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
|
|
fi; \
|
|
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
|
|
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
|
|
else \
|
|
- test -f $(distdir)/$$file \
|
|
- || cp -p $$d/$$file $(distdir)/$$file \
|
|
+ test -f "$(distdir)/$$file" \
|
|
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|
|
|| exit 1; \
|
|
fi; \
|
|
done
|
|
@@ -492,6 +507,7 @@ clean-generic:
|
|
|
|
distclean-generic:
|
|
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
|
|
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
|
|
|
|
maintainer-clean-generic:
|
|
@echo "This command is intended for maintainers to use"
|
|
@@ -514,6 +530,8 @@ dvi-am:
|
|
|
|
html: html-am
|
|
|
|
+html-am:
|
|
+
|
|
info: info-am
|
|
|
|
info-am:
|
|
@@ -522,18 +540,28 @@ install-data-am:
|
|
|
|
install-dvi: install-dvi-am
|
|
|
|
+install-dvi-am:
|
|
+
|
|
install-exec-am: install-libLTLIBRARIES
|
|
|
|
install-html: install-html-am
|
|
|
|
+install-html-am:
|
|
+
|
|
install-info: install-info-am
|
|
|
|
+install-info-am:
|
|
+
|
|
install-man:
|
|
|
|
install-pdf: install-pdf-am
|
|
|
|
+install-pdf-am:
|
|
+
|
|
install-ps: install-ps-am
|
|
|
|
+install-ps-am:
|
|
+
|
|
installcheck-am:
|
|
|
|
maintainer-clean: maintainer-clean-am
|
|
@@ -556,7 +584,7 @@ ps-am:
|
|
|
|
uninstall-am: uninstall-libLTLIBRARIES
|
|
|
|
-.MAKE: install-am install-strip
|
|
+.MAKE: all check install install-am install-strip
|
|
|
|
.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
|
|
clean-libLTLIBRARIES clean-libtool ctags distclean \
|
|
@@ -576,6 +604,7 @@ uninstall-am: uninstall-libLTLIBRARIES
|
|
lib.c: lib.pl $(top_builddir)/config.h $(top_srcdir)/features.def
|
|
$(PERL) $(srcdir)/lib.pl < $(top_srcdir)/features.def > lib-t
|
|
mv lib-t lib.c
|
|
+
|
|
# Tell versions [3.59,3.63) of GNU make to not export all variables.
|
|
# Otherwise a system limit (for SysV at least) may be exceeded.
|
|
.NOEXPORT:
|
|
Index: libgtop-2.28.0/misc/Makefile.in
|
|
===================================================================
|
|
--- libgtop-2.28.0.orig/misc/Makefile.in 2009-11-22 17:53:39.757195992 +0100
|
|
+++ libgtop-2.28.0/misc/Makefile.in 2009-11-22 17:53:10.181682903 +0100
|
|
@@ -1,8 +1,9 @@
|
|
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
|
|
+# Makefile.in generated by automake 1.11 from Makefile.am.
|
|
# @configure_input@
|
|
|
|
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
|
|
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
|
|
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
|
|
+# Inc.
|
|
# This Makefile.in is free software; the Free Software Foundation
|
|
# gives unlimited permission to copy and/or distribute it,
|
|
# with or without modifications, as long as this notice is preserved.
|
|
@@ -15,8 +16,9 @@
|
|
@SET_MAKE@
|
|
VPATH = @srcdir@
|
|
pkgdatadir = $(datadir)/@PACKAGE@
|
|
-pkglibdir = $(libdir)/@PACKAGE@
|
|
pkgincludedir = $(includedir)/@PACKAGE@
|
|
+pkglibdir = $(libdir)/@PACKAGE@
|
|
+pkglibexecdir = $(libexecdir)/@PACKAGE@
|
|
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
|
|
install_sh_DATA = $(install_sh) -c -m 644
|
|
install_sh_PROGRAM = $(install_sh) -c
|
|
@@ -41,6 +43,7 @@ am__configure_deps = $(am__aclocal_m4_de
|
|
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
|
|
CONFIG_HEADER = $(top_builddir)/config.h
|
|
CONFIG_CLEAN_FILES =
|
|
+CONFIG_CLEAN_VPATH_FILES =
|
|
SOURCES =
|
|
DIST_SOURCES =
|
|
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
|
|
@@ -92,29 +95,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
|
|
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
|
|
INSTOBJEXT = @INSTOBJEXT@
|
|
INTLLIBS = @INTLLIBS@
|
|
-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
|
|
-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
|
|
-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
|
|
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
|
|
-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
|
|
-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
|
|
INTLTOOL_MERGE = @INTLTOOL_MERGE@
|
|
-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@
|
|
-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
|
|
-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
|
|
-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
|
|
-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
|
|
-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
|
|
-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
|
|
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
|
|
-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
|
|
-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
|
|
-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
|
|
KVM_LIBS = @KVM_LIBS@
|
|
LD = @LD@
|
|
LDFLAGS = @LDFLAGS@
|
|
@@ -153,6 +137,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
|
|
PACKAGE_NAME = @PACKAGE_NAME@
|
|
PACKAGE_STRING = @PACKAGE_STRING@
|
|
PACKAGE_TARNAME = @PACKAGE_TARNAME@
|
|
+PACKAGE_URL = @PACKAGE_URL@
|
|
PACKAGE_VERSION = @PACKAGE_VERSION@
|
|
PATH_SEPARATOR = @PATH_SEPARATOR@
|
|
PERL = @PERL@
|
|
@@ -234,6 +219,7 @@ sysconfdir = @sysconfdir@
|
|
sysdeps_dir = @sysdeps_dir@
|
|
sysdeps_suid_lib = @sysdeps_suid_lib@
|
|
target_alias = @target_alias@
|
|
+top_build_prefix = @top_build_prefix@
|
|
top_builddir = @top_builddir@
|
|
top_srcdir = @top_srcdir@
|
|
EXTRA_DIST = i4b_acct.h i4b_acct.txt
|
|
@@ -249,9 +235,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefi
|
|
exit 1;; \
|
|
esac; \
|
|
done; \
|
|
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu misc/Makefile'; \
|
|
- cd $(top_srcdir) && \
|
|
- $(AUTOMAKE) --gnu misc/Makefile
|
|
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu misc/Makefile'; \
|
|
+ $(am__cd) $(top_srcdir) && \
|
|
+ $(AUTOMAKE) --gnu misc/Makefile
|
|
.PRECIOUS: Makefile
|
|
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
|
|
@case '$?' in \
|
|
@@ -269,6 +255,7 @@ $(top_srcdir)/configure: $(am__configur
|
|
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
|
|
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
|
|
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
|
|
+$(am__aclocal_m4_deps):
|
|
|
|
mostlyclean-libtool:
|
|
-rm -f *.lo
|
|
@@ -298,13 +285,17 @@ distdir: $(DISTFILES)
|
|
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
|
|
if test -d $$d/$$file; then \
|
|
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
|
|
+ if test -d "$(distdir)/$$file"; then \
|
|
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
|
|
+ fi; \
|
|
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
|
|
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
|
|
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
|
|
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
|
|
fi; \
|
|
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
|
|
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
|
|
else \
|
|
- test -f $(distdir)/$$file \
|
|
- || cp -p $$d/$$file $(distdir)/$$file \
|
|
+ test -f "$(distdir)/$$file" \
|
|
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|
|
|| exit 1; \
|
|
fi; \
|
|
done
|
|
@@ -332,6 +323,7 @@ clean-generic:
|
|
|
|
distclean-generic:
|
|
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
|
|
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
|
|
|
|
maintainer-clean-generic:
|
|
@echo "This command is intended for maintainers to use"
|
|
@@ -350,6 +342,8 @@ dvi-am:
|
|
|
|
html: html-am
|
|
|
|
+html-am:
|
|
+
|
|
info: info-am
|
|
|
|
info-am:
|
|
@@ -358,18 +352,28 @@ install-data-am:
|
|
|
|
install-dvi: install-dvi-am
|
|
|
|
+install-dvi-am:
|
|
+
|
|
install-exec-am:
|
|
|
|
install-html: install-html-am
|
|
|
|
+install-html-am:
|
|
+
|
|
install-info: install-info-am
|
|
|
|
+install-info-am:
|
|
+
|
|
install-man:
|
|
|
|
install-pdf: install-pdf-am
|
|
|
|
+install-pdf-am:
|
|
+
|
|
install-ps: install-ps-am
|
|
|
|
+install-ps-am:
|
|
+
|
|
installcheck-am:
|
|
|
|
maintainer-clean: maintainer-clean-am
|
|
@@ -403,6 +407,7 @@ uninstall-am:
|
|
maintainer-clean-generic mostlyclean mostlyclean-generic \
|
|
mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
|
|
|
|
+
|
|
# Tell versions [3.59,3.63) of GNU make to not export all variables.
|
|
# Otherwise a system limit (for SysV at least) may be exceeded.
|
|
.NOEXPORT:
|
|
Index: libgtop-2.28.0/missing
|
|
===================================================================
|
|
--- libgtop-2.28.0.orig/missing 2009-11-22 17:53:39.249193926 +0100
|
|
+++ libgtop-2.28.0/missing 2009-11-22 17:53:09.261686785 +0100
|
|
@@ -1,10 +1,10 @@
|
|
#! /bin/sh
|
|
# Common stub for a few missing GNU programs while installing.
|
|
|
|
-scriptversion=2006-05-10.23
|
|
+scriptversion=2009-04-28.21; # UTC
|
|
|
|
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
|
|
-# Free Software Foundation, Inc.
|
|
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
|
|
+# 2008, 2009 Free Software Foundation, Inc.
|
|
# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
|
|
|
|
# This program is free software; you can redistribute it and/or modify
|
|
@@ -18,9 +18,7 @@ scriptversion=2006-05-10.23
|
|
# GNU General Public License for more details.
|
|
|
|
# You should have received a copy of the GNU General Public License
|
|
-# along with this program; if not, write to the Free Software
|
|
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
|
|
-# 02110-1301, USA.
|
|
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
# As a special exception to the GNU General Public License, if you
|
|
# distribute this file as part of a program that contains a
|
|
@@ -89,6 +87,9 @@ Supported PROGRAM values:
|
|
tar try tar, gnutar, gtar, then tar without non-portable flags
|
|
yacc create \`y.tab.[ch]', if possible, from existing .[ch]
|
|
|
|
+Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
|
|
+\`g' are ignored when checking the name.
|
|
+
|
|
Send bug reports to <bug-automake@gnu.org>."
|
|
exit $?
|
|
;;
|
|
@@ -106,15 +107,22 @@ Send bug reports to <bug-automake@gnu.or
|
|
|
|
esac
|
|
|
|
+# normalize program name to check for.
|
|
+program=`echo "$1" | sed '
|
|
+ s/^gnu-//; t
|
|
+ s/^gnu//; t
|
|
+ s/^g//; t'`
|
|
+
|
|
# Now exit if we have it, but it failed. Also exit now if we
|
|
# don't have it and --version was passed (most likely to detect
|
|
-# the program).
|
|
+# the program). This is about non-GNU programs, so use $1 not
|
|
+# $program.
|
|
case $1 in
|
|
- lex|yacc)
|
|
+ lex*|yacc*)
|
|
# Not GNU programs, they don't have --version.
|
|
;;
|
|
|
|
- tar)
|
|
+ tar*)
|
|
if test -n "$run"; then
|
|
echo 1>&2 "ERROR: \`tar' requires --run"
|
|
exit 1
|
|
@@ -138,7 +146,7 @@ esac
|
|
|
|
# If it does not exist, or fails to run (possibly an outdated version),
|
|
# try to emulate it.
|
|
-case $1 in
|
|
+case $program in
|
|
aclocal*)
|
|
echo 1>&2 "\
|
|
WARNING: \`$1' is $msg. You should only need it if
|
|
@@ -148,7 +156,7 @@ WARNING: \`$1' is $msg. You should only
|
|
touch aclocal.m4
|
|
;;
|
|
|
|
- autoconf)
|
|
+ autoconf*)
|
|
echo 1>&2 "\
|
|
WARNING: \`$1' is $msg. You should only need it if
|
|
you modified \`${configure_ac}'. You might want to install the
|
|
@@ -157,7 +165,7 @@ WARNING: \`$1' is $msg. You should only
|
|
touch configure
|
|
;;
|
|
|
|
- autoheader)
|
|
+ autoheader*)
|
|
echo 1>&2 "\
|
|
WARNING: \`$1' is $msg. You should only need it if
|
|
you modified \`acconfig.h' or \`${configure_ac}'. You might want
|
|
@@ -187,7 +195,7 @@ WARNING: \`$1' is $msg. You should only
|
|
while read f; do touch "$f"; done
|
|
;;
|
|
|
|
- autom4te)
|
|
+ autom4te*)
|
|
echo 1>&2 "\
|
|
WARNING: \`$1' is needed, but is $msg.
|
|
You might have modified some files without having the
|
|
@@ -210,7 +218,7 @@ WARNING: \`$1' is needed, but is $msg.
|
|
fi
|
|
;;
|
|
|
|
- bison|yacc)
|
|
+ bison*|yacc*)
|
|
echo 1>&2 "\
|
|
WARNING: \`$1' $msg. You should only need it if
|
|
you modified a \`.y' file. You may need the \`Bison' package
|
|
@@ -240,7 +248,7 @@ WARNING: \`$1' $msg. You should only ne
|
|
fi
|
|
;;
|
|
|
|
- lex|flex)
|
|
+ lex*|flex*)
|
|
echo 1>&2 "\
|
|
WARNING: \`$1' is $msg. You should only need it if
|
|
you modified a \`.l' file. You may need the \`Flex' package
|
|
@@ -263,7 +271,7 @@ WARNING: \`$1' is $msg. You should only
|
|
fi
|
|
;;
|
|
|
|
- help2man)
|
|
+ help2man*)
|
|
echo 1>&2 "\
|
|
WARNING: \`$1' is $msg. You should only need it if
|
|
you modified a dependency of a manual page. You may need the
|
|
@@ -277,11 +285,11 @@ WARNING: \`$1' is $msg. You should only
|
|
else
|
|
test -z "$file" || exec >$file
|
|
echo ".ab help2man is required to generate this page"
|
|
- exit 1
|
|
+ exit $?
|
|
fi
|
|
;;
|
|
|
|
- makeinfo)
|
|
+ makeinfo*)
|
|
echo 1>&2 "\
|
|
WARNING: \`$1' is $msg. You should only need it if
|
|
you modified a \`.texi' or \`.texinfo' file, or any other file
|
|
@@ -310,7 +318,7 @@ WARNING: \`$1' is $msg. You should only
|
|
touch $file
|
|
;;
|
|
|
|
- tar)
|
|
+ tar*)
|
|
shift
|
|
|
|
# We have already tried tar in the generic part.
|
|
@@ -363,5 +371,6 @@ exit 0
|
|
# eval: (add-hook 'write-file-hooks 'time-stamp)
|
|
# time-stamp-start: "scriptversion="
|
|
# time-stamp-format: "%:y-%02m-%02d.%02H"
|
|
-# time-stamp-end: "$"
|
|
+# time-stamp-time-zone: "UTC"
|
|
+# time-stamp-end: "; # UTC"
|
|
# End:
|
|
Index: libgtop-2.28.0/mkinstalldirs
|
|
===================================================================
|
|
--- libgtop-2.28.0.orig/mkinstalldirs 2009-11-22 17:53:38.833185107 +0100
|
|
+++ libgtop-2.28.0/mkinstalldirs 2009-11-22 17:53:11.909685820 +0100
|
|
@@ -1,7 +1,7 @@
|
|
#! /bin/sh
|
|
# mkinstalldirs --- make directory hierarchy
|
|
|
|
-scriptversion=2006-05-11.19
|
|
+scriptversion=2009-04-28.21; # UTC
|
|
|
|
# Original author: Noah Friedman <friedman@prep.ai.mit.edu>
|
|
# Created: 1993-05-16
|
|
@@ -157,5 +157,6 @@ exit $errstatus
|
|
# eval: (add-hook 'write-file-hooks 'time-stamp)
|
|
# time-stamp-start: "scriptversion="
|
|
# time-stamp-format: "%:y-%02m-%02d.%02H"
|
|
-# time-stamp-end: "$"
|
|
+# time-stamp-time-zone: "UTC"
|
|
+# time-stamp-end: "; # UTC"
|
|
# End:
|
|
Index: libgtop-2.28.0/src/Makefile.in
|
|
===================================================================
|
|
--- libgtop-2.28.0.orig/src/Makefile.in 2009-11-22 17:53:43.909188061 +0100
|
|
+++ libgtop-2.28.0/src/Makefile.in 2009-11-22 17:53:10.265684779 +0100
|
|
@@ -1,8 +1,9 @@
|
|
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
|
|
+# Makefile.in generated by automake 1.11 from Makefile.am.
|
|
# @configure_input@
|
|
|
|
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
|
|
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
|
|
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
|
|
+# Inc.
|
|
# This Makefile.in is free software; the Free Software Foundation
|
|
# gives unlimited permission to copy and/or distribute it,
|
|
# with or without modifications, as long as this notice is preserved.
|
|
@@ -15,8 +16,9 @@
|
|
@SET_MAKE@
|
|
VPATH = @srcdir@
|
|
pkgdatadir = $(datadir)/@PACKAGE@
|
|
-pkglibdir = $(libdir)/@PACKAGE@
|
|
pkgincludedir = $(includedir)/@PACKAGE@
|
|
+pkglibdir = $(libdir)/@PACKAGE@
|
|
+pkglibexecdir = $(libexecdir)/@PACKAGE@
|
|
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
|
|
install_sh_DATA = $(install_sh) -c -m 644
|
|
install_sh_PROGRAM = $(install_sh) -c
|
|
@@ -41,6 +43,7 @@ am__configure_deps = $(am__aclocal_m4_de
|
|
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
|
|
CONFIG_HEADER = $(top_builddir)/config.h
|
|
CONFIG_CLEAN_FILES =
|
|
+CONFIG_CLEAN_VPATH_FILES =
|
|
SOURCES =
|
|
DIST_SOURCES =
|
|
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
|
|
@@ -52,9 +55,37 @@ RECURSIVE_TARGETS = all-recursive check-
|
|
ps-recursive uninstall-recursive
|
|
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
|
|
distclean-recursive maintainer-clean-recursive
|
|
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
|
|
+ $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
|
|
+ distdir
|
|
ETAGS = etags
|
|
CTAGS = ctags
|
|
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
|
|
+am__relativize = \
|
|
+ dir0=`pwd`; \
|
|
+ sed_first='s,^\([^/]*\)/.*$$,\1,'; \
|
|
+ sed_rest='s,^[^/]*/*,,'; \
|
|
+ sed_last='s,^.*/\([^/]*\)$$,\1,'; \
|
|
+ sed_butlast='s,/*[^/]*$$,,'; \
|
|
+ while test -n "$$dir1"; do \
|
|
+ first=`echo "$$dir1" | sed -e "$$sed_first"`; \
|
|
+ if test "$$first" != "."; then \
|
|
+ if test "$$first" = ".."; then \
|
|
+ dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
|
|
+ dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
|
|
+ else \
|
|
+ first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
|
|
+ if test "$$first2" = "$$first"; then \
|
|
+ dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
|
|
+ else \
|
|
+ dir2="../$$dir2"; \
|
|
+ fi; \
|
|
+ dir0="$$dir0"/"$$first"; \
|
|
+ fi; \
|
|
+ fi; \
|
|
+ dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
|
|
+ done; \
|
|
+ reldir="$$dir2"
|
|
ACLOCAL = @ACLOCAL@
|
|
ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
|
|
ALLOCA = @ALLOCA@
|
|
@@ -103,29 +134,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
|
|
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
|
|
INSTOBJEXT = @INSTOBJEXT@
|
|
INTLLIBS = @INTLLIBS@
|
|
-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
|
|
-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
|
|
-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
|
|
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
|
|
-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
|
|
-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
|
|
INTLTOOL_MERGE = @INTLTOOL_MERGE@
|
|
-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@
|
|
-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
|
|
-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
|
|
-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
|
|
-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
|
|
-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
|
|
-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
|
|
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
|
|
-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
|
|
-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
|
|
-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
|
|
KVM_LIBS = @KVM_LIBS@
|
|
LD = @LD@
|
|
LDFLAGS = @LDFLAGS@
|
|
@@ -164,6 +176,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
|
|
PACKAGE_NAME = @PACKAGE_NAME@
|
|
PACKAGE_STRING = @PACKAGE_STRING@
|
|
PACKAGE_TARNAME = @PACKAGE_TARNAME@
|
|
+PACKAGE_URL = @PACKAGE_URL@
|
|
PACKAGE_VERSION = @PACKAGE_VERSION@
|
|
PATH_SEPARATOR = @PATH_SEPARATOR@
|
|
PERL = @PERL@
|
|
@@ -245,6 +258,7 @@ sysconfdir = @sysconfdir@
|
|
sysdeps_dir = @sysdeps_dir@
|
|
sysdeps_suid_lib = @sysdeps_suid_lib@
|
|
target_alias = @target_alias@
|
|
+top_build_prefix = @top_build_prefix@
|
|
top_builddir = @top_builddir@
|
|
top_srcdir = @top_srcdir@
|
|
@NEED_LIBGTOP_FALSE@daemon_SUBDIRS =
|
|
@@ -263,9 +277,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefi
|
|
exit 1;; \
|
|
esac; \
|
|
done; \
|
|
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \
|
|
- cd $(top_srcdir) && \
|
|
- $(AUTOMAKE) --gnu src/Makefile
|
|
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \
|
|
+ $(am__cd) $(top_srcdir) && \
|
|
+ $(AUTOMAKE) --gnu src/Makefile
|
|
.PRECIOUS: Makefile
|
|
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
|
|
@case '$?' in \
|
|
@@ -283,6 +297,7 @@ $(top_srcdir)/configure: $(am__configur
|
|
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
|
|
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
|
|
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
|
|
+$(am__aclocal_m4_deps):
|
|
|
|
mostlyclean-libtool:
|
|
-rm -f *.lo
|
|
@@ -314,7 +329,7 @@ $(RECURSIVE_TARGETS):
|
|
else \
|
|
local_target="$$target"; \
|
|
fi; \
|
|
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
|
|
+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
|
|
|| eval $$failcom; \
|
|
done; \
|
|
if test "$$dot_seen" = "no"; then \
|
|
@@ -348,16 +363,16 @@ $(RECURSIVE_CLEAN_TARGETS):
|
|
else \
|
|
local_target="$$target"; \
|
|
fi; \
|
|
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
|
|
+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
|
|
|| eval $$failcom; \
|
|
done && test -z "$$fail"
|
|
tags-recursive:
|
|
list='$(SUBDIRS)'; for subdir in $$list; do \
|
|
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
|
|
+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
|
|
done
|
|
ctags-recursive:
|
|
list='$(SUBDIRS)'; for subdir in $$list; do \
|
|
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
|
|
+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
|
|
done
|
|
|
|
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
|
|
@@ -372,7 +387,7 @@ tags: TAGS
|
|
|
|
TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
|
|
$(TAGS_FILES) $(LISP)
|
|
- tags=; \
|
|
+ set x; \
|
|
here=`pwd`; \
|
|
if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
|
|
include_option=--etags-include; \
|
|
@@ -384,7 +399,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE
|
|
list='$(SUBDIRS)'; for subdir in $$list; do \
|
|
if test "$$subdir" = .; then :; else \
|
|
test ! -f $$subdir/TAGS || \
|
|
- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
|
|
+ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
|
|
fi; \
|
|
done; \
|
|
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
|
|
@@ -393,29 +408,34 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE
|
|
done | \
|
|
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
|
|
END { if (nonempty) { for (i in files) print i; }; }'`; \
|
|
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
|
|
+ shift; \
|
|
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
|
|
test -n "$$unique" || unique=$$empty_fix; \
|
|
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
|
|
- $$tags $$unique; \
|
|
+ if test $$# -gt 0; then \
|
|
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
|
|
+ "$$@" $$unique; \
|
|
+ else \
|
|
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
|
|
+ $$unique; \
|
|
+ fi; \
|
|
fi
|
|
ctags: CTAGS
|
|
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
|
|
$(TAGS_FILES) $(LISP)
|
|
- tags=; \
|
|
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
|
|
unique=`for i in $$list; do \
|
|
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
|
|
done | \
|
|
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
|
|
END { if (nonempty) { for (i in files) print i; }; }'`; \
|
|
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
|
|
+ test -z "$(CTAGS_ARGS)$$unique" \
|
|
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
|
|
- $$tags $$unique
|
|
+ $$unique
|
|
|
|
GTAGS:
|
|
here=`$(am__cd) $(top_builddir) && pwd` \
|
|
- && cd $(top_srcdir) \
|
|
- && gtags -i $(GTAGS_ARGS) $$here
|
|
+ && $(am__cd) $(top_srcdir) \
|
|
+ && gtags -i $(GTAGS_ARGS) "$$here"
|
|
|
|
distclean-tags:
|
|
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
|
|
@@ -436,29 +456,44 @@ distdir: $(DISTFILES)
|
|
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
|
|
if test -d $$d/$$file; then \
|
|
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
|
|
+ if test -d "$(distdir)/$$file"; then \
|
|
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
|
|
+ fi; \
|
|
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
|
|
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
|
|
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
|
|
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
|
|
fi; \
|
|
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
|
|
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
|
|
else \
|
|
- test -f $(distdir)/$$file \
|
|
- || cp -p $$d/$$file $(distdir)/$$file \
|
|
+ test -f "$(distdir)/$$file" \
|
|
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|
|
|| exit 1; \
|
|
fi; \
|
|
done
|
|
- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
|
|
+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
|
|
if test "$$subdir" = .; then :; else \
|
|
test -d "$(distdir)/$$subdir" \
|
|
|| $(MKDIR_P) "$(distdir)/$$subdir" \
|
|
|| exit 1; \
|
|
- distdir=`$(am__cd) $(distdir) && pwd`; \
|
|
- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
|
|
- (cd $$subdir && \
|
|
+ fi; \
|
|
+ done
|
|
+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
|
|
+ if test "$$subdir" = .; then :; else \
|
|
+ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
|
|
+ $(am__relativize); \
|
|
+ new_distdir=$$reldir; \
|
|
+ dir1=$$subdir; dir2="$(top_distdir)"; \
|
|
+ $(am__relativize); \
|
|
+ new_top_distdir=$$reldir; \
|
|
+ echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
|
|
+ echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
|
|
+ ($(am__cd) $$subdir && \
|
|
$(MAKE) $(AM_MAKEFLAGS) \
|
|
- top_distdir="$$top_distdir" \
|
|
- distdir="$$distdir/$$subdir" \
|
|
+ top_distdir="$$new_top_distdir" \
|
|
+ distdir="$$new_distdir" \
|
|
am__remove_distdir=: \
|
|
am__skip_length_check=: \
|
|
+ am__skip_mode_fix=: \
|
|
distdir) \
|
|
|| exit 1; \
|
|
fi; \
|
|
@@ -488,6 +523,7 @@ clean-generic:
|
|
|
|
distclean-generic:
|
|
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
|
|
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
|
|
|
|
maintainer-clean-generic:
|
|
@echo "This command is intended for maintainers to use"
|
|
@@ -506,6 +542,8 @@ dvi-am:
|
|
|
|
html: html-recursive
|
|
|
|
+html-am:
|
|
+
|
|
info: info-recursive
|
|
|
|
info-am:
|
|
@@ -514,18 +552,28 @@ install-data-am:
|
|
|
|
install-dvi: install-dvi-recursive
|
|
|
|
+install-dvi-am:
|
|
+
|
|
install-exec-am:
|
|
|
|
install-html: install-html-recursive
|
|
|
|
+install-html-am:
|
|
+
|
|
install-info: install-info-recursive
|
|
|
|
+install-info-am:
|
|
+
|
|
install-man:
|
|
|
|
install-pdf: install-pdf-recursive
|
|
|
|
+install-pdf-am:
|
|
+
|
|
install-ps: install-ps-recursive
|
|
|
|
+install-ps-am:
|
|
+
|
|
installcheck-am:
|
|
|
|
maintainer-clean: maintainer-clean-recursive
|
|
@@ -546,8 +594,8 @@ ps-am:
|
|
|
|
uninstall-am:
|
|
|
|
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
|
|
- install-strip
|
|
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
|
|
+ install-am install-strip tags-recursive
|
|
|
|
.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
|
|
all all-am check check-am clean clean-generic clean-libtool \
|
|
@@ -563,6 +611,7 @@ uninstall-am:
|
|
mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
|
|
uninstall uninstall-am
|
|
|
|
+
|
|
# Tell versions [3.59,3.63) of GNU make to not export all variables.
|
|
# Otherwise a system limit (for SysV at least) may be exceeded.
|
|
.NOEXPORT:
|
|
Index: libgtop-2.28.0/src/daemon/Makefile.in
|
|
===================================================================
|
|
--- libgtop-2.28.0.orig/src/daemon/Makefile.in 2009-11-22 17:53:43.977185183 +0100
|
|
+++ libgtop-2.28.0/src/daemon/Makefile.in 2009-11-22 17:53:10.377685806 +0100
|
|
@@ -1,8 +1,9 @@
|
|
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
|
|
+# Makefile.in generated by automake 1.11 from Makefile.am.
|
|
# @configure_input@
|
|
|
|
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
|
|
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
|
|
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
|
|
+# Inc.
|
|
# This Makefile.in is free software; the Free Software Foundation
|
|
# gives unlimited permission to copy and/or distribute it,
|
|
# with or without modifications, as long as this notice is preserved.
|
|
@@ -16,8 +17,9 @@
|
|
|
|
VPATH = @srcdir@
|
|
pkgdatadir = $(datadir)/@PACKAGE@
|
|
-pkglibdir = $(libdir)/@PACKAGE@
|
|
pkgincludedir = $(includedir)/@PACKAGE@
|
|
+pkglibdir = $(libdir)/@PACKAGE@
|
|
+pkglibexecdir = $(libexecdir)/@PACKAGE@
|
|
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
|
|
install_sh_DATA = $(install_sh) -c -m 644
|
|
install_sh_PROGRAM = $(install_sh) -c
|
|
@@ -32,7 +34,7 @@ PRE_UNINSTALL = :
|
|
POST_UNINSTALL = :
|
|
build_triplet = @build@
|
|
host_triplet = @host@
|
|
-bin_PROGRAMS = libgtop_daemon2$(EXEEXT) @server_programs@
|
|
+libexec_PROGRAMS = libgtop_daemon2$(EXEEXT) @server_programs@
|
|
EXTRA_PROGRAMS = libgtop_server2$(EXEEXT)
|
|
subdir = src/daemon
|
|
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog
|
|
@@ -44,9 +46,9 @@ am__configure_deps = $(am__aclocal_m4_de
|
|
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
|
|
CONFIG_HEADER = $(top_builddir)/config.h
|
|
CONFIG_CLEAN_FILES =
|
|
-am__installdirs = "$(DESTDIR)$(bindir)"
|
|
-binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
|
|
-PROGRAMS = $(bin_PROGRAMS)
|
|
+CONFIG_CLEAN_VPATH_FILES =
|
|
+am__installdirs = "$(DESTDIR)$(libexecdir)"
|
|
+PROGRAMS = $(libexec_PROGRAMS)
|
|
am_libgtop_daemon2_OBJECTS = gnuserv.$(OBJEXT) slave.$(OBJEXT) \
|
|
main.$(OBJEXT) io.$(OBJEXT) version.$(OBJEXT)
|
|
libgtop_daemon2_OBJECTS = $(am_libgtop_daemon2_OBJECTS)
|
|
@@ -67,6 +69,7 @@ libgtop_server2_DEPENDENCIES = $(am__DEP
|
|
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
|
|
depcomp = $(SHELL) $(top_srcdir)/depcomp
|
|
am__depfiles_maybe = depfiles
|
|
+am__mv = mv -f
|
|
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
|
|
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
|
|
LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
|
|
@@ -131,29 +134,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
|
|
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
|
|
INSTOBJEXT = @INSTOBJEXT@
|
|
INTLLIBS = @INTLLIBS@
|
|
-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
|
|
-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
|
|
-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
|
|
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
|
|
-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
|
|
-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
|
|
INTLTOOL_MERGE = @INTLTOOL_MERGE@
|
|
-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@
|
|
-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
|
|
-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
|
|
-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
|
|
-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
|
|
-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
|
|
-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
|
|
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
|
|
-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
|
|
-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
|
|
-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
|
|
KVM_LIBS = @KVM_LIBS@
|
|
LD = @LD@
|
|
LDFLAGS = @LDFLAGS@
|
|
@@ -192,6 +176,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
|
|
PACKAGE_NAME = @PACKAGE_NAME@
|
|
PACKAGE_STRING = @PACKAGE_STRING@
|
|
PACKAGE_TARNAME = @PACKAGE_TARNAME@
|
|
+PACKAGE_URL = @PACKAGE_URL@
|
|
PACKAGE_VERSION = @PACKAGE_VERSION@
|
|
PATH_SEPARATOR = @PATH_SEPARATOR@
|
|
PERL = @PERL@
|
|
@@ -273,6 +258,7 @@ sysconfdir = @sysconfdir@
|
|
sysdeps_dir = @sysdeps_dir@
|
|
sysdeps_suid_lib = @sysdeps_suid_lib@
|
|
target_alias = @target_alias@
|
|
+top_build_prefix = @top_build_prefix@
|
|
top_builddir = @top_builddir@
|
|
top_srcdir = @top_srcdir@
|
|
LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
|
|
@@ -309,9 +295,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefi
|
|
exit 1;; \
|
|
esac; \
|
|
done; \
|
|
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/daemon/Makefile'; \
|
|
- cd $(top_srcdir) && \
|
|
- $(AUTOMAKE) --gnu src/daemon/Makefile
|
|
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/daemon/Makefile'; \
|
|
+ $(am__cd) $(top_srcdir) && \
|
|
+ $(AUTOMAKE) --gnu src/daemon/Makefile
|
|
.PRECIOUS: Makefile
|
|
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
|
|
@case '$?' in \
|
|
@@ -329,34 +315,50 @@ $(top_srcdir)/configure: $(am__configur
|
|
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
|
|
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
|
|
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
|
|
-install-binPROGRAMS: $(bin_PROGRAMS)
|
|
+$(am__aclocal_m4_deps):
|
|
+install-libexecPROGRAMS: $(libexec_PROGRAMS)
|
|
@$(NORMAL_INSTALL)
|
|
- test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
|
|
- @list='$(bin_PROGRAMS)'; for p in $$list; do \
|
|
- p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
|
|
- if test -f $$p \
|
|
- || test -f $$p1 \
|
|
- ; then \
|
|
- f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
|
|
- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
|
|
- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
|
|
- else :; fi; \
|
|
- done
|
|
+ test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)"
|
|
+ @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \
|
|
+ for p in $$list; do echo "$$p $$p"; done | \
|
|
+ sed 's/$(EXEEXT)$$//' | \
|
|
+ while read p p1; do if test -f $$p || test -f $$p1; \
|
|
+ then echo "$$p"; echo "$$p"; else :; fi; \
|
|
+ done | \
|
|
+ sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
|
|
+ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
|
|
+ sed 'N;N;N;s,\n, ,g' | \
|
|
+ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
|
|
+ { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
|
|
+ if ($$2 == $$4) files[d] = files[d] " " $$1; \
|
|
+ else { print "f", $$3 "/" $$4, $$1; } } \
|
|
+ END { for (d in files) print "f", d, files[d] }' | \
|
|
+ while read type dir files; do \
|
|
+ if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
|
|
+ test -z "$$files" || { \
|
|
+ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(libexecdir)$$dir'"; \
|
|
+ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(libexecdir)$$dir" || exit $$?; \
|
|
+ } \
|
|
+ ; done
|
|
|
|
-uninstall-binPROGRAMS:
|
|
+uninstall-libexecPROGRAMS:
|
|
@$(NORMAL_UNINSTALL)
|
|
- @list='$(bin_PROGRAMS)'; for p in $$list; do \
|
|
- f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
|
|
- echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
|
|
- rm -f "$(DESTDIR)$(bindir)/$$f"; \
|
|
- done
|
|
-
|
|
-clean-binPROGRAMS:
|
|
- @list='$(bin_PROGRAMS)'; for p in $$list; do \
|
|
- f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
|
|
- echo " rm -f $$p $$f"; \
|
|
- rm -f $$p $$f ; \
|
|
- done
|
|
+ @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \
|
|
+ files=`for p in $$list; do echo "$$p"; done | \
|
|
+ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
|
|
+ -e 's/$$/$(EXEEXT)/' `; \
|
|
+ test -n "$$list" || exit 0; \
|
|
+ echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \
|
|
+ cd "$(DESTDIR)$(libexecdir)" && rm -f $$files
|
|
+
|
|
+clean-libexecPROGRAMS:
|
|
+ @list='$(libexec_PROGRAMS)'; test -n "$$list" || exit 0; \
|
|
+ echo " rm -f" $$list; \
|
|
+ rm -f $$list || exit $$?; \
|
|
+ test -n "$(EXEEXT)" || exit 0; \
|
|
+ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
|
|
+ echo " rm -f" $$list; \
|
|
+ rm -f $$list
|
|
libgtop_daemon2$(EXEEXT): $(libgtop_daemon2_OBJECTS) $(libgtop_daemon2_DEPENDENCIES)
|
|
@rm -f libgtop_daemon2$(EXEEXT)
|
|
$(LINK) $(libgtop_daemon2_OBJECTS) $(libgtop_daemon2_LDADD) $(LIBS)
|
|
@@ -379,21 +381,21 @@ distclean-compile:
|
|
|
|
.c.o:
|
|
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
|
|
-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
|
|
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
|
|
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
|
|
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
|
@am__fastdepCC_FALSE@ $(COMPILE) -c $<
|
|
|
|
.c.obj:
|
|
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
|
|
-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
|
|
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
|
|
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
|
|
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
|
@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
|
|
|
|
.c.lo:
|
|
@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
|
|
-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
|
|
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
|
|
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
|
|
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
|
@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
|
|
@@ -416,7 +418,7 @@ tags: TAGS
|
|
|
|
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
|
|
$(TAGS_FILES) $(LISP)
|
|
- tags=; \
|
|
+ set x; \
|
|
here=`pwd`; \
|
|
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
|
|
unique=`for i in $$list; do \
|
|
@@ -424,29 +426,34 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP
|
|
done | \
|
|
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
|
|
END { if (nonempty) { for (i in files) print i; }; }'`; \
|
|
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
|
|
+ shift; \
|
|
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
|
|
test -n "$$unique" || unique=$$empty_fix; \
|
|
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
|
|
- $$tags $$unique; \
|
|
+ if test $$# -gt 0; then \
|
|
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
|
|
+ "$$@" $$unique; \
|
|
+ else \
|
|
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
|
|
+ $$unique; \
|
|
+ fi; \
|
|
fi
|
|
ctags: CTAGS
|
|
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
|
|
$(TAGS_FILES) $(LISP)
|
|
- tags=; \
|
|
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
|
|
unique=`for i in $$list; do \
|
|
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
|
|
done | \
|
|
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
|
|
END { if (nonempty) { for (i in files) print i; }; }'`; \
|
|
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
|
|
+ test -z "$(CTAGS_ARGS)$$unique" \
|
|
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
|
|
- $$tags $$unique
|
|
+ $$unique
|
|
|
|
GTAGS:
|
|
here=`$(am__cd) $(top_builddir) && pwd` \
|
|
- && cd $(top_srcdir) \
|
|
- && gtags -i $(GTAGS_ARGS) $$here
|
|
+ && $(am__cd) $(top_srcdir) \
|
|
+ && gtags -i $(GTAGS_ARGS) "$$here"
|
|
|
|
distclean-tags:
|
|
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
|
|
@@ -467,13 +474,17 @@ distdir: $(DISTFILES)
|
|
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
|
|
if test -d $$d/$$file; then \
|
|
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
|
|
+ if test -d "$(distdir)/$$file"; then \
|
|
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
|
|
+ fi; \
|
|
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
|
|
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
|
|
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
|
|
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
|
|
fi; \
|
|
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
|
|
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
|
|
else \
|
|
- test -f $(distdir)/$$file \
|
|
- || cp -p $$d/$$file $(distdir)/$$file \
|
|
+ test -f "$(distdir)/$$file" \
|
|
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|
|
|| exit 1; \
|
|
fi; \
|
|
done
|
|
@@ -481,7 +492,7 @@ check-am: all-am
|
|
check: check-am
|
|
all-am: Makefile $(PROGRAMS)
|
|
installdirs:
|
|
- for dir in "$(DESTDIR)$(bindir)"; do \
|
|
+ for dir in "$(DESTDIR)$(libexecdir)"; do \
|
|
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
|
|
done
|
|
install: install-am
|
|
@@ -504,13 +515,15 @@ clean-generic:
|
|
|
|
distclean-generic:
|
|
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
|
|
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
|
|
|
|
maintainer-clean-generic:
|
|
@echo "This command is intended for maintainers to use"
|
|
@echo "it deletes files that may require special tools to rebuild."
|
|
clean: clean-am
|
|
|
|
-clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
|
|
+clean-am: clean-generic clean-libexecPROGRAMS clean-libtool \
|
|
+ mostlyclean-am
|
|
|
|
distclean: distclean-am
|
|
-rm -rf ./$(DEPDIR)
|
|
@@ -524,6 +537,8 @@ dvi-am:
|
|
|
|
html: html-am
|
|
|
|
+html-am:
|
|
+
|
|
info: info-am
|
|
|
|
info-am:
|
|
@@ -532,20 +547,29 @@ install-data-am:
|
|
|
|
install-dvi: install-dvi-am
|
|
|
|
-install-exec-am: install-binPROGRAMS
|
|
+install-dvi-am:
|
|
+
|
|
+install-exec-am: install-libexecPROGRAMS
|
|
@$(NORMAL_INSTALL)
|
|
$(MAKE) $(AM_MAKEFLAGS) install-exec-hook
|
|
-
|
|
install-html: install-html-am
|
|
|
|
+install-html-am:
|
|
+
|
|
install-info: install-info-am
|
|
|
|
+install-info-am:
|
|
+
|
|
install-man:
|
|
|
|
install-pdf: install-pdf-am
|
|
|
|
+install-pdf-am:
|
|
+
|
|
install-ps: install-ps-am
|
|
|
|
+install-ps-am:
|
|
+
|
|
installcheck-am:
|
|
|
|
maintainer-clean: maintainer-clean-am
|
|
@@ -566,27 +590,28 @@ ps: ps-am
|
|
|
|
ps-am:
|
|
|
|
-uninstall-am: uninstall-binPROGRAMS
|
|
+uninstall-am: uninstall-libexecPROGRAMS
|
|
|
|
.MAKE: install-am install-exec-am install-strip
|
|
|
|
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
|
|
- clean-generic clean-libtool ctags distclean distclean-compile \
|
|
- distclean-generic distclean-libtool distclean-tags distdir dvi \
|
|
- dvi-am html html-am info info-am install install-am \
|
|
- install-binPROGRAMS install-data install-data-am install-dvi \
|
|
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
|
|
+ clean-libexecPROGRAMS clean-libtool ctags distclean \
|
|
+ distclean-compile distclean-generic distclean-libtool \
|
|
+ distclean-tags distdir dvi dvi-am html html-am info info-am \
|
|
+ install install-am install-data install-data-am install-dvi \
|
|
install-dvi-am install-exec install-exec-am install-exec-hook \
|
|
install-html install-html-am install-info install-info-am \
|
|
- install-man install-pdf install-pdf-am install-ps \
|
|
- install-ps-am install-strip installcheck installcheck-am \
|
|
- installdirs maintainer-clean maintainer-clean-generic \
|
|
- mostlyclean mostlyclean-compile mostlyclean-generic \
|
|
- mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
|
|
- uninstall-am uninstall-binPROGRAMS
|
|
+ install-libexecPROGRAMS install-man install-pdf install-pdf-am \
|
|
+ install-ps install-ps-am install-strip installcheck \
|
|
+ installcheck-am installdirs maintainer-clean \
|
|
+ maintainer-clean-generic mostlyclean mostlyclean-compile \
|
|
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
|
|
+ tags uninstall uninstall-am uninstall-libexecPROGRAMS
|
|
|
|
|
|
install-exec-hook:
|
|
-@libgtop_postinstall@
|
|
+
|
|
# Tell versions [3.59,3.63) of GNU make to not export all variables.
|
|
# Otherwise a system limit (for SysV at least) may be exceeded.
|
|
.NOEXPORT:
|
|
Index: libgtop-2.28.0/sysdeps/Makefile.in
|
|
===================================================================
|
|
--- libgtop-2.28.0.orig/sysdeps/Makefile.in 2009-11-22 17:53:41.929195143 +0100
|
|
+++ libgtop-2.28.0/sysdeps/Makefile.in 2009-11-22 17:53:10.469685417 +0100
|
|
@@ -1,8 +1,9 @@
|
|
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
|
|
+# Makefile.in generated by automake 1.11 from Makefile.am.
|
|
# @configure_input@
|
|
|
|
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
|
|
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
|
|
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
|
|
+# Inc.
|
|
# This Makefile.in is free software; the Free Software Foundation
|
|
# gives unlimited permission to copy and/or distribute it,
|
|
# with or without modifications, as long as this notice is preserved.
|
|
@@ -15,8 +16,9 @@
|
|
@SET_MAKE@
|
|
VPATH = @srcdir@
|
|
pkgdatadir = $(datadir)/@PACKAGE@
|
|
-pkglibdir = $(libdir)/@PACKAGE@
|
|
pkgincludedir = $(includedir)/@PACKAGE@
|
|
+pkglibdir = $(libdir)/@PACKAGE@
|
|
+pkglibexecdir = $(libexecdir)/@PACKAGE@
|
|
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
|
|
install_sh_DATA = $(install_sh) -c -m 644
|
|
install_sh_PROGRAM = $(install_sh) -c
|
|
@@ -41,6 +43,7 @@ am__configure_deps = $(am__aclocal_m4_de
|
|
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
|
|
CONFIG_HEADER = $(top_builddir)/config.h
|
|
CONFIG_CLEAN_FILES =
|
|
+CONFIG_CLEAN_VPATH_FILES =
|
|
SOURCES =
|
|
DIST_SOURCES =
|
|
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
|
|
@@ -52,9 +55,37 @@ RECURSIVE_TARGETS = all-recursive check-
|
|
ps-recursive uninstall-recursive
|
|
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
|
|
distclean-recursive maintainer-clean-recursive
|
|
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
|
|
+ $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
|
|
+ distdir
|
|
ETAGS = etags
|
|
CTAGS = ctags
|
|
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
|
|
+am__relativize = \
|
|
+ dir0=`pwd`; \
|
|
+ sed_first='s,^\([^/]*\)/.*$$,\1,'; \
|
|
+ sed_rest='s,^[^/]*/*,,'; \
|
|
+ sed_last='s,^.*/\([^/]*\)$$,\1,'; \
|
|
+ sed_butlast='s,/*[^/]*$$,,'; \
|
|
+ while test -n "$$dir1"; do \
|
|
+ first=`echo "$$dir1" | sed -e "$$sed_first"`; \
|
|
+ if test "$$first" != "."; then \
|
|
+ if test "$$first" = ".."; then \
|
|
+ dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
|
|
+ dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
|
|
+ else \
|
|
+ first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
|
|
+ if test "$$first2" = "$$first"; then \
|
|
+ dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
|
|
+ else \
|
|
+ dir2="../$$dir2"; \
|
|
+ fi; \
|
|
+ dir0="$$dir0"/"$$first"; \
|
|
+ fi; \
|
|
+ fi; \
|
|
+ dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
|
|
+ done; \
|
|
+ reldir="$$dir2"
|
|
ACLOCAL = @ACLOCAL@
|
|
ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
|
|
ALLOCA = @ALLOCA@
|
|
@@ -103,29 +134,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
|
|
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
|
|
INSTOBJEXT = @INSTOBJEXT@
|
|
INTLLIBS = @INTLLIBS@
|
|
-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
|
|
-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
|
|
-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
|
|
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
|
|
-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
|
|
-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
|
|
INTLTOOL_MERGE = @INTLTOOL_MERGE@
|
|
-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@
|
|
-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
|
|
-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
|
|
-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
|
|
-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
|
|
-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
|
|
-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
|
|
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
|
|
-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
|
|
-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
|
|
-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
|
|
KVM_LIBS = @KVM_LIBS@
|
|
LD = @LD@
|
|
LDFLAGS = @LDFLAGS@
|
|
@@ -164,6 +176,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
|
|
PACKAGE_NAME = @PACKAGE_NAME@
|
|
PACKAGE_STRING = @PACKAGE_STRING@
|
|
PACKAGE_TARNAME = @PACKAGE_TARNAME@
|
|
+PACKAGE_URL = @PACKAGE_URL@
|
|
PACKAGE_VERSION = @PACKAGE_VERSION@
|
|
PATH_SEPARATOR = @PATH_SEPARATOR@
|
|
PERL = @PERL@
|
|
@@ -245,6 +258,7 @@ sysconfdir = @sysconfdir@
|
|
sysdeps_dir = @sysdeps_dir@
|
|
sysdeps_suid_lib = @sysdeps_suid_lib@
|
|
target_alias = @target_alias@
|
|
+top_build_prefix = @top_build_prefix@
|
|
top_builddir = @top_builddir@
|
|
top_srcdir = @top_srcdir@
|
|
SUBDIRS = common @sysdeps_dir@
|
|
@@ -263,9 +277,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefi
|
|
exit 1;; \
|
|
esac; \
|
|
done; \
|
|
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu sysdeps/Makefile'; \
|
|
- cd $(top_srcdir) && \
|
|
- $(AUTOMAKE) --gnu sysdeps/Makefile
|
|
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu sysdeps/Makefile'; \
|
|
+ $(am__cd) $(top_srcdir) && \
|
|
+ $(AUTOMAKE) --gnu sysdeps/Makefile
|
|
.PRECIOUS: Makefile
|
|
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
|
|
@case '$?' in \
|
|
@@ -283,6 +297,7 @@ $(top_srcdir)/configure: $(am__configur
|
|
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
|
|
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
|
|
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
|
|
+$(am__aclocal_m4_deps):
|
|
|
|
mostlyclean-libtool:
|
|
-rm -f *.lo
|
|
@@ -314,7 +329,7 @@ $(RECURSIVE_TARGETS):
|
|
else \
|
|
local_target="$$target"; \
|
|
fi; \
|
|
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
|
|
+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
|
|
|| eval $$failcom; \
|
|
done; \
|
|
if test "$$dot_seen" = "no"; then \
|
|
@@ -348,16 +363,16 @@ $(RECURSIVE_CLEAN_TARGETS):
|
|
else \
|
|
local_target="$$target"; \
|
|
fi; \
|
|
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
|
|
+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
|
|
|| eval $$failcom; \
|
|
done && test -z "$$fail"
|
|
tags-recursive:
|
|
list='$(SUBDIRS)'; for subdir in $$list; do \
|
|
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
|
|
+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
|
|
done
|
|
ctags-recursive:
|
|
list='$(SUBDIRS)'; for subdir in $$list; do \
|
|
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
|
|
+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
|
|
done
|
|
|
|
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
|
|
@@ -372,7 +387,7 @@ tags: TAGS
|
|
|
|
TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
|
|
$(TAGS_FILES) $(LISP)
|
|
- tags=; \
|
|
+ set x; \
|
|
here=`pwd`; \
|
|
if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
|
|
include_option=--etags-include; \
|
|
@@ -384,7 +399,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE
|
|
list='$(SUBDIRS)'; for subdir in $$list; do \
|
|
if test "$$subdir" = .; then :; else \
|
|
test ! -f $$subdir/TAGS || \
|
|
- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
|
|
+ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
|
|
fi; \
|
|
done; \
|
|
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
|
|
@@ -393,29 +408,34 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE
|
|
done | \
|
|
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
|
|
END { if (nonempty) { for (i in files) print i; }; }'`; \
|
|
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
|
|
+ shift; \
|
|
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
|
|
test -n "$$unique" || unique=$$empty_fix; \
|
|
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
|
|
- $$tags $$unique; \
|
|
+ if test $$# -gt 0; then \
|
|
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
|
|
+ "$$@" $$unique; \
|
|
+ else \
|
|
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
|
|
+ $$unique; \
|
|
+ fi; \
|
|
fi
|
|
ctags: CTAGS
|
|
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
|
|
$(TAGS_FILES) $(LISP)
|
|
- tags=; \
|
|
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
|
|
unique=`for i in $$list; do \
|
|
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
|
|
done | \
|
|
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
|
|
END { if (nonempty) { for (i in files) print i; }; }'`; \
|
|
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
|
|
+ test -z "$(CTAGS_ARGS)$$unique" \
|
|
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
|
|
- $$tags $$unique
|
|
+ $$unique
|
|
|
|
GTAGS:
|
|
here=`$(am__cd) $(top_builddir) && pwd` \
|
|
- && cd $(top_srcdir) \
|
|
- && gtags -i $(GTAGS_ARGS) $$here
|
|
+ && $(am__cd) $(top_srcdir) \
|
|
+ && gtags -i $(GTAGS_ARGS) "$$here"
|
|
|
|
distclean-tags:
|
|
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
|
|
@@ -436,29 +456,44 @@ distdir: $(DISTFILES)
|
|
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
|
|
if test -d $$d/$$file; then \
|
|
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
|
|
+ if test -d "$(distdir)/$$file"; then \
|
|
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
|
|
+ fi; \
|
|
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
|
|
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
|
|
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
|
|
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
|
|
fi; \
|
|
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
|
|
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
|
|
else \
|
|
- test -f $(distdir)/$$file \
|
|
- || cp -p $$d/$$file $(distdir)/$$file \
|
|
+ test -f "$(distdir)/$$file" \
|
|
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|
|
|| exit 1; \
|
|
fi; \
|
|
done
|
|
- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
|
|
+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
|
|
if test "$$subdir" = .; then :; else \
|
|
test -d "$(distdir)/$$subdir" \
|
|
|| $(MKDIR_P) "$(distdir)/$$subdir" \
|
|
|| exit 1; \
|
|
- distdir=`$(am__cd) $(distdir) && pwd`; \
|
|
- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
|
|
- (cd $$subdir && \
|
|
+ fi; \
|
|
+ done
|
|
+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
|
|
+ if test "$$subdir" = .; then :; else \
|
|
+ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
|
|
+ $(am__relativize); \
|
|
+ new_distdir=$$reldir; \
|
|
+ dir1=$$subdir; dir2="$(top_distdir)"; \
|
|
+ $(am__relativize); \
|
|
+ new_top_distdir=$$reldir; \
|
|
+ echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
|
|
+ echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
|
|
+ ($(am__cd) $$subdir && \
|
|
$(MAKE) $(AM_MAKEFLAGS) \
|
|
- top_distdir="$$top_distdir" \
|
|
- distdir="$$distdir/$$subdir" \
|
|
+ top_distdir="$$new_top_distdir" \
|
|
+ distdir="$$new_distdir" \
|
|
am__remove_distdir=: \
|
|
am__skip_length_check=: \
|
|
+ am__skip_mode_fix=: \
|
|
distdir) \
|
|
|| exit 1; \
|
|
fi; \
|
|
@@ -488,6 +523,7 @@ clean-generic:
|
|
|
|
distclean-generic:
|
|
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
|
|
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
|
|
|
|
maintainer-clean-generic:
|
|
@echo "This command is intended for maintainers to use"
|
|
@@ -506,6 +542,8 @@ dvi-am:
|
|
|
|
html: html-recursive
|
|
|
|
+html-am:
|
|
+
|
|
info: info-recursive
|
|
|
|
info-am:
|
|
@@ -514,18 +552,28 @@ install-data-am:
|
|
|
|
install-dvi: install-dvi-recursive
|
|
|
|
+install-dvi-am:
|
|
+
|
|
install-exec-am:
|
|
|
|
install-html: install-html-recursive
|
|
|
|
+install-html-am:
|
|
+
|
|
install-info: install-info-recursive
|
|
|
|
+install-info-am:
|
|
+
|
|
install-man:
|
|
|
|
install-pdf: install-pdf-recursive
|
|
|
|
+install-pdf-am:
|
|
+
|
|
install-ps: install-ps-recursive
|
|
|
|
+install-ps-am:
|
|
+
|
|
installcheck-am:
|
|
|
|
maintainer-clean: maintainer-clean-recursive
|
|
@@ -546,8 +594,8 @@ ps-am:
|
|
|
|
uninstall-am:
|
|
|
|
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
|
|
- install-strip
|
|
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
|
|
+ install-am install-strip tags-recursive
|
|
|
|
.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
|
|
all all-am check check-am clean clean-generic clean-libtool \
|
|
@@ -563,6 +611,7 @@ uninstall-am:
|
|
mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
|
|
uninstall uninstall-am
|
|
|
|
+
|
|
# Tell versions [3.59,3.63) of GNU make to not export all variables.
|
|
# Otherwise a system limit (for SysV at least) may be exceeded.
|
|
.NOEXPORT:
|
|
Index: libgtop-2.28.0/sysdeps/aix/Makefile.in
|
|
===================================================================
|
|
--- libgtop-2.28.0.orig/sysdeps/aix/Makefile.in 2009-11-22 17:53:42.681187519 +0100
|
|
+++ libgtop-2.28.0/sysdeps/aix/Makefile.in 2009-11-22 17:53:10.581683524 +0100
|
|
@@ -1,8 +1,9 @@
|
|
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
|
|
+# Makefile.in generated by automake 1.11 from Makefile.am.
|
|
# @configure_input@
|
|
|
|
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
|
|
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
|
|
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
|
|
+# Inc.
|
|
# This Makefile.in is free software; the Free Software Foundation
|
|
# gives unlimited permission to copy and/or distribute it,
|
|
# with or without modifications, as long as this notice is preserved.
|
|
@@ -17,8 +18,9 @@
|
|
|
|
VPATH = @srcdir@
|
|
pkgdatadir = $(datadir)/@PACKAGE@
|
|
-pkglibdir = $(libdir)/@PACKAGE@
|
|
pkgincludedir = $(includedir)/@PACKAGE@
|
|
+pkglibdir = $(libdir)/@PACKAGE@
|
|
+pkglibexecdir = $(libexecdir)/@PACKAGE@
|
|
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
|
|
install_sh_DATA = $(install_sh) -c -m 644
|
|
install_sh_PROGRAM = $(install_sh) -c
|
|
@@ -44,6 +46,7 @@ am__configure_deps = $(am__aclocal_m4_de
|
|
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
|
|
CONFIG_HEADER = $(top_builddir)/config.h
|
|
CONFIG_CLEAN_FILES =
|
|
+CONFIG_CLEAN_VPATH_FILES =
|
|
LTLIBRARIES = $(noinst_LTLIBRARIES)
|
|
libgtop_sysdeps_2_0_la_LIBADD =
|
|
am_libgtop_sysdeps_2_0_la_OBJECTS = siglist.lo nosuid.lo mem.lo \
|
|
@@ -71,6 +74,7 @@ libgtop_sysdeps_suid_2_0_la_LINK = $(LIB
|
|
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
|
|
depcomp = $(SHELL) $(top_srcdir)/depcomp
|
|
am__depfiles_maybe = depfiles
|
|
+am__mv = mv -f
|
|
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
|
|
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
|
|
LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
|
|
@@ -89,9 +93,23 @@ am__vpath_adj = case $$p in \
|
|
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
|
|
*) f=$$p;; \
|
|
esac;
|
|
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
|
|
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
|
|
+am__install_max = 40
|
|
+am__nobase_strip_setup = \
|
|
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
|
|
+am__nobase_strip = \
|
|
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
|
|
+am__nobase_list = $(am__nobase_strip_setup); \
|
|
+ for p in $$list; do echo "$$p $$p"; done | \
|
|
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
|
|
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
|
|
+ if (++n[$$2] == $(am__install_max)) \
|
|
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
|
|
+ END { for (dir in files) print dir, files[dir] }'
|
|
+am__base_list = \
|
|
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
|
|
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
|
|
am__installdirs = "$(DESTDIR)$(libgtopincludedir)"
|
|
-libgtopincludeHEADERS_INSTALL = $(INSTALL_HEADER)
|
|
HEADERS = $(libgtopinclude_HEADERS)
|
|
ETAGS = etags
|
|
CTAGS = ctags
|
|
@@ -144,29 +162,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
|
|
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
|
|
INSTOBJEXT = @INSTOBJEXT@
|
|
INTLLIBS = @INTLLIBS@
|
|
-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
|
|
-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
|
|
-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
|
|
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
|
|
-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
|
|
-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
|
|
INTLTOOL_MERGE = @INTLTOOL_MERGE@
|
|
-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@
|
|
-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
|
|
-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
|
|
-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
|
|
-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
|
|
-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
|
|
-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
|
|
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
|
|
-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
|
|
-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
|
|
-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
|
|
KVM_LIBS = @KVM_LIBS@
|
|
LD = @LD@
|
|
LDFLAGS = @LDFLAGS@
|
|
@@ -205,6 +204,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
|
|
PACKAGE_NAME = @PACKAGE_NAME@
|
|
PACKAGE_STRING = @PACKAGE_STRING@
|
|
PACKAGE_TARNAME = @PACKAGE_TARNAME@
|
|
+PACKAGE_URL = @PACKAGE_URL@
|
|
PACKAGE_VERSION = @PACKAGE_VERSION@
|
|
PATH_SEPARATOR = @PATH_SEPARATOR@
|
|
PERL = @PERL@
|
|
@@ -286,6 +286,7 @@ sysconfdir = @sysconfdir@
|
|
sysdeps_dir = @sysdeps_dir@
|
|
sysdeps_suid_lib = @sysdeps_suid_lib@
|
|
target_alias = @target_alias@
|
|
+top_build_prefix = @top_build_prefix@
|
|
top_builddir = @top_builddir@
|
|
top_srcdir = @top_srcdir@
|
|
noinst_LTLIBRARIES = libgtop_sysdeps-2.0.la libgtop_sysdeps_suid-2.0.la
|
|
@@ -317,9 +318,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefi
|
|
exit 1;; \
|
|
esac; \
|
|
done; \
|
|
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu sysdeps/aix/Makefile'; \
|
|
- cd $(top_srcdir) && \
|
|
- $(AUTOMAKE) --gnu sysdeps/aix/Makefile
|
|
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu sysdeps/aix/Makefile'; \
|
|
+ $(am__cd) $(top_srcdir) && \
|
|
+ $(AUTOMAKE) --gnu sysdeps/aix/Makefile
|
|
.PRECIOUS: Makefile
|
|
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
|
|
@case '$?' in \
|
|
@@ -337,6 +338,7 @@ $(top_srcdir)/configure: $(am__configur
|
|
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
|
|
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
|
|
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
|
|
+$(am__aclocal_m4_deps):
|
|
|
|
clean-noinstLTLIBRARIES:
|
|
-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
|
|
@@ -387,21 +389,21 @@ distclean-compile:
|
|
|
|
.c.o:
|
|
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
|
|
-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
|
|
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
|
|
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
|
|
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
|
@am__fastdepCC_FALSE@ $(COMPILE) -c $<
|
|
|
|
.c.obj:
|
|
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
|
|
-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
|
|
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
|
|
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
|
|
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
|
@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
|
|
|
|
.c.lo:
|
|
@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
|
|
-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
|
|
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
|
|
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
|
|
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
|
@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
|
|
@@ -414,20 +416,23 @@ clean-libtool:
|
|
install-libgtopincludeHEADERS: $(libgtopinclude_HEADERS)
|
|
@$(NORMAL_INSTALL)
|
|
test -z "$(libgtopincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libgtopincludedir)"
|
|
- @list='$(libgtopinclude_HEADERS)'; for p in $$list; do \
|
|
+ @list='$(libgtopinclude_HEADERS)'; test -n "$(libgtopincludedir)" || list=; \
|
|
+ for p in $$list; do \
|
|
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
|
|
- f=$(am__strip_dir) \
|
|
- echo " $(libgtopincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(libgtopincludedir)/$$f'"; \
|
|
- $(libgtopincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(libgtopincludedir)/$$f"; \
|
|
+ echo "$$d$$p"; \
|
|
+ done | $(am__base_list) | \
|
|
+ while read files; do \
|
|
+ echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(libgtopincludedir)'"; \
|
|
+ $(INSTALL_HEADER) $$files "$(DESTDIR)$(libgtopincludedir)" || exit $$?; \
|
|
done
|
|
|
|
uninstall-libgtopincludeHEADERS:
|
|
@$(NORMAL_UNINSTALL)
|
|
- @list='$(libgtopinclude_HEADERS)'; for p in $$list; do \
|
|
- f=$(am__strip_dir) \
|
|
- echo " rm -f '$(DESTDIR)$(libgtopincludedir)/$$f'"; \
|
|
- rm -f "$(DESTDIR)$(libgtopincludedir)/$$f"; \
|
|
- done
|
|
+ @list='$(libgtopinclude_HEADERS)'; test -n "$(libgtopincludedir)" || list=; \
|
|
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
|
|
+ test -n "$$files" || exit 0; \
|
|
+ echo " ( cd '$(DESTDIR)$(libgtopincludedir)' && rm -f" $$files ")"; \
|
|
+ cd "$(DESTDIR)$(libgtopincludedir)" && rm -f $$files
|
|
|
|
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
|
|
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
|
|
@@ -441,7 +446,7 @@ tags: TAGS
|
|
|
|
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
|
|
$(TAGS_FILES) $(LISP)
|
|
- tags=; \
|
|
+ set x; \
|
|
here=`pwd`; \
|
|
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
|
|
unique=`for i in $$list; do \
|
|
@@ -449,29 +454,34 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP
|
|
done | \
|
|
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
|
|
END { if (nonempty) { for (i in files) print i; }; }'`; \
|
|
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
|
|
+ shift; \
|
|
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
|
|
test -n "$$unique" || unique=$$empty_fix; \
|
|
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
|
|
- $$tags $$unique; \
|
|
+ if test $$# -gt 0; then \
|
|
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
|
|
+ "$$@" $$unique; \
|
|
+ else \
|
|
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
|
|
+ $$unique; \
|
|
+ fi; \
|
|
fi
|
|
ctags: CTAGS
|
|
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
|
|
$(TAGS_FILES) $(LISP)
|
|
- tags=; \
|
|
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
|
|
unique=`for i in $$list; do \
|
|
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
|
|
done | \
|
|
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
|
|
END { if (nonempty) { for (i in files) print i; }; }'`; \
|
|
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
|
|
+ test -z "$(CTAGS_ARGS)$$unique" \
|
|
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
|
|
- $$tags $$unique
|
|
+ $$unique
|
|
|
|
GTAGS:
|
|
here=`$(am__cd) $(top_builddir) && pwd` \
|
|
- && cd $(top_srcdir) \
|
|
- && gtags -i $(GTAGS_ARGS) $$here
|
|
+ && $(am__cd) $(top_srcdir) \
|
|
+ && gtags -i $(GTAGS_ARGS) "$$here"
|
|
|
|
distclean-tags:
|
|
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
|
|
@@ -492,13 +502,17 @@ distdir: $(DISTFILES)
|
|
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
|
|
if test -d $$d/$$file; then \
|
|
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
|
|
+ if test -d "$(distdir)/$$file"; then \
|
|
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
|
|
+ fi; \
|
|
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
|
|
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
|
|
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
|
|
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
|
|
fi; \
|
|
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
|
|
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
|
|
else \
|
|
- test -f $(distdir)/$$file \
|
|
- || cp -p $$d/$$file $(distdir)/$$file \
|
|
+ test -f "$(distdir)/$$file" \
|
|
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|
|
|| exit 1; \
|
|
fi; \
|
|
done
|
|
@@ -529,6 +543,7 @@ clean-generic:
|
|
|
|
distclean-generic:
|
|
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
|
|
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
|
|
|
|
maintainer-clean-generic:
|
|
@echo "This command is intended for maintainers to use"
|
|
@@ -550,6 +565,8 @@ dvi-am:
|
|
|
|
html: html-am
|
|
|
|
+html-am:
|
|
+
|
|
info: info-am
|
|
|
|
info-am:
|
|
@@ -558,18 +575,28 @@ install-data-am: install-libgtopincludeH
|
|
|
|
install-dvi: install-dvi-am
|
|
|
|
+install-dvi-am:
|
|
+
|
|
install-exec-am:
|
|
|
|
install-html: install-html-am
|
|
|
|
+install-html-am:
|
|
+
|
|
install-info: install-info-am
|
|
|
|
+install-info-am:
|
|
+
|
|
install-man:
|
|
|
|
install-pdf: install-pdf-am
|
|
|
|
+install-pdf-am:
|
|
+
|
|
install-ps: install-ps-am
|
|
|
|
+install-ps-am:
|
|
+
|
|
installcheck-am:
|
|
|
|
maintainer-clean: maintainer-clean-am
|
|
@@ -608,6 +635,7 @@ uninstall-am: uninstall-libgtopincludeHE
|
|
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
|
|
tags uninstall uninstall-am uninstall-libgtopincludeHEADERS
|
|
|
|
+
|
|
# Tell versions [3.59,3.63) of GNU make to not export all variables.
|
|
# Otherwise a system limit (for SysV at least) may be exceeded.
|
|
.NOEXPORT:
|
|
Index: libgtop-2.28.0/sysdeps/bsd/Makefile.in
|
|
===================================================================
|
|
--- libgtop-2.28.0.orig/sysdeps/bsd/Makefile.in 2009-11-22 17:53:42.877186999 +0100
|
|
+++ libgtop-2.28.0/sysdeps/bsd/Makefile.in 2009-11-22 17:53:10.705683859 +0100
|
|
@@ -1,8 +1,9 @@
|
|
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
|
|
+# Makefile.in generated by automake 1.11 from Makefile.am.
|
|
# @configure_input@
|
|
|
|
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
|
|
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
|
|
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
|
|
+# Inc.
|
|
# This Makefile.in is free software; the Free Software Foundation
|
|
# gives unlimited permission to copy and/or distribute it,
|
|
# with or without modifications, as long as this notice is preserved.
|
|
@@ -17,8 +18,9 @@
|
|
|
|
VPATH = @srcdir@
|
|
pkgdatadir = $(datadir)/@PACKAGE@
|
|
-pkglibdir = $(libdir)/@PACKAGE@
|
|
pkgincludedir = $(includedir)/@PACKAGE@
|
|
+pkglibdir = $(libdir)/@PACKAGE@
|
|
+pkglibexecdir = $(libexecdir)/@PACKAGE@
|
|
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
|
|
install_sh_DATA = $(install_sh) -c -m 644
|
|
install_sh_PROGRAM = $(install_sh) -c
|
|
@@ -44,6 +46,7 @@ am__configure_deps = $(am__aclocal_m4_de
|
|
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
|
|
CONFIG_HEADER = $(top_builddir)/config.h
|
|
CONFIG_CLEAN_FILES =
|
|
+CONFIG_CLEAN_VPATH_FILES =
|
|
LTLIBRARIES = $(noinst_LTLIBRARIES)
|
|
libgtop_sysdeps_2_0_la_LIBADD =
|
|
am_libgtop_sysdeps_2_0_la_OBJECTS = nosuid.lo siglist.lo sysinfo.lo
|
|
@@ -68,6 +71,7 @@ libgtop_sysdeps_suid_2_0_la_LINK = $(LIB
|
|
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
|
|
depcomp = $(SHELL) $(top_srcdir)/depcomp
|
|
am__depfiles_maybe = depfiles
|
|
+am__mv = mv -f
|
|
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
|
|
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
|
|
LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
|
|
@@ -86,9 +90,23 @@ am__vpath_adj = case $$p in \
|
|
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
|
|
*) f=$$p;; \
|
|
esac;
|
|
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
|
|
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
|
|
+am__install_max = 40
|
|
+am__nobase_strip_setup = \
|
|
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
|
|
+am__nobase_strip = \
|
|
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
|
|
+am__nobase_list = $(am__nobase_strip_setup); \
|
|
+ for p in $$list; do echo "$$p $$p"; done | \
|
|
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
|
|
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
|
|
+ if (++n[$$2] == $(am__install_max)) \
|
|
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
|
|
+ END { for (dir in files) print dir, files[dir] }'
|
|
+am__base_list = \
|
|
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
|
|
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
|
|
am__installdirs = "$(DESTDIR)$(libgtopincludedir)"
|
|
-libgtopincludeHEADERS_INSTALL = $(INSTALL_HEADER)
|
|
HEADERS = $(libgtopinclude_HEADERS)
|
|
ETAGS = etags
|
|
CTAGS = ctags
|
|
@@ -141,29 +159,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
|
|
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
|
|
INSTOBJEXT = @INSTOBJEXT@
|
|
INTLLIBS = @INTLLIBS@
|
|
-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
|
|
-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
|
|
-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
|
|
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
|
|
-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
|
|
-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
|
|
INTLTOOL_MERGE = @INTLTOOL_MERGE@
|
|
-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@
|
|
-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
|
|
-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
|
|
-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
|
|
-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
|
|
-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
|
|
-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
|
|
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
|
|
-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
|
|
-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
|
|
-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
|
|
KVM_LIBS = @KVM_LIBS@
|
|
LD = @LD@
|
|
LDFLAGS = @LDFLAGS@
|
|
@@ -202,6 +201,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
|
|
PACKAGE_NAME = @PACKAGE_NAME@
|
|
PACKAGE_STRING = @PACKAGE_STRING@
|
|
PACKAGE_TARNAME = @PACKAGE_TARNAME@
|
|
+PACKAGE_URL = @PACKAGE_URL@
|
|
PACKAGE_VERSION = @PACKAGE_VERSION@
|
|
PATH_SEPARATOR = @PATH_SEPARATOR@
|
|
PERL = @PERL@
|
|
@@ -283,6 +283,7 @@ sysconfdir = @sysconfdir@
|
|
sysdeps_dir = @sysdeps_dir@
|
|
sysdeps_suid_lib = @sysdeps_suid_lib@
|
|
target_alias = @target_alias@
|
|
+top_build_prefix = @top_build_prefix@
|
|
top_builddir = @top_builddir@
|
|
top_srcdir = @top_srcdir@
|
|
noinst_LTLIBRARIES = libgtop_sysdeps-2.0.la libgtop_sysdeps_suid-2.0.la
|
|
@@ -314,9 +315,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefi
|
|
exit 1;; \
|
|
esac; \
|
|
done; \
|
|
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu sysdeps/bsd/Makefile'; \
|
|
- cd $(top_srcdir) && \
|
|
- $(AUTOMAKE) --gnu sysdeps/bsd/Makefile
|
|
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu sysdeps/bsd/Makefile'; \
|
|
+ $(am__cd) $(top_srcdir) && \
|
|
+ $(AUTOMAKE) --gnu sysdeps/bsd/Makefile
|
|
.PRECIOUS: Makefile
|
|
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
|
|
@case '$?' in \
|
|
@@ -334,6 +335,7 @@ $(top_srcdir)/configure: $(am__configur
|
|
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
|
|
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
|
|
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
|
|
+$(am__aclocal_m4_deps):
|
|
|
|
clean-noinstLTLIBRARIES:
|
|
-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
|
|
@@ -385,21 +387,21 @@ distclean-compile:
|
|
|
|
.c.o:
|
|
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
|
|
-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
|
|
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
|
|
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
|
|
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
|
@am__fastdepCC_FALSE@ $(COMPILE) -c $<
|
|
|
|
.c.obj:
|
|
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
|
|
-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
|
|
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
|
|
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
|
|
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
|
@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
|
|
|
|
.c.lo:
|
|
@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
|
|
-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
|
|
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
|
|
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
|
|
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
|
@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
|
|
@@ -412,20 +414,23 @@ clean-libtool:
|
|
install-libgtopincludeHEADERS: $(libgtopinclude_HEADERS)
|
|
@$(NORMAL_INSTALL)
|
|
test -z "$(libgtopincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libgtopincludedir)"
|
|
- @list='$(libgtopinclude_HEADERS)'; for p in $$list; do \
|
|
+ @list='$(libgtopinclude_HEADERS)'; test -n "$(libgtopincludedir)" || list=; \
|
|
+ for p in $$list; do \
|
|
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
|
|
- f=$(am__strip_dir) \
|
|
- echo " $(libgtopincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(libgtopincludedir)/$$f'"; \
|
|
- $(libgtopincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(libgtopincludedir)/$$f"; \
|
|
+ echo "$$d$$p"; \
|
|
+ done | $(am__base_list) | \
|
|
+ while read files; do \
|
|
+ echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(libgtopincludedir)'"; \
|
|
+ $(INSTALL_HEADER) $$files "$(DESTDIR)$(libgtopincludedir)" || exit $$?; \
|
|
done
|
|
|
|
uninstall-libgtopincludeHEADERS:
|
|
@$(NORMAL_UNINSTALL)
|
|
- @list='$(libgtopinclude_HEADERS)'; for p in $$list; do \
|
|
- f=$(am__strip_dir) \
|
|
- echo " rm -f '$(DESTDIR)$(libgtopincludedir)/$$f'"; \
|
|
- rm -f "$(DESTDIR)$(libgtopincludedir)/$$f"; \
|
|
- done
|
|
+ @list='$(libgtopinclude_HEADERS)'; test -n "$(libgtopincludedir)" || list=; \
|
|
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
|
|
+ test -n "$$files" || exit 0; \
|
|
+ echo " ( cd '$(DESTDIR)$(libgtopincludedir)' && rm -f" $$files ")"; \
|
|
+ cd "$(DESTDIR)$(libgtopincludedir)" && rm -f $$files
|
|
|
|
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
|
|
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
|
|
@@ -439,7 +444,7 @@ tags: TAGS
|
|
|
|
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
|
|
$(TAGS_FILES) $(LISP)
|
|
- tags=; \
|
|
+ set x; \
|
|
here=`pwd`; \
|
|
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
|
|
unique=`for i in $$list; do \
|
|
@@ -447,29 +452,34 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP
|
|
done | \
|
|
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
|
|
END { if (nonempty) { for (i in files) print i; }; }'`; \
|
|
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
|
|
+ shift; \
|
|
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
|
|
test -n "$$unique" || unique=$$empty_fix; \
|
|
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
|
|
- $$tags $$unique; \
|
|
+ if test $$# -gt 0; then \
|
|
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
|
|
+ "$$@" $$unique; \
|
|
+ else \
|
|
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
|
|
+ $$unique; \
|
|
+ fi; \
|
|
fi
|
|
ctags: CTAGS
|
|
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
|
|
$(TAGS_FILES) $(LISP)
|
|
- tags=; \
|
|
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
|
|
unique=`for i in $$list; do \
|
|
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
|
|
done | \
|
|
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
|
|
END { if (nonempty) { for (i in files) print i; }; }'`; \
|
|
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
|
|
+ test -z "$(CTAGS_ARGS)$$unique" \
|
|
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
|
|
- $$tags $$unique
|
|
+ $$unique
|
|
|
|
GTAGS:
|
|
here=`$(am__cd) $(top_builddir) && pwd` \
|
|
- && cd $(top_srcdir) \
|
|
- && gtags -i $(GTAGS_ARGS) $$here
|
|
+ && $(am__cd) $(top_srcdir) \
|
|
+ && gtags -i $(GTAGS_ARGS) "$$here"
|
|
|
|
distclean-tags:
|
|
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
|
|
@@ -490,13 +500,17 @@ distdir: $(DISTFILES)
|
|
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
|
|
if test -d $$d/$$file; then \
|
|
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
|
|
+ if test -d "$(distdir)/$$file"; then \
|
|
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
|
|
+ fi; \
|
|
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
|
|
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
|
|
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
|
|
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
|
|
fi; \
|
|
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
|
|
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
|
|
else \
|
|
- test -f $(distdir)/$$file \
|
|
- || cp -p $$d/$$file $(distdir)/$$file \
|
|
+ test -f "$(distdir)/$$file" \
|
|
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|
|
|| exit 1; \
|
|
fi; \
|
|
done
|
|
@@ -527,6 +541,7 @@ clean-generic:
|
|
|
|
distclean-generic:
|
|
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
|
|
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
|
|
|
|
maintainer-clean-generic:
|
|
@echo "This command is intended for maintainers to use"
|
|
@@ -548,6 +563,8 @@ dvi-am:
|
|
|
|
html: html-am
|
|
|
|
+html-am:
|
|
+
|
|
info: info-am
|
|
|
|
info-am:
|
|
@@ -556,18 +573,28 @@ install-data-am: install-libgtopincludeH
|
|
|
|
install-dvi: install-dvi-am
|
|
|
|
+install-dvi-am:
|
|
+
|
|
install-exec-am:
|
|
|
|
install-html: install-html-am
|
|
|
|
+install-html-am:
|
|
+
|
|
install-info: install-info-am
|
|
|
|
+install-info-am:
|
|
+
|
|
install-man:
|
|
|
|
install-pdf: install-pdf-am
|
|
|
|
+install-pdf-am:
|
|
+
|
|
install-ps: install-ps-am
|
|
|
|
+install-ps-am:
|
|
+
|
|
installcheck-am:
|
|
|
|
maintainer-clean: maintainer-clean-am
|
|
@@ -606,6 +633,7 @@ uninstall-am: uninstall-libgtopincludeHE
|
|
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
|
|
tags uninstall uninstall-am uninstall-libgtopincludeHEADERS
|
|
|
|
+
|
|
# Tell versions [3.59,3.63) of GNU make to not export all variables.
|
|
# Otherwise a system limit (for SysV at least) may be exceeded.
|
|
.NOEXPORT:
|
|
Index: libgtop-2.28.0/sysdeps/common/Makefile.in
|
|
===================================================================
|
|
--- libgtop-2.28.0.orig/sysdeps/common/Makefile.in 2009-11-22 17:53:42.025189959 +0100
|
|
+++ libgtop-2.28.0/sysdeps/common/Makefile.in 2009-11-22 17:53:10.813683823 +0100
|
|
@@ -1,8 +1,9 @@
|
|
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
|
|
+# Makefile.in generated by automake 1.11 from Makefile.am.
|
|
# @configure_input@
|
|
|
|
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
|
|
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
|
|
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
|
|
+# Inc.
|
|
# This Makefile.in is free software; the Free Software Foundation
|
|
# gives unlimited permission to copy and/or distribute it,
|
|
# with or without modifications, as long as this notice is preserved.
|
|
@@ -16,8 +17,9 @@
|
|
|
|
VPATH = @srcdir@
|
|
pkgdatadir = $(datadir)/@PACKAGE@
|
|
-pkglibdir = $(libdir)/@PACKAGE@
|
|
pkgincludedir = $(includedir)/@PACKAGE@
|
|
+pkglibdir = $(libdir)/@PACKAGE@
|
|
+pkglibexecdir = $(libexecdir)/@PACKAGE@
|
|
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
|
|
install_sh_DATA = $(install_sh) -c -m 644
|
|
install_sh_PROGRAM = $(install_sh) -c
|
|
@@ -42,6 +44,7 @@ am__configure_deps = $(am__aclocal_m4_de
|
|
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
|
|
CONFIG_HEADER = $(top_builddir)/config.h
|
|
CONFIG_CLEAN_FILES =
|
|
+CONFIG_CLEAN_VPATH_FILES =
|
|
LTLIBRARIES = $(noinst_LTLIBRARIES)
|
|
am__DEPENDENCIES_1 =
|
|
libgtop_common_2_0_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
|
|
@@ -59,6 +62,7 @@ libgtop_suid_common_2_0_la_OBJECTS = \
|
|
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
|
|
depcomp = $(SHELL) $(top_srcdir)/depcomp
|
|
am__depfiles_maybe = depfiles
|
|
+am__mv = mv -f
|
|
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
|
|
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
|
|
LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
|
|
@@ -123,29 +127,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
|
|
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
|
|
INSTOBJEXT = @INSTOBJEXT@
|
|
INTLLIBS = @INTLLIBS@
|
|
-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
|
|
-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
|
|
-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
|
|
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
|
|
-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
|
|
-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
|
|
INTLTOOL_MERGE = @INTLTOOL_MERGE@
|
|
-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@
|
|
-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
|
|
-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
|
|
-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
|
|
-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
|
|
-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
|
|
-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
|
|
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
|
|
-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
|
|
-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
|
|
-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
|
|
KVM_LIBS = @KVM_LIBS@
|
|
LD = @LD@
|
|
LDFLAGS = @LDFLAGS@
|
|
@@ -184,6 +169,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
|
|
PACKAGE_NAME = @PACKAGE_NAME@
|
|
PACKAGE_STRING = @PACKAGE_STRING@
|
|
PACKAGE_TARNAME = @PACKAGE_TARNAME@
|
|
+PACKAGE_URL = @PACKAGE_URL@
|
|
PACKAGE_VERSION = @PACKAGE_VERSION@
|
|
PATH_SEPARATOR = @PATH_SEPARATOR@
|
|
PERL = @PERL@
|
|
@@ -265,6 +251,7 @@ sysconfdir = @sysconfdir@
|
|
sysdeps_dir = @sysdeps_dir@
|
|
sysdeps_suid_lib = @sysdeps_suid_lib@
|
|
target_alias = @target_alias@
|
|
+top_build_prefix = @top_build_prefix@
|
|
top_builddir = @top_builddir@
|
|
top_srcdir = @top_srcdir@
|
|
noinst_LTLIBRARIES = libgtop_common-2.0.la libgtop_suid_common-2.0.la
|
|
@@ -292,9 +279,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefi
|
|
exit 1;; \
|
|
esac; \
|
|
done; \
|
|
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu sysdeps/common/Makefile'; \
|
|
- cd $(top_srcdir) && \
|
|
- $(AUTOMAKE) --gnu sysdeps/common/Makefile
|
|
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu sysdeps/common/Makefile'; \
|
|
+ $(am__cd) $(top_srcdir) && \
|
|
+ $(AUTOMAKE) --gnu sysdeps/common/Makefile
|
|
.PRECIOUS: Makefile
|
|
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
|
|
@case '$?' in \
|
|
@@ -312,6 +299,7 @@ $(top_srcdir)/configure: $(am__configur
|
|
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
|
|
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
|
|
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
|
|
+$(am__aclocal_m4_deps):
|
|
|
|
clean-noinstLTLIBRARIES:
|
|
-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
|
|
@@ -342,21 +330,21 @@ distclean-compile:
|
|
|
|
.c.o:
|
|
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
|
|
-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
|
|
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
|
|
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
|
|
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
|
@am__fastdepCC_FALSE@ $(COMPILE) -c $<
|
|
|
|
.c.obj:
|
|
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
|
|
-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
|
|
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
|
|
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
|
|
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
|
@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
|
|
|
|
.c.lo:
|
|
@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
|
|
-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
|
|
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
|
|
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
|
|
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
|
@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
|
|
@@ -379,7 +367,7 @@ tags: TAGS
|
|
|
|
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
|
|
$(TAGS_FILES) $(LISP)
|
|
- tags=; \
|
|
+ set x; \
|
|
here=`pwd`; \
|
|
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
|
|
unique=`for i in $$list; do \
|
|
@@ -387,29 +375,34 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP
|
|
done | \
|
|
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
|
|
END { if (nonempty) { for (i in files) print i; }; }'`; \
|
|
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
|
|
+ shift; \
|
|
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
|
|
test -n "$$unique" || unique=$$empty_fix; \
|
|
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
|
|
- $$tags $$unique; \
|
|
+ if test $$# -gt 0; then \
|
|
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
|
|
+ "$$@" $$unique; \
|
|
+ else \
|
|
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
|
|
+ $$unique; \
|
|
+ fi; \
|
|
fi
|
|
ctags: CTAGS
|
|
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
|
|
$(TAGS_FILES) $(LISP)
|
|
- tags=; \
|
|
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
|
|
unique=`for i in $$list; do \
|
|
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
|
|
done | \
|
|
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
|
|
END { if (nonempty) { for (i in files) print i; }; }'`; \
|
|
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
|
|
+ test -z "$(CTAGS_ARGS)$$unique" \
|
|
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
|
|
- $$tags $$unique
|
|
+ $$unique
|
|
|
|
GTAGS:
|
|
here=`$(am__cd) $(top_builddir) && pwd` \
|
|
- && cd $(top_srcdir) \
|
|
- && gtags -i $(GTAGS_ARGS) $$here
|
|
+ && $(am__cd) $(top_srcdir) \
|
|
+ && gtags -i $(GTAGS_ARGS) "$$here"
|
|
|
|
distclean-tags:
|
|
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
|
|
@@ -430,13 +423,17 @@ distdir: $(DISTFILES)
|
|
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
|
|
if test -d $$d/$$file; then \
|
|
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
|
|
+ if test -d "$(distdir)/$$file"; then \
|
|
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
|
|
+ fi; \
|
|
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
|
|
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
|
|
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
|
|
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
|
|
fi; \
|
|
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
|
|
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
|
|
else \
|
|
- test -f $(distdir)/$$file \
|
|
- || cp -p $$d/$$file $(distdir)/$$file \
|
|
+ test -f "$(distdir)/$$file" \
|
|
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|
|
|| exit 1; \
|
|
fi; \
|
|
done
|
|
@@ -464,6 +461,7 @@ clean-generic:
|
|
|
|
distclean-generic:
|
|
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
|
|
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
|
|
|
|
maintainer-clean-generic:
|
|
@echo "This command is intended for maintainers to use"
|
|
@@ -485,6 +483,8 @@ dvi-am:
|
|
|
|
html: html-am
|
|
|
|
+html-am:
|
|
+
|
|
info: info-am
|
|
|
|
info-am:
|
|
@@ -493,18 +493,28 @@ install-data-am:
|
|
|
|
install-dvi: install-dvi-am
|
|
|
|
+install-dvi-am:
|
|
+
|
|
install-exec-am:
|
|
|
|
install-html: install-html-am
|
|
|
|
+install-html-am:
|
|
+
|
|
install-info: install-info-am
|
|
|
|
+install-info-am:
|
|
+
|
|
install-man:
|
|
|
|
install-pdf: install-pdf-am
|
|
|
|
+install-pdf-am:
|
|
+
|
|
install-ps: install-ps-am
|
|
|
|
+install-ps-am:
|
|
+
|
|
installcheck-am:
|
|
|
|
maintainer-clean: maintainer-clean-am
|
|
@@ -544,6 +554,7 @@ uninstall-am:
|
|
|
|
|
|
# libgtop_suid_common_2_0_la_LDFLAGS = $(LT_VERSION_INFO)
|
|
+
|
|
# Tell versions [3.59,3.63) of GNU make to not export all variables.
|
|
# Otherwise a system limit (for SysV at least) may be exceeded.
|
|
.NOEXPORT:
|
|
Index: libgtop-2.28.0/sysdeps/cygwin/Makefile.in
|
|
===================================================================
|
|
--- libgtop-2.28.0.orig/sysdeps/cygwin/Makefile.in 2009-11-22 17:53:43.625184658 +0100
|
|
+++ libgtop-2.28.0/sysdeps/cygwin/Makefile.in 2009-11-22 17:53:10.929683962 +0100
|
|
@@ -1,8 +1,9 @@
|
|
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
|
|
+# Makefile.in generated by automake 1.11 from Makefile.am.
|
|
# @configure_input@
|
|
|
|
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
|
|
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
|
|
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
|
|
+# Inc.
|
|
# This Makefile.in is free software; the Free Software Foundation
|
|
# gives unlimited permission to copy and/or distribute it,
|
|
# with or without modifications, as long as this notice is preserved.
|
|
@@ -17,8 +18,9 @@
|
|
|
|
VPATH = @srcdir@
|
|
pkgdatadir = $(datadir)/@PACKAGE@
|
|
-pkglibdir = $(libdir)/@PACKAGE@
|
|
pkgincludedir = $(includedir)/@PACKAGE@
|
|
+pkglibdir = $(libdir)/@PACKAGE@
|
|
+pkglibexecdir = $(libexecdir)/@PACKAGE@
|
|
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
|
|
install_sh_DATA = $(install_sh) -c -m 644
|
|
install_sh_PROGRAM = $(install_sh) -c
|
|
@@ -44,6 +46,7 @@ am__configure_deps = $(am__aclocal_m4_de
|
|
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
|
|
CONFIG_HEADER = $(top_builddir)/config.h
|
|
CONFIG_CLEAN_FILES =
|
|
+CONFIG_CLEAN_VPATH_FILES =
|
|
LTLIBRARIES = $(noinst_LTLIBRARIES)
|
|
libgtop_sysdeps_2_0_la_DEPENDENCIES =
|
|
am_libgtop_sysdeps_2_0_la_OBJECTS = open.lo close.lo cpu.lo mem.lo \
|
|
@@ -57,6 +60,7 @@ libgtop_sysdeps_2_0_la_OBJECTS = $(am_li
|
|
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
|
|
depcomp = $(SHELL) $(top_srcdir)/depcomp
|
|
am__depfiles_maybe = depfiles
|
|
+am__mv = mv -f
|
|
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
|
|
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
|
|
LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
|
|
@@ -73,9 +77,23 @@ am__vpath_adj = case $$p in \
|
|
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
|
|
*) f=$$p;; \
|
|
esac;
|
|
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
|
|
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
|
|
+am__install_max = 40
|
|
+am__nobase_strip_setup = \
|
|
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
|
|
+am__nobase_strip = \
|
|
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
|
|
+am__nobase_list = $(am__nobase_strip_setup); \
|
|
+ for p in $$list; do echo "$$p $$p"; done | \
|
|
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
|
|
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
|
|
+ if (++n[$$2] == $(am__install_max)) \
|
|
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
|
|
+ END { for (dir in files) print dir, files[dir] }'
|
|
+am__base_list = \
|
|
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
|
|
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
|
|
am__installdirs = "$(DESTDIR)$(libgtopincludedir)"
|
|
-libgtopincludeHEADERS_INSTALL = $(INSTALL_HEADER)
|
|
HEADERS = $(libgtopinclude_HEADERS) $(noinst_HEADERS)
|
|
ETAGS = etags
|
|
CTAGS = ctags
|
|
@@ -128,29 +146,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
|
|
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
|
|
INSTOBJEXT = @INSTOBJEXT@
|
|
INTLLIBS = @INTLLIBS@
|
|
-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
|
|
-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
|
|
-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
|
|
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
|
|
-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
|
|
-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
|
|
INTLTOOL_MERGE = @INTLTOOL_MERGE@
|
|
-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@
|
|
-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
|
|
-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
|
|
-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
|
|
-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
|
|
-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
|
|
-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
|
|
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
|
|
-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
|
|
-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
|
|
-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
|
|
KVM_LIBS = @KVM_LIBS@
|
|
LD = @LD@
|
|
LDFLAGS = @LDFLAGS@
|
|
@@ -189,6 +188,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
|
|
PACKAGE_NAME = @PACKAGE_NAME@
|
|
PACKAGE_STRING = @PACKAGE_STRING@
|
|
PACKAGE_TARNAME = @PACKAGE_TARNAME@
|
|
+PACKAGE_URL = @PACKAGE_URL@
|
|
PACKAGE_VERSION = @PACKAGE_VERSION@
|
|
PATH_SEPARATOR = @PATH_SEPARATOR@
|
|
PERL = @PERL@
|
|
@@ -270,6 +270,7 @@ sysconfdir = @sysconfdir@
|
|
sysdeps_dir = @sysdeps_dir@
|
|
sysdeps_suid_lib = @sysdeps_suid_lib@
|
|
target_alias = @target_alias@
|
|
+top_build_prefix = @top_build_prefix@
|
|
top_builddir = @top_builddir@
|
|
top_srcdir = @top_srcdir@
|
|
noinst_LTLIBRARIES = libgtop_sysdeps-2.0.la
|
|
@@ -298,9 +299,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefi
|
|
exit 1;; \
|
|
esac; \
|
|
done; \
|
|
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu sysdeps/cygwin/Makefile'; \
|
|
- cd $(top_srcdir) && \
|
|
- $(AUTOMAKE) --gnu sysdeps/cygwin/Makefile
|
|
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu sysdeps/cygwin/Makefile'; \
|
|
+ $(am__cd) $(top_srcdir) && \
|
|
+ $(AUTOMAKE) --gnu sysdeps/cygwin/Makefile
|
|
.PRECIOUS: Makefile
|
|
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
|
|
@case '$?' in \
|
|
@@ -318,6 +319,7 @@ $(top_srcdir)/configure: $(am__configur
|
|
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
|
|
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
|
|
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
|
|
+$(am__aclocal_m4_deps):
|
|
|
|
clean-noinstLTLIBRARIES:
|
|
-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
|
|
@@ -368,21 +370,21 @@ distclean-compile:
|
|
|
|
.c.o:
|
|
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
|
|
-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
|
|
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
|
|
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
|
|
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
|
@am__fastdepCC_FALSE@ $(COMPILE) -c $<
|
|
|
|
.c.obj:
|
|
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
|
|
-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
|
|
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
|
|
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
|
|
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
|
@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
|
|
|
|
.c.lo:
|
|
@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
|
|
-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
|
|
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
|
|
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
|
|
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
|
@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
|
|
@@ -395,20 +397,23 @@ clean-libtool:
|
|
install-libgtopincludeHEADERS: $(libgtopinclude_HEADERS)
|
|
@$(NORMAL_INSTALL)
|
|
test -z "$(libgtopincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libgtopincludedir)"
|
|
- @list='$(libgtopinclude_HEADERS)'; for p in $$list; do \
|
|
+ @list='$(libgtopinclude_HEADERS)'; test -n "$(libgtopincludedir)" || list=; \
|
|
+ for p in $$list; do \
|
|
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
|
|
- f=$(am__strip_dir) \
|
|
- echo " $(libgtopincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(libgtopincludedir)/$$f'"; \
|
|
- $(libgtopincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(libgtopincludedir)/$$f"; \
|
|
+ echo "$$d$$p"; \
|
|
+ done | $(am__base_list) | \
|
|
+ while read files; do \
|
|
+ echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(libgtopincludedir)'"; \
|
|
+ $(INSTALL_HEADER) $$files "$(DESTDIR)$(libgtopincludedir)" || exit $$?; \
|
|
done
|
|
|
|
uninstall-libgtopincludeHEADERS:
|
|
@$(NORMAL_UNINSTALL)
|
|
- @list='$(libgtopinclude_HEADERS)'; for p in $$list; do \
|
|
- f=$(am__strip_dir) \
|
|
- echo " rm -f '$(DESTDIR)$(libgtopincludedir)/$$f'"; \
|
|
- rm -f "$(DESTDIR)$(libgtopincludedir)/$$f"; \
|
|
- done
|
|
+ @list='$(libgtopinclude_HEADERS)'; test -n "$(libgtopincludedir)" || list=; \
|
|
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
|
|
+ test -n "$$files" || exit 0; \
|
|
+ echo " ( cd '$(DESTDIR)$(libgtopincludedir)' && rm -f" $$files ")"; \
|
|
+ cd "$(DESTDIR)$(libgtopincludedir)" && rm -f $$files
|
|
|
|
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
|
|
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
|
|
@@ -422,7 +427,7 @@ tags: TAGS
|
|
|
|
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
|
|
$(TAGS_FILES) $(LISP)
|
|
- tags=; \
|
|
+ set x; \
|
|
here=`pwd`; \
|
|
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
|
|
unique=`for i in $$list; do \
|
|
@@ -430,29 +435,34 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP
|
|
done | \
|
|
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
|
|
END { if (nonempty) { for (i in files) print i; }; }'`; \
|
|
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
|
|
+ shift; \
|
|
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
|
|
test -n "$$unique" || unique=$$empty_fix; \
|
|
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
|
|
- $$tags $$unique; \
|
|
+ if test $$# -gt 0; then \
|
|
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
|
|
+ "$$@" $$unique; \
|
|
+ else \
|
|
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
|
|
+ $$unique; \
|
|
+ fi; \
|
|
fi
|
|
ctags: CTAGS
|
|
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
|
|
$(TAGS_FILES) $(LISP)
|
|
- tags=; \
|
|
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
|
|
unique=`for i in $$list; do \
|
|
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
|
|
done | \
|
|
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
|
|
END { if (nonempty) { for (i in files) print i; }; }'`; \
|
|
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
|
|
+ test -z "$(CTAGS_ARGS)$$unique" \
|
|
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
|
|
- $$tags $$unique
|
|
+ $$unique
|
|
|
|
GTAGS:
|
|
here=`$(am__cd) $(top_builddir) && pwd` \
|
|
- && cd $(top_srcdir) \
|
|
- && gtags -i $(GTAGS_ARGS) $$here
|
|
+ && $(am__cd) $(top_srcdir) \
|
|
+ && gtags -i $(GTAGS_ARGS) "$$here"
|
|
|
|
distclean-tags:
|
|
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
|
|
@@ -473,13 +483,17 @@ distdir: $(DISTFILES)
|
|
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
|
|
if test -d $$d/$$file; then \
|
|
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
|
|
+ if test -d "$(distdir)/$$file"; then \
|
|
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
|
|
+ fi; \
|
|
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
|
|
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
|
|
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
|
|
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
|
|
fi; \
|
|
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
|
|
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
|
|
else \
|
|
- test -f $(distdir)/$$file \
|
|
- || cp -p $$d/$$file $(distdir)/$$file \
|
|
+ test -f "$(distdir)/$$file" \
|
|
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|
|
|| exit 1; \
|
|
fi; \
|
|
done
|
|
@@ -510,6 +524,7 @@ clean-generic:
|
|
|
|
distclean-generic:
|
|
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
|
|
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
|
|
|
|
maintainer-clean-generic:
|
|
@echo "This command is intended for maintainers to use"
|
|
@@ -531,6 +546,8 @@ dvi-am:
|
|
|
|
html: html-am
|
|
|
|
+html-am:
|
|
+
|
|
info: info-am
|
|
|
|
info-am:
|
|
@@ -539,18 +556,28 @@ install-data-am: install-libgtopincludeH
|
|
|
|
install-dvi: install-dvi-am
|
|
|
|
+install-dvi-am:
|
|
+
|
|
install-exec-am:
|
|
|
|
install-html: install-html-am
|
|
|
|
+install-html-am:
|
|
+
|
|
install-info: install-info-am
|
|
|
|
+install-info-am:
|
|
+
|
|
install-man:
|
|
|
|
install-pdf: install-pdf-am
|
|
|
|
+install-pdf-am:
|
|
+
|
|
install-ps: install-ps-am
|
|
|
|
+install-ps-am:
|
|
+
|
|
installcheck-am:
|
|
|
|
maintainer-clean: maintainer-clean-am
|
|
@@ -589,6 +616,7 @@ uninstall-am: uninstall-libgtopincludeHE
|
|
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
|
|
tags uninstall uninstall-am uninstall-libgtopincludeHEADERS
|
|
|
|
+
|
|
# Tell versions [3.59,3.63) of GNU make to not export all variables.
|
|
# Otherwise a system limit (for SysV at least) may be exceeded.
|
|
.NOEXPORT:
|
|
Index: libgtop-2.28.0/sysdeps/darwin/Makefile.in
|
|
===================================================================
|
|
--- libgtop-2.28.0.orig/sysdeps/darwin/Makefile.in 2009-11-22 17:53:42.989187058 +0100
|
|
+++ libgtop-2.28.0/sysdeps/darwin/Makefile.in 2009-11-22 17:53:11.049684693 +0100
|
|
@@ -1,8 +1,9 @@
|
|
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
|
|
+# Makefile.in generated by automake 1.11 from Makefile.am.
|
|
# @configure_input@
|
|
|
|
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
|
|
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
|
|
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
|
|
+# Inc.
|
|
# This Makefile.in is free software; the Free Software Foundation
|
|
# gives unlimited permission to copy and/or distribute it,
|
|
# with or without modifications, as long as this notice is preserved.
|
|
@@ -17,8 +18,9 @@
|
|
|
|
VPATH = @srcdir@
|
|
pkgdatadir = $(datadir)/@PACKAGE@
|
|
-pkglibdir = $(libdir)/@PACKAGE@
|
|
pkgincludedir = $(includedir)/@PACKAGE@
|
|
+pkglibdir = $(libdir)/@PACKAGE@
|
|
+pkglibexecdir = $(libexecdir)/@PACKAGE@
|
|
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
|
|
install_sh_DATA = $(install_sh) -c -m 644
|
|
install_sh_PROGRAM = $(install_sh) -c
|
|
@@ -44,6 +46,7 @@ am__configure_deps = $(am__aclocal_m4_de
|
|
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
|
|
CONFIG_HEADER = $(top_builddir)/config.h
|
|
CONFIG_CLEAN_FILES =
|
|
+CONFIG_CLEAN_VPATH_FILES =
|
|
LTLIBRARIES = $(noinst_LTLIBRARIES)
|
|
libgtop_sysdeps_2_0_la_LIBADD =
|
|
am_libgtop_sysdeps_2_0_la_OBJECTS = nosuid.lo siglist.lo sysinfo.lo
|
|
@@ -60,6 +63,7 @@ libgtop_sysdeps_suid_2_0_la_OBJECTS = \
|
|
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
|
|
depcomp = $(SHELL) $(top_srcdir)/depcomp
|
|
am__depfiles_maybe = depfiles
|
|
+am__mv = mv -f
|
|
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
|
|
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
|
|
LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
|
|
@@ -78,9 +82,23 @@ am__vpath_adj = case $$p in \
|
|
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
|
|
*) f=$$p;; \
|
|
esac;
|
|
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
|
|
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
|
|
+am__install_max = 40
|
|
+am__nobase_strip_setup = \
|
|
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
|
|
+am__nobase_strip = \
|
|
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
|
|
+am__nobase_list = $(am__nobase_strip_setup); \
|
|
+ for p in $$list; do echo "$$p $$p"; done | \
|
|
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
|
|
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
|
|
+ if (++n[$$2] == $(am__install_max)) \
|
|
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
|
|
+ END { for (dir in files) print dir, files[dir] }'
|
|
+am__base_list = \
|
|
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
|
|
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
|
|
am__installdirs = "$(DESTDIR)$(libgtopincludedir)"
|
|
-libgtopincludeHEADERS_INSTALL = $(INSTALL_HEADER)
|
|
HEADERS = $(libgtopinclude_HEADERS) $(noinst_HEADERS)
|
|
ETAGS = etags
|
|
CTAGS = ctags
|
|
@@ -133,29 +151,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
|
|
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
|
|
INSTOBJEXT = @INSTOBJEXT@
|
|
INTLLIBS = @INTLLIBS@
|
|
-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
|
|
-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
|
|
-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
|
|
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
|
|
-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
|
|
-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
|
|
INTLTOOL_MERGE = @INTLTOOL_MERGE@
|
|
-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@
|
|
-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
|
|
-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
|
|
-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
|
|
-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
|
|
-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
|
|
-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
|
|
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
|
|
-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
|
|
-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
|
|
-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
|
|
KVM_LIBS = @KVM_LIBS@
|
|
LD = @LD@
|
|
LDFLAGS = @LDFLAGS@
|
|
@@ -194,6 +193,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
|
|
PACKAGE_NAME = @PACKAGE_NAME@
|
|
PACKAGE_STRING = @PACKAGE_STRING@
|
|
PACKAGE_TARNAME = @PACKAGE_TARNAME@
|
|
+PACKAGE_URL = @PACKAGE_URL@
|
|
PACKAGE_VERSION = @PACKAGE_VERSION@
|
|
PATH_SEPARATOR = @PATH_SEPARATOR@
|
|
PERL = @PERL@
|
|
@@ -275,6 +275,7 @@ sysconfdir = @sysconfdir@
|
|
sysdeps_dir = @sysdeps_dir@
|
|
sysdeps_suid_lib = @sysdeps_suid_lib@
|
|
target_alias = @target_alias@
|
|
+top_build_prefix = @top_build_prefix@
|
|
top_builddir = @top_builddir@
|
|
top_srcdir = @top_srcdir@
|
|
noinst_LTLIBRARIES = libgtop_sysdeps-2.0.la libgtop_sysdeps_suid-2.0.la
|
|
@@ -301,9 +302,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefi
|
|
exit 1;; \
|
|
esac; \
|
|
done; \
|
|
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu sysdeps/darwin/Makefile'; \
|
|
- cd $(top_srcdir) && \
|
|
- $(AUTOMAKE) --gnu sysdeps/darwin/Makefile
|
|
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu sysdeps/darwin/Makefile'; \
|
|
+ $(am__cd) $(top_srcdir) && \
|
|
+ $(AUTOMAKE) --gnu sysdeps/darwin/Makefile
|
|
.PRECIOUS: Makefile
|
|
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
|
|
@case '$?' in \
|
|
@@ -321,6 +322,7 @@ $(top_srcdir)/configure: $(am__configur
|
|
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
|
|
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
|
|
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
|
|
+$(am__aclocal_m4_deps):
|
|
|
|
clean-noinstLTLIBRARIES:
|
|
-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
|
|
@@ -373,21 +375,21 @@ distclean-compile:
|
|
|
|
.c.o:
|
|
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
|
|
-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
|
|
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
|
|
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
|
|
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
|
@am__fastdepCC_FALSE@ $(COMPILE) -c $<
|
|
|
|
.c.obj:
|
|
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
|
|
-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
|
|
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
|
|
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
|
|
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
|
@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
|
|
|
|
.c.lo:
|
|
@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
|
|
-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
|
|
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
|
|
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
|
|
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
|
@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
|
|
@@ -400,20 +402,23 @@ clean-libtool:
|
|
install-libgtopincludeHEADERS: $(libgtopinclude_HEADERS)
|
|
@$(NORMAL_INSTALL)
|
|
test -z "$(libgtopincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libgtopincludedir)"
|
|
- @list='$(libgtopinclude_HEADERS)'; for p in $$list; do \
|
|
+ @list='$(libgtopinclude_HEADERS)'; test -n "$(libgtopincludedir)" || list=; \
|
|
+ for p in $$list; do \
|
|
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
|
|
- f=$(am__strip_dir) \
|
|
- echo " $(libgtopincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(libgtopincludedir)/$$f'"; \
|
|
- $(libgtopincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(libgtopincludedir)/$$f"; \
|
|
+ echo "$$d$$p"; \
|
|
+ done | $(am__base_list) | \
|
|
+ while read files; do \
|
|
+ echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(libgtopincludedir)'"; \
|
|
+ $(INSTALL_HEADER) $$files "$(DESTDIR)$(libgtopincludedir)" || exit $$?; \
|
|
done
|
|
|
|
uninstall-libgtopincludeHEADERS:
|
|
@$(NORMAL_UNINSTALL)
|
|
- @list='$(libgtopinclude_HEADERS)'; for p in $$list; do \
|
|
- f=$(am__strip_dir) \
|
|
- echo " rm -f '$(DESTDIR)$(libgtopincludedir)/$$f'"; \
|
|
- rm -f "$(DESTDIR)$(libgtopincludedir)/$$f"; \
|
|
- done
|
|
+ @list='$(libgtopinclude_HEADERS)'; test -n "$(libgtopincludedir)" || list=; \
|
|
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
|
|
+ test -n "$$files" || exit 0; \
|
|
+ echo " ( cd '$(DESTDIR)$(libgtopincludedir)' && rm -f" $$files ")"; \
|
|
+ cd "$(DESTDIR)$(libgtopincludedir)" && rm -f $$files
|
|
|
|
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
|
|
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
|
|
@@ -427,7 +432,7 @@ tags: TAGS
|
|
|
|
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
|
|
$(TAGS_FILES) $(LISP)
|
|
- tags=; \
|
|
+ set x; \
|
|
here=`pwd`; \
|
|
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
|
|
unique=`for i in $$list; do \
|
|
@@ -435,29 +440,34 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP
|
|
done | \
|
|
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
|
|
END { if (nonempty) { for (i in files) print i; }; }'`; \
|
|
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
|
|
+ shift; \
|
|
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
|
|
test -n "$$unique" || unique=$$empty_fix; \
|
|
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
|
|
- $$tags $$unique; \
|
|
+ if test $$# -gt 0; then \
|
|
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
|
|
+ "$$@" $$unique; \
|
|
+ else \
|
|
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
|
|
+ $$unique; \
|
|
+ fi; \
|
|
fi
|
|
ctags: CTAGS
|
|
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
|
|
$(TAGS_FILES) $(LISP)
|
|
- tags=; \
|
|
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
|
|
unique=`for i in $$list; do \
|
|
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
|
|
done | \
|
|
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
|
|
END { if (nonempty) { for (i in files) print i; }; }'`; \
|
|
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
|
|
+ test -z "$(CTAGS_ARGS)$$unique" \
|
|
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
|
|
- $$tags $$unique
|
|
+ $$unique
|
|
|
|
GTAGS:
|
|
here=`$(am__cd) $(top_builddir) && pwd` \
|
|
- && cd $(top_srcdir) \
|
|
- && gtags -i $(GTAGS_ARGS) $$here
|
|
+ && $(am__cd) $(top_srcdir) \
|
|
+ && gtags -i $(GTAGS_ARGS) "$$here"
|
|
|
|
distclean-tags:
|
|
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
|
|
@@ -478,13 +488,17 @@ distdir: $(DISTFILES)
|
|
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
|
|
if test -d $$d/$$file; then \
|
|
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
|
|
+ if test -d "$(distdir)/$$file"; then \
|
|
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
|
|
+ fi; \
|
|
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
|
|
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
|
|
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
|
|
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
|
|
fi; \
|
|
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
|
|
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
|
|
else \
|
|
- test -f $(distdir)/$$file \
|
|
- || cp -p $$d/$$file $(distdir)/$$file \
|
|
+ test -f "$(distdir)/$$file" \
|
|
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|
|
|| exit 1; \
|
|
fi; \
|
|
done
|
|
@@ -515,6 +529,7 @@ clean-generic:
|
|
|
|
distclean-generic:
|
|
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
|
|
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
|
|
|
|
maintainer-clean-generic:
|
|
@echo "This command is intended for maintainers to use"
|
|
@@ -536,6 +551,8 @@ dvi-am:
|
|
|
|
html: html-am
|
|
|
|
+html-am:
|
|
+
|
|
info: info-am
|
|
|
|
info-am:
|
|
@@ -544,18 +561,28 @@ install-data-am: install-libgtopincludeH
|
|
|
|
install-dvi: install-dvi-am
|
|
|
|
+install-dvi-am:
|
|
+
|
|
install-exec-am:
|
|
|
|
install-html: install-html-am
|
|
|
|
+install-html-am:
|
|
+
|
|
install-info: install-info-am
|
|
|
|
+install-info-am:
|
|
+
|
|
install-man:
|
|
|
|
install-pdf: install-pdf-am
|
|
|
|
+install-pdf-am:
|
|
+
|
|
install-ps: install-ps-am
|
|
|
|
+install-ps-am:
|
|
+
|
|
installcheck-am:
|
|
|
|
maintainer-clean: maintainer-clean-am
|
|
@@ -594,6 +621,7 @@ uninstall-am: uninstall-libgtopincludeHE
|
|
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
|
|
tags uninstall uninstall-am uninstall-libgtopincludeHEADERS
|
|
|
|
+
|
|
# Tell versions [3.59,3.63) of GNU make to not export all variables.
|
|
# Otherwise a system limit (for SysV at least) may be exceeded.
|
|
.NOEXPORT:
|
|
Index: libgtop-2.28.0/sysdeps/freebsd/Makefile.in
|
|
===================================================================
|
|
--- libgtop-2.28.0.orig/sysdeps/freebsd/Makefile.in 2009-11-22 17:53:43.753185565 +0100
|
|
+++ libgtop-2.28.0/sysdeps/freebsd/Makefile.in 2009-11-22 17:53:11.165685339 +0100
|
|
@@ -1,8 +1,9 @@
|
|
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
|
|
+# Makefile.in generated by automake 1.11 from Makefile.am.
|
|
# @configure_input@
|
|
|
|
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
|
|
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
|
|
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
|
|
+# Inc.
|
|
# This Makefile.in is free software; the Free Software Foundation
|
|
# gives unlimited permission to copy and/or distribute it,
|
|
# with or without modifications, as long as this notice is preserved.
|
|
@@ -17,8 +18,9 @@
|
|
|
|
VPATH = @srcdir@
|
|
pkgdatadir = $(datadir)/@PACKAGE@
|
|
-pkglibdir = $(libdir)/@PACKAGE@
|
|
pkgincludedir = $(includedir)/@PACKAGE@
|
|
+pkglibdir = $(libdir)/@PACKAGE@
|
|
+pkglibexecdir = $(libexecdir)/@PACKAGE@
|
|
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
|
|
install_sh_DATA = $(install_sh) -c -m 644
|
|
install_sh_PROGRAM = $(install_sh) -c
|
|
@@ -44,6 +46,7 @@ am__configure_deps = $(am__aclocal_m4_de
|
|
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
|
|
CONFIG_HEADER = $(top_builddir)/config.h
|
|
CONFIG_CLEAN_FILES =
|
|
+CONFIG_CLEAN_VPATH_FILES =
|
|
LTLIBRARIES = $(noinst_LTLIBRARIES)
|
|
libgtop_sysdeps_2_0_la_LIBADD =
|
|
am_libgtop_sysdeps_2_0_la_OBJECTS = nosuid.lo siglist.lo sysinfo.lo \
|
|
@@ -70,6 +73,7 @@ libgtop_sysdeps_suid_2_0_la_LINK = $(LIB
|
|
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
|
|
depcomp = $(SHELL) $(top_srcdir)/depcomp
|
|
am__depfiles_maybe = depfiles
|
|
+am__mv = mv -f
|
|
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
|
|
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
|
|
LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
|
|
@@ -88,9 +92,23 @@ am__vpath_adj = case $$p in \
|
|
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
|
|
*) f=$$p;; \
|
|
esac;
|
|
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
|
|
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
|
|
+am__install_max = 40
|
|
+am__nobase_strip_setup = \
|
|
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
|
|
+am__nobase_strip = \
|
|
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
|
|
+am__nobase_list = $(am__nobase_strip_setup); \
|
|
+ for p in $$list; do echo "$$p $$p"; done | \
|
|
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
|
|
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
|
|
+ if (++n[$$2] == $(am__install_max)) \
|
|
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
|
|
+ END { for (dir in files) print dir, files[dir] }'
|
|
+am__base_list = \
|
|
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
|
|
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
|
|
am__installdirs = "$(DESTDIR)$(libgtopincludedir)"
|
|
-libgtopincludeHEADERS_INSTALL = $(INSTALL_HEADER)
|
|
HEADERS = $(libgtopinclude_HEADERS)
|
|
ETAGS = etags
|
|
CTAGS = ctags
|
|
@@ -143,29 +161,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
|
|
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
|
|
INSTOBJEXT = @INSTOBJEXT@
|
|
INTLLIBS = @INTLLIBS@
|
|
-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
|
|
-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
|
|
-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
|
|
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
|
|
-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
|
|
-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
|
|
INTLTOOL_MERGE = @INTLTOOL_MERGE@
|
|
-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@
|
|
-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
|
|
-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
|
|
-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
|
|
-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
|
|
-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
|
|
-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
|
|
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
|
|
-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
|
|
-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
|
|
-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
|
|
KVM_LIBS = @KVM_LIBS@
|
|
LD = @LD@
|
|
LDFLAGS = @LDFLAGS@
|
|
@@ -204,6 +203,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
|
|
PACKAGE_NAME = @PACKAGE_NAME@
|
|
PACKAGE_STRING = @PACKAGE_STRING@
|
|
PACKAGE_TARNAME = @PACKAGE_TARNAME@
|
|
+PACKAGE_URL = @PACKAGE_URL@
|
|
PACKAGE_VERSION = @PACKAGE_VERSION@
|
|
PATH_SEPARATOR = @PATH_SEPARATOR@
|
|
PERL = @PERL@
|
|
@@ -285,6 +285,7 @@ sysconfdir = @sysconfdir@
|
|
sysdeps_dir = @sysdeps_dir@
|
|
sysdeps_suid_lib = @sysdeps_suid_lib@
|
|
target_alias = @target_alias@
|
|
+top_build_prefix = @top_build_prefix@
|
|
top_builddir = @top_builddir@
|
|
top_srcdir = @top_srcdir@
|
|
noinst_LTLIBRARIES = libgtop_sysdeps-2.0.la libgtop_sysdeps_suid-2.0.la
|
|
@@ -320,9 +321,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefi
|
|
exit 1;; \
|
|
esac; \
|
|
done; \
|
|
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu sysdeps/freebsd/Makefile'; \
|
|
- cd $(top_srcdir) && \
|
|
- $(AUTOMAKE) --gnu sysdeps/freebsd/Makefile
|
|
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu sysdeps/freebsd/Makefile'; \
|
|
+ $(am__cd) $(top_srcdir) && \
|
|
+ $(AUTOMAKE) --gnu sysdeps/freebsd/Makefile
|
|
.PRECIOUS: Makefile
|
|
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
|
|
@case '$?' in \
|
|
@@ -340,6 +341,7 @@ $(top_srcdir)/configure: $(am__configur
|
|
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
|
|
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
|
|
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
|
|
+$(am__aclocal_m4_deps):
|
|
|
|
clean-noinstLTLIBRARIES:
|
|
-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
|
|
@@ -395,21 +397,21 @@ distclean-compile:
|
|
|
|
.c.o:
|
|
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
|
|
-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
|
|
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
|
|
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
|
|
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
|
@am__fastdepCC_FALSE@ $(COMPILE) -c $<
|
|
|
|
.c.obj:
|
|
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
|
|
-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
|
|
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
|
|
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
|
|
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
|
@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
|
|
|
|
.c.lo:
|
|
@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
|
|
-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
|
|
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
|
|
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
|
|
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
|
@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
|
|
@@ -422,20 +424,23 @@ clean-libtool:
|
|
install-libgtopincludeHEADERS: $(libgtopinclude_HEADERS)
|
|
@$(NORMAL_INSTALL)
|
|
test -z "$(libgtopincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libgtopincludedir)"
|
|
- @list='$(libgtopinclude_HEADERS)'; for p in $$list; do \
|
|
+ @list='$(libgtopinclude_HEADERS)'; test -n "$(libgtopincludedir)" || list=; \
|
|
+ for p in $$list; do \
|
|
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
|
|
- f=$(am__strip_dir) \
|
|
- echo " $(libgtopincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(libgtopincludedir)/$$f'"; \
|
|
- $(libgtopincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(libgtopincludedir)/$$f"; \
|
|
+ echo "$$d$$p"; \
|
|
+ done | $(am__base_list) | \
|
|
+ while read files; do \
|
|
+ echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(libgtopincludedir)'"; \
|
|
+ $(INSTALL_HEADER) $$files "$(DESTDIR)$(libgtopincludedir)" || exit $$?; \
|
|
done
|
|
|
|
uninstall-libgtopincludeHEADERS:
|
|
@$(NORMAL_UNINSTALL)
|
|
- @list='$(libgtopinclude_HEADERS)'; for p in $$list; do \
|
|
- f=$(am__strip_dir) \
|
|
- echo " rm -f '$(DESTDIR)$(libgtopincludedir)/$$f'"; \
|
|
- rm -f "$(DESTDIR)$(libgtopincludedir)/$$f"; \
|
|
- done
|
|
+ @list='$(libgtopinclude_HEADERS)'; test -n "$(libgtopincludedir)" || list=; \
|
|
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
|
|
+ test -n "$$files" || exit 0; \
|
|
+ echo " ( cd '$(DESTDIR)$(libgtopincludedir)' && rm -f" $$files ")"; \
|
|
+ cd "$(DESTDIR)$(libgtopincludedir)" && rm -f $$files
|
|
|
|
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
|
|
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
|
|
@@ -449,7 +454,7 @@ tags: TAGS
|
|
|
|
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
|
|
$(TAGS_FILES) $(LISP)
|
|
- tags=; \
|
|
+ set x; \
|
|
here=`pwd`; \
|
|
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
|
|
unique=`for i in $$list; do \
|
|
@@ -457,29 +462,34 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP
|
|
done | \
|
|
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
|
|
END { if (nonempty) { for (i in files) print i; }; }'`; \
|
|
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
|
|
+ shift; \
|
|
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
|
|
test -n "$$unique" || unique=$$empty_fix; \
|
|
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
|
|
- $$tags $$unique; \
|
|
+ if test $$# -gt 0; then \
|
|
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
|
|
+ "$$@" $$unique; \
|
|
+ else \
|
|
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
|
|
+ $$unique; \
|
|
+ fi; \
|
|
fi
|
|
ctags: CTAGS
|
|
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
|
|
$(TAGS_FILES) $(LISP)
|
|
- tags=; \
|
|
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
|
|
unique=`for i in $$list; do \
|
|
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
|
|
done | \
|
|
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
|
|
END { if (nonempty) { for (i in files) print i; }; }'`; \
|
|
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
|
|
+ test -z "$(CTAGS_ARGS)$$unique" \
|
|
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
|
|
- $$tags $$unique
|
|
+ $$unique
|
|
|
|
GTAGS:
|
|
here=`$(am__cd) $(top_builddir) && pwd` \
|
|
- && cd $(top_srcdir) \
|
|
- && gtags -i $(GTAGS_ARGS) $$here
|
|
+ && $(am__cd) $(top_srcdir) \
|
|
+ && gtags -i $(GTAGS_ARGS) "$$here"
|
|
|
|
distclean-tags:
|
|
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
|
|
@@ -500,13 +510,17 @@ distdir: $(DISTFILES)
|
|
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
|
|
if test -d $$d/$$file; then \
|
|
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
|
|
+ if test -d "$(distdir)/$$file"; then \
|
|
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
|
|
+ fi; \
|
|
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
|
|
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
|
|
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
|
|
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
|
|
fi; \
|
|
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
|
|
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
|
|
else \
|
|
- test -f $(distdir)/$$file \
|
|
- || cp -p $$d/$$file $(distdir)/$$file \
|
|
+ test -f "$(distdir)/$$file" \
|
|
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|
|
|| exit 1; \
|
|
fi; \
|
|
done
|
|
@@ -537,6 +551,7 @@ clean-generic:
|
|
|
|
distclean-generic:
|
|
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
|
|
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
|
|
|
|
maintainer-clean-generic:
|
|
@echo "This command is intended for maintainers to use"
|
|
@@ -558,6 +573,8 @@ dvi-am:
|
|
|
|
html: html-am
|
|
|
|
+html-am:
|
|
+
|
|
info: info-am
|
|
|
|
info-am:
|
|
@@ -566,18 +583,28 @@ install-data-am: install-libgtopincludeH
|
|
|
|
install-dvi: install-dvi-am
|
|
|
|
+install-dvi-am:
|
|
+
|
|
install-exec-am:
|
|
|
|
install-html: install-html-am
|
|
|
|
+install-html-am:
|
|
+
|
|
install-info: install-info-am
|
|
|
|
+install-info-am:
|
|
+
|
|
install-man:
|
|
|
|
install-pdf: install-pdf-am
|
|
|
|
+install-pdf-am:
|
|
+
|
|
install-ps: install-ps-am
|
|
|
|
+install-ps-am:
|
|
+
|
|
installcheck-am:
|
|
|
|
maintainer-clean: maintainer-clean-am
|
|
@@ -616,6 +643,7 @@ uninstall-am: uninstall-libgtopincludeHE
|
|
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
|
|
tags uninstall uninstall-am uninstall-libgtopincludeHEADERS
|
|
|
|
+
|
|
# Tell versions [3.59,3.63) of GNU make to not export all variables.
|
|
# Otherwise a system limit (for SysV at least) may be exceeded.
|
|
.NOEXPORT:
|
|
Index: libgtop-2.28.0/sysdeps/linux/Makefile.in
|
|
===================================================================
|
|
--- libgtop-2.28.0.orig/sysdeps/linux/Makefile.in 2009-11-22 17:53:43.369187240 +0100
|
|
+++ libgtop-2.28.0/sysdeps/linux/Makefile.in 2009-11-22 17:53:11.281683529 +0100
|
|
@@ -1,8 +1,9 @@
|
|
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
|
|
+# Makefile.in generated by automake 1.11 from Makefile.am.
|
|
# @configure_input@
|
|
|
|
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
|
|
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
|
|
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
|
|
+# Inc.
|
|
# This Makefile.in is free software; the Free Software Foundation
|
|
# gives unlimited permission to copy and/or distribute it,
|
|
# with or without modifications, as long as this notice is preserved.
|
|
@@ -17,8 +18,9 @@
|
|
|
|
VPATH = @srcdir@
|
|
pkgdatadir = $(datadir)/@PACKAGE@
|
|
-pkglibdir = $(libdir)/@PACKAGE@
|
|
pkgincludedir = $(includedir)/@PACKAGE@
|
|
+pkglibdir = $(libdir)/@PACKAGE@
|
|
+pkglibexecdir = $(libexecdir)/@PACKAGE@
|
|
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
|
|
install_sh_DATA = $(install_sh) -c -m 644
|
|
install_sh_PROGRAM = $(install_sh) -c
|
|
@@ -44,6 +46,7 @@ am__configure_deps = $(am__aclocal_m4_de
|
|
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
|
|
CONFIG_HEADER = $(top_builddir)/config.h
|
|
CONFIG_CLEAN_FILES =
|
|
+CONFIG_CLEAN_VPATH_FILES =
|
|
LTLIBRARIES = $(noinst_LTLIBRARIES)
|
|
libgtop_sysdeps_2_0_la_DEPENDENCIES =
|
|
am_libgtop_sysdeps_2_0_la_OBJECTS = open.lo close.lo cpu.lo mem.lo \
|
|
@@ -57,6 +60,7 @@ libgtop_sysdeps_2_0_la_OBJECTS = $(am_li
|
|
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
|
|
depcomp = $(SHELL) $(top_srcdir)/depcomp
|
|
am__depfiles_maybe = depfiles
|
|
+am__mv = mv -f
|
|
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
|
|
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
|
|
LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
|
|
@@ -73,9 +77,23 @@ am__vpath_adj = case $$p in \
|
|
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
|
|
*) f=$$p;; \
|
|
esac;
|
|
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
|
|
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
|
|
+am__install_max = 40
|
|
+am__nobase_strip_setup = \
|
|
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
|
|
+am__nobase_strip = \
|
|
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
|
|
+am__nobase_list = $(am__nobase_strip_setup); \
|
|
+ for p in $$list; do echo "$$p $$p"; done | \
|
|
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
|
|
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
|
|
+ if (++n[$$2] == $(am__install_max)) \
|
|
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
|
|
+ END { for (dir in files) print dir, files[dir] }'
|
|
+am__base_list = \
|
|
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
|
|
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
|
|
am__installdirs = "$(DESTDIR)$(libgtopincludedir)"
|
|
-libgtopincludeHEADERS_INSTALL = $(INSTALL_HEADER)
|
|
HEADERS = $(libgtopinclude_HEADERS) $(noinst_HEADERS)
|
|
ETAGS = etags
|
|
CTAGS = ctags
|
|
@@ -128,29 +146,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
|
|
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
|
|
INSTOBJEXT = @INSTOBJEXT@
|
|
INTLLIBS = @INTLLIBS@
|
|
-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
|
|
-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
|
|
-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
|
|
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
|
|
-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
|
|
-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
|
|
INTLTOOL_MERGE = @INTLTOOL_MERGE@
|
|
-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@
|
|
-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
|
|
-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
|
|
-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
|
|
-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
|
|
-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
|
|
-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
|
|
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
|
|
-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
|
|
-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
|
|
-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
|
|
KVM_LIBS = @KVM_LIBS@
|
|
LD = @LD@
|
|
LDFLAGS = @LDFLAGS@
|
|
@@ -189,6 +188,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
|
|
PACKAGE_NAME = @PACKAGE_NAME@
|
|
PACKAGE_STRING = @PACKAGE_STRING@
|
|
PACKAGE_TARNAME = @PACKAGE_TARNAME@
|
|
+PACKAGE_URL = @PACKAGE_URL@
|
|
PACKAGE_VERSION = @PACKAGE_VERSION@
|
|
PATH_SEPARATOR = @PATH_SEPARATOR@
|
|
PERL = @PERL@
|
|
@@ -270,6 +270,7 @@ sysconfdir = @sysconfdir@
|
|
sysdeps_dir = @sysdeps_dir@
|
|
sysdeps_suid_lib = @sysdeps_suid_lib@
|
|
target_alias = @target_alias@
|
|
+top_build_prefix = @top_build_prefix@
|
|
top_builddir = @top_builddir@
|
|
top_srcdir = @top_srcdir@
|
|
noinst_LTLIBRARIES = libgtop_sysdeps-2.0.la
|
|
@@ -302,9 +303,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefi
|
|
exit 1;; \
|
|
esac; \
|
|
done; \
|
|
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu sysdeps/linux/Makefile'; \
|
|
- cd $(top_srcdir) && \
|
|
- $(AUTOMAKE) --gnu sysdeps/linux/Makefile
|
|
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu sysdeps/linux/Makefile'; \
|
|
+ $(am__cd) $(top_srcdir) && \
|
|
+ $(AUTOMAKE) --gnu sysdeps/linux/Makefile
|
|
.PRECIOUS: Makefile
|
|
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
|
|
@case '$?' in \
|
|
@@ -322,6 +323,7 @@ $(top_srcdir)/configure: $(am__configur
|
|
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
|
|
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
|
|
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
|
|
+$(am__aclocal_m4_deps):
|
|
|
|
clean-noinstLTLIBRARIES:
|
|
-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
|
|
@@ -374,21 +376,21 @@ distclean-compile:
|
|
|
|
.c.o:
|
|
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
|
|
-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
|
|
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
|
|
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
|
|
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
|
@am__fastdepCC_FALSE@ $(COMPILE) -c $<
|
|
|
|
.c.obj:
|
|
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
|
|
-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
|
|
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
|
|
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
|
|
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
|
@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
|
|
|
|
.c.lo:
|
|
@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
|
|
-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
|
|
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
|
|
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
|
|
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
|
@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
|
|
@@ -401,20 +403,23 @@ clean-libtool:
|
|
install-libgtopincludeHEADERS: $(libgtopinclude_HEADERS)
|
|
@$(NORMAL_INSTALL)
|
|
test -z "$(libgtopincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libgtopincludedir)"
|
|
- @list='$(libgtopinclude_HEADERS)'; for p in $$list; do \
|
|
+ @list='$(libgtopinclude_HEADERS)'; test -n "$(libgtopincludedir)" || list=; \
|
|
+ for p in $$list; do \
|
|
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
|
|
- f=$(am__strip_dir) \
|
|
- echo " $(libgtopincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(libgtopincludedir)/$$f'"; \
|
|
- $(libgtopincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(libgtopincludedir)/$$f"; \
|
|
+ echo "$$d$$p"; \
|
|
+ done | $(am__base_list) | \
|
|
+ while read files; do \
|
|
+ echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(libgtopincludedir)'"; \
|
|
+ $(INSTALL_HEADER) $$files "$(DESTDIR)$(libgtopincludedir)" || exit $$?; \
|
|
done
|
|
|
|
uninstall-libgtopincludeHEADERS:
|
|
@$(NORMAL_UNINSTALL)
|
|
- @list='$(libgtopinclude_HEADERS)'; for p in $$list; do \
|
|
- f=$(am__strip_dir) \
|
|
- echo " rm -f '$(DESTDIR)$(libgtopincludedir)/$$f'"; \
|
|
- rm -f "$(DESTDIR)$(libgtopincludedir)/$$f"; \
|
|
- done
|
|
+ @list='$(libgtopinclude_HEADERS)'; test -n "$(libgtopincludedir)" || list=; \
|
|
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
|
|
+ test -n "$$files" || exit 0; \
|
|
+ echo " ( cd '$(DESTDIR)$(libgtopincludedir)' && rm -f" $$files ")"; \
|
|
+ cd "$(DESTDIR)$(libgtopincludedir)" && rm -f $$files
|
|
|
|
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
|
|
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
|
|
@@ -428,7 +433,7 @@ tags: TAGS
|
|
|
|
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
|
|
$(TAGS_FILES) $(LISP)
|
|
- tags=; \
|
|
+ set x; \
|
|
here=`pwd`; \
|
|
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
|
|
unique=`for i in $$list; do \
|
|
@@ -436,29 +441,34 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP
|
|
done | \
|
|
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
|
|
END { if (nonempty) { for (i in files) print i; }; }'`; \
|
|
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
|
|
+ shift; \
|
|
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
|
|
test -n "$$unique" || unique=$$empty_fix; \
|
|
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
|
|
- $$tags $$unique; \
|
|
+ if test $$# -gt 0; then \
|
|
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
|
|
+ "$$@" $$unique; \
|
|
+ else \
|
|
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
|
|
+ $$unique; \
|
|
+ fi; \
|
|
fi
|
|
ctags: CTAGS
|
|
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
|
|
$(TAGS_FILES) $(LISP)
|
|
- tags=; \
|
|
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
|
|
unique=`for i in $$list; do \
|
|
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
|
|
done | \
|
|
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
|
|
END { if (nonempty) { for (i in files) print i; }; }'`; \
|
|
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
|
|
+ test -z "$(CTAGS_ARGS)$$unique" \
|
|
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
|
|
- $$tags $$unique
|
|
+ $$unique
|
|
|
|
GTAGS:
|
|
here=`$(am__cd) $(top_builddir) && pwd` \
|
|
- && cd $(top_srcdir) \
|
|
- && gtags -i $(GTAGS_ARGS) $$here
|
|
+ && $(am__cd) $(top_srcdir) \
|
|
+ && gtags -i $(GTAGS_ARGS) "$$here"
|
|
|
|
distclean-tags:
|
|
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
|
|
@@ -479,13 +489,17 @@ distdir: $(DISTFILES)
|
|
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
|
|
if test -d $$d/$$file; then \
|
|
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
|
|
+ if test -d "$(distdir)/$$file"; then \
|
|
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
|
|
+ fi; \
|
|
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
|
|
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
|
|
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
|
|
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
|
|
fi; \
|
|
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
|
|
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
|
|
else \
|
|
- test -f $(distdir)/$$file \
|
|
- || cp -p $$d/$$file $(distdir)/$$file \
|
|
+ test -f "$(distdir)/$$file" \
|
|
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|
|
|| exit 1; \
|
|
fi; \
|
|
done
|
|
@@ -516,6 +530,7 @@ clean-generic:
|
|
|
|
distclean-generic:
|
|
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
|
|
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
|
|
|
|
maintainer-clean-generic:
|
|
@echo "This command is intended for maintainers to use"
|
|
@@ -537,6 +552,8 @@ dvi-am:
|
|
|
|
html: html-am
|
|
|
|
+html-am:
|
|
+
|
|
info: info-am
|
|
|
|
info-am:
|
|
@@ -545,18 +562,28 @@ install-data-am: install-libgtopincludeH
|
|
|
|
install-dvi: install-dvi-am
|
|
|
|
+install-dvi-am:
|
|
+
|
|
install-exec-am:
|
|
|
|
install-html: install-html-am
|
|
|
|
+install-html-am:
|
|
+
|
|
install-info: install-info-am
|
|
|
|
+install-info-am:
|
|
+
|
|
install-man:
|
|
|
|
install-pdf: install-pdf-am
|
|
|
|
+install-pdf-am:
|
|
+
|
|
install-ps: install-ps-am
|
|
|
|
+install-ps-am:
|
|
+
|
|
installcheck-am:
|
|
|
|
maintainer-clean: maintainer-clean-am
|
|
@@ -595,6 +622,7 @@ uninstall-am: uninstall-libgtopincludeHE
|
|
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
|
|
tags uninstall uninstall-am uninstall-libgtopincludeHEADERS
|
|
|
|
+
|
|
# Tell versions [3.59,3.63) of GNU make to not export all variables.
|
|
# Otherwise a system limit (for SysV at least) may be exceeded.
|
|
.NOEXPORT:
|
|
Index: libgtop-2.28.0/sysdeps/osf1/Makefile.in
|
|
===================================================================
|
|
--- libgtop-2.28.0.orig/sysdeps/osf1/Makefile.in 2009-11-22 17:53:43.125184728 +0100
|
|
+++ libgtop-2.28.0/sysdeps/osf1/Makefile.in 2009-11-22 17:53:11.397683667 +0100
|
|
@@ -1,8 +1,9 @@
|
|
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
|
|
+# Makefile.in generated by automake 1.11 from Makefile.am.
|
|
# @configure_input@
|
|
|
|
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
|
|
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
|
|
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
|
|
+# Inc.
|
|
# This Makefile.in is free software; the Free Software Foundation
|
|
# gives unlimited permission to copy and/or distribute it,
|
|
# with or without modifications, as long as this notice is preserved.
|
|
@@ -17,8 +18,9 @@
|
|
|
|
VPATH = @srcdir@
|
|
pkgdatadir = $(datadir)/@PACKAGE@
|
|
-pkglibdir = $(libdir)/@PACKAGE@
|
|
pkgincludedir = $(includedir)/@PACKAGE@
|
|
+pkglibdir = $(libdir)/@PACKAGE@
|
|
+pkglibexecdir = $(libexecdir)/@PACKAGE@
|
|
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
|
|
install_sh_DATA = $(install_sh) -c -m 644
|
|
install_sh_PROGRAM = $(install_sh) -c
|
|
@@ -44,6 +46,7 @@ am__configure_deps = $(am__aclocal_m4_de
|
|
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
|
|
CONFIG_HEADER = $(top_builddir)/config.h
|
|
CONFIG_CLEAN_FILES =
|
|
+CONFIG_CLEAN_VPATH_FILES =
|
|
LTLIBRARIES = $(noinst_LTLIBRARIES)
|
|
libgtop_sysdeps_2_0_la_DEPENDENCIES =
|
|
am_libgtop_sysdeps_2_0_la_OBJECTS = open.lo close.lo siglist.lo cpu.lo \
|
|
@@ -67,6 +70,7 @@ libgtop_sysdeps_suid_2_0_la_LINK = $(LIB
|
|
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
|
|
depcomp = $(SHELL) $(top_srcdir)/depcomp
|
|
am__depfiles_maybe = depfiles
|
|
+am__mv = mv -f
|
|
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
|
|
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
|
|
LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
|
|
@@ -85,9 +89,23 @@ am__vpath_adj = case $$p in \
|
|
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
|
|
*) f=$$p;; \
|
|
esac;
|
|
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
|
|
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
|
|
+am__install_max = 40
|
|
+am__nobase_strip_setup = \
|
|
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
|
|
+am__nobase_strip = \
|
|
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
|
|
+am__nobase_list = $(am__nobase_strip_setup); \
|
|
+ for p in $$list; do echo "$$p $$p"; done | \
|
|
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
|
|
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
|
|
+ if (++n[$$2] == $(am__install_max)) \
|
|
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
|
|
+ END { for (dir in files) print dir, files[dir] }'
|
|
+am__base_list = \
|
|
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
|
|
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
|
|
am__installdirs = "$(DESTDIR)$(libgtopincludedir)"
|
|
-libgtopincludeHEADERS_INSTALL = $(INSTALL_HEADER)
|
|
HEADERS = $(libgtopinclude_HEADERS) $(noinst_HEADERS)
|
|
ETAGS = etags
|
|
CTAGS = ctags
|
|
@@ -140,29 +158,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
|
|
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
|
|
INSTOBJEXT = @INSTOBJEXT@
|
|
INTLLIBS = @INTLLIBS@
|
|
-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
|
|
-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
|
|
-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
|
|
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
|
|
-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
|
|
-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
|
|
INTLTOOL_MERGE = @INTLTOOL_MERGE@
|
|
-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@
|
|
-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
|
|
-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
|
|
-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
|
|
-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
|
|
-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
|
|
-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
|
|
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
|
|
-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
|
|
-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
|
|
-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
|
|
KVM_LIBS = @KVM_LIBS@
|
|
LD = @LD@
|
|
LDFLAGS = @LDFLAGS@
|
|
@@ -201,6 +200,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
|
|
PACKAGE_NAME = @PACKAGE_NAME@
|
|
PACKAGE_STRING = @PACKAGE_STRING@
|
|
PACKAGE_TARNAME = @PACKAGE_TARNAME@
|
|
+PACKAGE_URL = @PACKAGE_URL@
|
|
PACKAGE_VERSION = @PACKAGE_VERSION@
|
|
PATH_SEPARATOR = @PATH_SEPARATOR@
|
|
PERL = @PERL@
|
|
@@ -282,6 +282,7 @@ sysconfdir = @sysconfdir@
|
|
sysdeps_dir = @sysdeps_dir@
|
|
sysdeps_suid_lib = @sysdeps_suid_lib@
|
|
target_alias = @target_alias@
|
|
+top_build_prefix = @top_build_prefix@
|
|
top_builddir = @top_builddir@
|
|
top_srcdir = @top_srcdir@
|
|
noinst_LTLIBRARIES = libgtop_sysdeps-2.0.la libgtop_sysdeps_suid-2.0.la
|
|
@@ -314,9 +315,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefi
|
|
exit 1;; \
|
|
esac; \
|
|
done; \
|
|
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu sysdeps/osf1/Makefile'; \
|
|
- cd $(top_srcdir) && \
|
|
- $(AUTOMAKE) --gnu sysdeps/osf1/Makefile
|
|
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu sysdeps/osf1/Makefile'; \
|
|
+ $(am__cd) $(top_srcdir) && \
|
|
+ $(AUTOMAKE) --gnu sysdeps/osf1/Makefile
|
|
.PRECIOUS: Makefile
|
|
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
|
|
@case '$?' in \
|
|
@@ -334,6 +335,7 @@ $(top_srcdir)/configure: $(am__configur
|
|
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
|
|
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
|
|
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
|
|
+$(am__aclocal_m4_deps):
|
|
|
|
clean-noinstLTLIBRARIES:
|
|
-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
|
|
@@ -382,21 +384,21 @@ distclean-compile:
|
|
|
|
.c.o:
|
|
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
|
|
-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
|
|
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
|
|
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
|
|
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
|
@am__fastdepCC_FALSE@ $(COMPILE) -c $<
|
|
|
|
.c.obj:
|
|
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
|
|
-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
|
|
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
|
|
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
|
|
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
|
@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
|
|
|
|
.c.lo:
|
|
@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
|
|
-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
|
|
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
|
|
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
|
|
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
|
@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
|
|
@@ -409,20 +411,23 @@ clean-libtool:
|
|
install-libgtopincludeHEADERS: $(libgtopinclude_HEADERS)
|
|
@$(NORMAL_INSTALL)
|
|
test -z "$(libgtopincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libgtopincludedir)"
|
|
- @list='$(libgtopinclude_HEADERS)'; for p in $$list; do \
|
|
+ @list='$(libgtopinclude_HEADERS)'; test -n "$(libgtopincludedir)" || list=; \
|
|
+ for p in $$list; do \
|
|
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
|
|
- f=$(am__strip_dir) \
|
|
- echo " $(libgtopincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(libgtopincludedir)/$$f'"; \
|
|
- $(libgtopincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(libgtopincludedir)/$$f"; \
|
|
+ echo "$$d$$p"; \
|
|
+ done | $(am__base_list) | \
|
|
+ while read files; do \
|
|
+ echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(libgtopincludedir)'"; \
|
|
+ $(INSTALL_HEADER) $$files "$(DESTDIR)$(libgtopincludedir)" || exit $$?; \
|
|
done
|
|
|
|
uninstall-libgtopincludeHEADERS:
|
|
@$(NORMAL_UNINSTALL)
|
|
- @list='$(libgtopinclude_HEADERS)'; for p in $$list; do \
|
|
- f=$(am__strip_dir) \
|
|
- echo " rm -f '$(DESTDIR)$(libgtopincludedir)/$$f'"; \
|
|
- rm -f "$(DESTDIR)$(libgtopincludedir)/$$f"; \
|
|
- done
|
|
+ @list='$(libgtopinclude_HEADERS)'; test -n "$(libgtopincludedir)" || list=; \
|
|
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
|
|
+ test -n "$$files" || exit 0; \
|
|
+ echo " ( cd '$(DESTDIR)$(libgtopincludedir)' && rm -f" $$files ")"; \
|
|
+ cd "$(DESTDIR)$(libgtopincludedir)" && rm -f $$files
|
|
|
|
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
|
|
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
|
|
@@ -436,7 +441,7 @@ tags: TAGS
|
|
|
|
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
|
|
$(TAGS_FILES) $(LISP)
|
|
- tags=; \
|
|
+ set x; \
|
|
here=`pwd`; \
|
|
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
|
|
unique=`for i in $$list; do \
|
|
@@ -444,29 +449,34 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP
|
|
done | \
|
|
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
|
|
END { if (nonempty) { for (i in files) print i; }; }'`; \
|
|
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
|
|
+ shift; \
|
|
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
|
|
test -n "$$unique" || unique=$$empty_fix; \
|
|
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
|
|
- $$tags $$unique; \
|
|
+ if test $$# -gt 0; then \
|
|
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
|
|
+ "$$@" $$unique; \
|
|
+ else \
|
|
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
|
|
+ $$unique; \
|
|
+ fi; \
|
|
fi
|
|
ctags: CTAGS
|
|
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
|
|
$(TAGS_FILES) $(LISP)
|
|
- tags=; \
|
|
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
|
|
unique=`for i in $$list; do \
|
|
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
|
|
done | \
|
|
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
|
|
END { if (nonempty) { for (i in files) print i; }; }'`; \
|
|
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
|
|
+ test -z "$(CTAGS_ARGS)$$unique" \
|
|
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
|
|
- $$tags $$unique
|
|
+ $$unique
|
|
|
|
GTAGS:
|
|
here=`$(am__cd) $(top_builddir) && pwd` \
|
|
- && cd $(top_srcdir) \
|
|
- && gtags -i $(GTAGS_ARGS) $$here
|
|
+ && $(am__cd) $(top_srcdir) \
|
|
+ && gtags -i $(GTAGS_ARGS) "$$here"
|
|
|
|
distclean-tags:
|
|
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
|
|
@@ -487,13 +497,17 @@ distdir: $(DISTFILES)
|
|
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
|
|
if test -d $$d/$$file; then \
|
|
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
|
|
+ if test -d "$(distdir)/$$file"; then \
|
|
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
|
|
+ fi; \
|
|
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
|
|
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
|
|
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
|
|
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
|
|
fi; \
|
|
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
|
|
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
|
|
else \
|
|
- test -f $(distdir)/$$file \
|
|
- || cp -p $$d/$$file $(distdir)/$$file \
|
|
+ test -f "$(distdir)/$$file" \
|
|
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|
|
|| exit 1; \
|
|
fi; \
|
|
done
|
|
@@ -524,6 +538,7 @@ clean-generic:
|
|
|
|
distclean-generic:
|
|
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
|
|
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
|
|
|
|
maintainer-clean-generic:
|
|
@echo "This command is intended for maintainers to use"
|
|
@@ -545,6 +560,8 @@ dvi-am:
|
|
|
|
html: html-am
|
|
|
|
+html-am:
|
|
+
|
|
info: info-am
|
|
|
|
info-am:
|
|
@@ -553,18 +570,28 @@ install-data-am: install-libgtopincludeH
|
|
|
|
install-dvi: install-dvi-am
|
|
|
|
+install-dvi-am:
|
|
+
|
|
install-exec-am:
|
|
|
|
install-html: install-html-am
|
|
|
|
+install-html-am:
|
|
+
|
|
install-info: install-info-am
|
|
|
|
+install-info-am:
|
|
+
|
|
install-man:
|
|
|
|
install-pdf: install-pdf-am
|
|
|
|
+install-pdf-am:
|
|
+
|
|
install-ps: install-ps-am
|
|
|
|
+install-ps-am:
|
|
+
|
|
installcheck-am:
|
|
|
|
maintainer-clean: maintainer-clean-am
|
|
@@ -603,6 +630,7 @@ uninstall-am: uninstall-libgtopincludeHE
|
|
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
|
|
tags uninstall uninstall-am uninstall-libgtopincludeHEADERS
|
|
|
|
+
|
|
# Tell versions [3.59,3.63) of GNU make to not export all variables.
|
|
# Otherwise a system limit (for SysV at least) may be exceeded.
|
|
.NOEXPORT:
|
|
Index: libgtop-2.28.0/sysdeps/solaris/Makefile.in
|
|
===================================================================
|
|
--- libgtop-2.28.0.orig/sysdeps/solaris/Makefile.in 2009-11-22 17:53:42.441191920 +0100
|
|
+++ libgtop-2.28.0/sysdeps/solaris/Makefile.in 2009-11-22 17:53:11.517684885 +0100
|
|
@@ -1,8 +1,9 @@
|
|
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
|
|
+# Makefile.in generated by automake 1.11 from Makefile.am.
|
|
# @configure_input@
|
|
|
|
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
|
|
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
|
|
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
|
|
+# Inc.
|
|
# This Makefile.in is free software; the Free Software Foundation
|
|
# gives unlimited permission to copy and/or distribute it,
|
|
# with or without modifications, as long as this notice is preserved.
|
|
@@ -17,8 +18,9 @@
|
|
|
|
VPATH = @srcdir@
|
|
pkgdatadir = $(datadir)/@PACKAGE@
|
|
-pkglibdir = $(libdir)/@PACKAGE@
|
|
pkgincludedir = $(includedir)/@PACKAGE@
|
|
+pkglibdir = $(libdir)/@PACKAGE@
|
|
+pkglibexecdir = $(libexecdir)/@PACKAGE@
|
|
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
|
|
install_sh_DATA = $(install_sh) -c -m 644
|
|
install_sh_PROGRAM = $(install_sh) -c
|
|
@@ -44,6 +46,7 @@ am__configure_deps = $(am__aclocal_m4_de
|
|
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
|
|
CONFIG_HEADER = $(top_builddir)/config.h
|
|
CONFIG_CLEAN_FILES =
|
|
+CONFIG_CLEAN_VPATH_FILES =
|
|
LTLIBRARIES = $(noinst_LTLIBRARIES)
|
|
libgtop_sysdeps_2_0_la_DEPENDENCIES =
|
|
am_libgtop_sysdeps_2_0_la_OBJECTS = open.lo close.lo siglist.lo cpu.lo \
|
|
@@ -67,6 +70,7 @@ libgtop_sysdeps_suid_2_0_la_LINK = $(LIB
|
|
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
|
|
depcomp = $(SHELL) $(top_srcdir)/depcomp
|
|
am__depfiles_maybe = depfiles
|
|
+am__mv = mv -f
|
|
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
|
|
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
|
|
LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
|
|
@@ -85,9 +89,23 @@ am__vpath_adj = case $$p in \
|
|
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
|
|
*) f=$$p;; \
|
|
esac;
|
|
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
|
|
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
|
|
+am__install_max = 40
|
|
+am__nobase_strip_setup = \
|
|
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
|
|
+am__nobase_strip = \
|
|
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
|
|
+am__nobase_list = $(am__nobase_strip_setup); \
|
|
+ for p in $$list; do echo "$$p $$p"; done | \
|
|
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
|
|
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
|
|
+ if (++n[$$2] == $(am__install_max)) \
|
|
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
|
|
+ END { for (dir in files) print dir, files[dir] }'
|
|
+am__base_list = \
|
|
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
|
|
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
|
|
am__installdirs = "$(DESTDIR)$(libgtopincludedir)"
|
|
-libgtopincludeHEADERS_INSTALL = $(INSTALL_HEADER)
|
|
HEADERS = $(libgtopinclude_HEADERS) $(noinst_HEADERS)
|
|
ETAGS = etags
|
|
CTAGS = ctags
|
|
@@ -140,29 +158,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
|
|
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
|
|
INSTOBJEXT = @INSTOBJEXT@
|
|
INTLLIBS = @INTLLIBS@
|
|
-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
|
|
-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
|
|
-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
|
|
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
|
|
-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
|
|
-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
|
|
INTLTOOL_MERGE = @INTLTOOL_MERGE@
|
|
-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@
|
|
-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
|
|
-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
|
|
-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
|
|
-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
|
|
-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
|
|
-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
|
|
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
|
|
-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
|
|
-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
|
|
-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
|
|
KVM_LIBS = @KVM_LIBS@
|
|
LD = @LD@
|
|
LDFLAGS = @LDFLAGS@
|
|
@@ -201,6 +200,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
|
|
PACKAGE_NAME = @PACKAGE_NAME@
|
|
PACKAGE_STRING = @PACKAGE_STRING@
|
|
PACKAGE_TARNAME = @PACKAGE_TARNAME@
|
|
+PACKAGE_URL = @PACKAGE_URL@
|
|
PACKAGE_VERSION = @PACKAGE_VERSION@
|
|
PATH_SEPARATOR = @PATH_SEPARATOR@
|
|
PERL = @PERL@
|
|
@@ -282,6 +282,7 @@ sysconfdir = @sysconfdir@
|
|
sysdeps_dir = @sysdeps_dir@
|
|
sysdeps_suid_lib = @sysdeps_suid_lib@
|
|
target_alias = @target_alias@
|
|
+top_build_prefix = @top_build_prefix@
|
|
top_builddir = @top_builddir@
|
|
top_srcdir = @top_srcdir@
|
|
noinst_LTLIBRARIES = libgtop_sysdeps-2.0.la libgtop_sysdeps_suid-2.0.la
|
|
@@ -315,9 +316,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefi
|
|
exit 1;; \
|
|
esac; \
|
|
done; \
|
|
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu sysdeps/solaris/Makefile'; \
|
|
- cd $(top_srcdir) && \
|
|
- $(AUTOMAKE) --gnu sysdeps/solaris/Makefile
|
|
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu sysdeps/solaris/Makefile'; \
|
|
+ $(am__cd) $(top_srcdir) && \
|
|
+ $(AUTOMAKE) --gnu sysdeps/solaris/Makefile
|
|
.PRECIOUS: Makefile
|
|
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
|
|
@case '$?' in \
|
|
@@ -335,6 +336,7 @@ $(top_srcdir)/configure: $(am__configur
|
|
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
|
|
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
|
|
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
|
|
+$(am__aclocal_m4_deps):
|
|
|
|
clean-noinstLTLIBRARIES:
|
|
-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
|
|
@@ -387,21 +389,21 @@ distclean-compile:
|
|
|
|
.c.o:
|
|
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
|
|
-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
|
|
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
|
|
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
|
|
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
|
@am__fastdepCC_FALSE@ $(COMPILE) -c $<
|
|
|
|
.c.obj:
|
|
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
|
|
-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
|
|
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
|
|
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
|
|
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
|
@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
|
|
|
|
.c.lo:
|
|
@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
|
|
-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
|
|
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
|
|
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
|
|
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
|
@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
|
|
@@ -414,20 +416,23 @@ clean-libtool:
|
|
install-libgtopincludeHEADERS: $(libgtopinclude_HEADERS)
|
|
@$(NORMAL_INSTALL)
|
|
test -z "$(libgtopincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libgtopincludedir)"
|
|
- @list='$(libgtopinclude_HEADERS)'; for p in $$list; do \
|
|
+ @list='$(libgtopinclude_HEADERS)'; test -n "$(libgtopincludedir)" || list=; \
|
|
+ for p in $$list; do \
|
|
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
|
|
- f=$(am__strip_dir) \
|
|
- echo " $(libgtopincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(libgtopincludedir)/$$f'"; \
|
|
- $(libgtopincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(libgtopincludedir)/$$f"; \
|
|
+ echo "$$d$$p"; \
|
|
+ done | $(am__base_list) | \
|
|
+ while read files; do \
|
|
+ echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(libgtopincludedir)'"; \
|
|
+ $(INSTALL_HEADER) $$files "$(DESTDIR)$(libgtopincludedir)" || exit $$?; \
|
|
done
|
|
|
|
uninstall-libgtopincludeHEADERS:
|
|
@$(NORMAL_UNINSTALL)
|
|
- @list='$(libgtopinclude_HEADERS)'; for p in $$list; do \
|
|
- f=$(am__strip_dir) \
|
|
- echo " rm -f '$(DESTDIR)$(libgtopincludedir)/$$f'"; \
|
|
- rm -f "$(DESTDIR)$(libgtopincludedir)/$$f"; \
|
|
- done
|
|
+ @list='$(libgtopinclude_HEADERS)'; test -n "$(libgtopincludedir)" || list=; \
|
|
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
|
|
+ test -n "$$files" || exit 0; \
|
|
+ echo " ( cd '$(DESTDIR)$(libgtopincludedir)' && rm -f" $$files ")"; \
|
|
+ cd "$(DESTDIR)$(libgtopincludedir)" && rm -f $$files
|
|
|
|
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
|
|
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
|
|
@@ -441,7 +446,7 @@ tags: TAGS
|
|
|
|
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
|
|
$(TAGS_FILES) $(LISP)
|
|
- tags=; \
|
|
+ set x; \
|
|
here=`pwd`; \
|
|
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
|
|
unique=`for i in $$list; do \
|
|
@@ -449,29 +454,34 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP
|
|
done | \
|
|
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
|
|
END { if (nonempty) { for (i in files) print i; }; }'`; \
|
|
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
|
|
+ shift; \
|
|
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
|
|
test -n "$$unique" || unique=$$empty_fix; \
|
|
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
|
|
- $$tags $$unique; \
|
|
+ if test $$# -gt 0; then \
|
|
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
|
|
+ "$$@" $$unique; \
|
|
+ else \
|
|
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
|
|
+ $$unique; \
|
|
+ fi; \
|
|
fi
|
|
ctags: CTAGS
|
|
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
|
|
$(TAGS_FILES) $(LISP)
|
|
- tags=; \
|
|
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
|
|
unique=`for i in $$list; do \
|
|
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
|
|
done | \
|
|
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
|
|
END { if (nonempty) { for (i in files) print i; }; }'`; \
|
|
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
|
|
+ test -z "$(CTAGS_ARGS)$$unique" \
|
|
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
|
|
- $$tags $$unique
|
|
+ $$unique
|
|
|
|
GTAGS:
|
|
here=`$(am__cd) $(top_builddir) && pwd` \
|
|
- && cd $(top_srcdir) \
|
|
- && gtags -i $(GTAGS_ARGS) $$here
|
|
+ && $(am__cd) $(top_srcdir) \
|
|
+ && gtags -i $(GTAGS_ARGS) "$$here"
|
|
|
|
distclean-tags:
|
|
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
|
|
@@ -492,13 +502,17 @@ distdir: $(DISTFILES)
|
|
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
|
|
if test -d $$d/$$file; then \
|
|
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
|
|
+ if test -d "$(distdir)/$$file"; then \
|
|
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
|
|
+ fi; \
|
|
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
|
|
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
|
|
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
|
|
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
|
|
fi; \
|
|
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
|
|
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
|
|
else \
|
|
- test -f $(distdir)/$$file \
|
|
- || cp -p $$d/$$file $(distdir)/$$file \
|
|
+ test -f "$(distdir)/$$file" \
|
|
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|
|
|| exit 1; \
|
|
fi; \
|
|
done
|
|
@@ -529,6 +543,7 @@ clean-generic:
|
|
|
|
distclean-generic:
|
|
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
|
|
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
|
|
|
|
maintainer-clean-generic:
|
|
@echo "This command is intended for maintainers to use"
|
|
@@ -550,6 +565,8 @@ dvi-am:
|
|
|
|
html: html-am
|
|
|
|
+html-am:
|
|
+
|
|
info: info-am
|
|
|
|
info-am:
|
|
@@ -558,18 +575,28 @@ install-data-am: install-libgtopincludeH
|
|
|
|
install-dvi: install-dvi-am
|
|
|
|
+install-dvi-am:
|
|
+
|
|
install-exec-am:
|
|
|
|
install-html: install-html-am
|
|
|
|
+install-html-am:
|
|
+
|
|
install-info: install-info-am
|
|
|
|
+install-info-am:
|
|
+
|
|
install-man:
|
|
|
|
install-pdf: install-pdf-am
|
|
|
|
+install-pdf-am:
|
|
+
|
|
install-ps: install-ps-am
|
|
|
|
+install-ps-am:
|
|
+
|
|
installcheck-am:
|
|
|
|
maintainer-clean: maintainer-clean-am
|
|
@@ -608,6 +635,7 @@ uninstall-am: uninstall-libgtopincludeHE
|
|
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
|
|
tags uninstall uninstall-am uninstall-libgtopincludeHEADERS
|
|
|
|
+
|
|
# Tell versions [3.59,3.63) of GNU make to not export all variables.
|
|
# Otherwise a system limit (for SysV at least) may be exceeded.
|
|
.NOEXPORT:
|
|
Index: libgtop-2.28.0/sysdeps/stub/Makefile.in
|
|
===================================================================
|
|
--- libgtop-2.28.0.orig/sysdeps/stub/Makefile.in 2009-11-22 17:53:42.153194784 +0100
|
|
+++ libgtop-2.28.0/sysdeps/stub/Makefile.in 2009-11-22 17:53:11.625683883 +0100
|
|
@@ -1,8 +1,9 @@
|
|
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
|
|
+# Makefile.in generated by automake 1.11 from Makefile.am.
|
|
# @configure_input@
|
|
|
|
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
|
|
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
|
|
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
|
|
+# Inc.
|
|
# This Makefile.in is free software; the Free Software Foundation
|
|
# gives unlimited permission to copy and/or distribute it,
|
|
# with or without modifications, as long as this notice is preserved.
|
|
@@ -17,8 +18,9 @@
|
|
|
|
VPATH = @srcdir@
|
|
pkgdatadir = $(datadir)/@PACKAGE@
|
|
-pkglibdir = $(libdir)/@PACKAGE@
|
|
pkgincludedir = $(includedir)/@PACKAGE@
|
|
+pkglibdir = $(libdir)/@PACKAGE@
|
|
+pkglibexecdir = $(libexecdir)/@PACKAGE@
|
|
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
|
|
install_sh_DATA = $(install_sh) -c -m 644
|
|
install_sh_PROGRAM = $(install_sh) -c
|
|
@@ -44,6 +46,7 @@ am__configure_deps = $(am__aclocal_m4_de
|
|
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
|
|
CONFIG_HEADER = $(top_builddir)/config.h
|
|
CONFIG_CLEAN_FILES =
|
|
+CONFIG_CLEAN_VPATH_FILES =
|
|
LTLIBRARIES = $(noinst_LTLIBRARIES)
|
|
libgtop_sysdeps_2_0_la_LIBADD =
|
|
am_libgtop_sysdeps_2_0_la_OBJECTS = open.lo close.lo siglist.lo cpu.lo \
|
|
@@ -51,7 +54,8 @@ am_libgtop_sysdeps_2_0_la_OBJECTS = open
|
|
msg_limits.lo sem_limits.lo proclist.lo procstate.lo \
|
|
procuid.lo proctime.lo procmem.lo procsignal.lo prockernel.lo \
|
|
procsegment.lo procargs.lo procmap.lo netload.lo ppp.lo \
|
|
- netlist.lo procopenfiles.lo
|
|
+ netlist.lo procopenfiles.lo procwd.lo procaffinity.lo \
|
|
+ sysinfo.lo
|
|
libgtop_sysdeps_2_0_la_OBJECTS = $(am_libgtop_sysdeps_2_0_la_OBJECTS)
|
|
libgtop_sysdeps_2_0_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
|
|
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
|
|
@@ -59,6 +63,7 @@ libgtop_sysdeps_2_0_la_LINK = $(LIBTOOL)
|
|
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
|
|
depcomp = $(SHELL) $(top_srcdir)/depcomp
|
|
am__depfiles_maybe = depfiles
|
|
+am__mv = mv -f
|
|
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
|
|
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
|
|
LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
|
|
@@ -75,9 +80,23 @@ am__vpath_adj = case $$p in \
|
|
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
|
|
*) f=$$p;; \
|
|
esac;
|
|
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
|
|
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
|
|
+am__install_max = 40
|
|
+am__nobase_strip_setup = \
|
|
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
|
|
+am__nobase_strip = \
|
|
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
|
|
+am__nobase_list = $(am__nobase_strip_setup); \
|
|
+ for p in $$list; do echo "$$p $$p"; done | \
|
|
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
|
|
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
|
|
+ if (++n[$$2] == $(am__install_max)) \
|
|
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
|
|
+ END { for (dir in files) print dir, files[dir] }'
|
|
+am__base_list = \
|
|
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
|
|
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
|
|
am__installdirs = "$(DESTDIR)$(libgtopincludedir)"
|
|
-libgtopincludeHEADERS_INSTALL = $(INSTALL_HEADER)
|
|
HEADERS = $(libgtopinclude_HEADERS)
|
|
ETAGS = etags
|
|
CTAGS = ctags
|
|
@@ -130,29 +149,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
|
|
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
|
|
INSTOBJEXT = @INSTOBJEXT@
|
|
INTLLIBS = @INTLLIBS@
|
|
-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
|
|
-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
|
|
-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
|
|
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
|
|
-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
|
|
-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
|
|
INTLTOOL_MERGE = @INTLTOOL_MERGE@
|
|
-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@
|
|
-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
|
|
-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
|
|
-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
|
|
-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
|
|
-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
|
|
-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
|
|
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
|
|
-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
|
|
-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
|
|
-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
|
|
KVM_LIBS = @KVM_LIBS@
|
|
LD = @LD@
|
|
LDFLAGS = @LDFLAGS@
|
|
@@ -191,6 +191,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
|
|
PACKAGE_NAME = @PACKAGE_NAME@
|
|
PACKAGE_STRING = @PACKAGE_STRING@
|
|
PACKAGE_TARNAME = @PACKAGE_TARNAME@
|
|
+PACKAGE_URL = @PACKAGE_URL@
|
|
PACKAGE_VERSION = @PACKAGE_VERSION@
|
|
PATH_SEPARATOR = @PATH_SEPARATOR@
|
|
PERL = @PERL@
|
|
@@ -272,6 +273,7 @@ sysconfdir = @sysconfdir@
|
|
sysdeps_dir = @sysdeps_dir@
|
|
sysdeps_suid_lib = @sysdeps_suid_lib@
|
|
target_alias = @target_alias@
|
|
+top_build_prefix = @top_build_prefix@
|
|
top_builddir = @top_builddir@
|
|
top_srcdir = @top_srcdir@
|
|
noinst_LTLIBRARIES = libgtop_sysdeps-2.0.la
|
|
@@ -280,7 +282,8 @@ libgtop_sysdeps_2_0_la_SOURCES = open.c
|
|
sem_limits.c proclist.c procstate.c procuid.c \
|
|
proctime.c procmem.c procsignal.c prockernel.c \
|
|
procsegment.c procargs.c procmap.c netload.c \
|
|
- ppp.c netlist.c procopenfiles.c
|
|
+ ppp.c netlist.c procopenfiles.c procwd.c \
|
|
+ procaffinity.c sysinfo.c
|
|
|
|
libgtop_sysdeps_2_0_la_LDFLAGS = $(LT_VERSION_INFO)
|
|
libgtopinclude_HEADERS = glibtop_server.h
|
|
@@ -298,9 +301,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefi
|
|
exit 1;; \
|
|
esac; \
|
|
done; \
|
|
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu sysdeps/stub/Makefile'; \
|
|
- cd $(top_srcdir) && \
|
|
- $(AUTOMAKE) --gnu sysdeps/stub/Makefile
|
|
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu sysdeps/stub/Makefile'; \
|
|
+ $(am__cd) $(top_srcdir) && \
|
|
+ $(AUTOMAKE) --gnu sysdeps/stub/Makefile
|
|
.PRECIOUS: Makefile
|
|
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
|
|
@case '$?' in \
|
|
@@ -318,6 +321,7 @@ $(top_srcdir)/configure: $(am__configur
|
|
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
|
|
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
|
|
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
|
|
+$(am__aclocal_m4_deps):
|
|
|
|
clean-noinstLTLIBRARIES:
|
|
-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
|
|
@@ -345,6 +349,7 @@ distclean-compile:
|
|
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/netload.Plo@am__quote@
|
|
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/open.Plo@am__quote@
|
|
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ppp.Plo@am__quote@
|
|
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/procaffinity.Plo@am__quote@
|
|
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/procargs.Plo@am__quote@
|
|
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/prockernel.Plo@am__quote@
|
|
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/proclist.Plo@am__quote@
|
|
@@ -356,29 +361,31 @@ distclean-compile:
|
|
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/procstate.Plo@am__quote@
|
|
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/proctime.Plo@am__quote@
|
|
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/procuid.Plo@am__quote@
|
|
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/procwd.Plo@am__quote@
|
|
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sem_limits.Plo@am__quote@
|
|
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/shm_limits.Plo@am__quote@
|
|
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/siglist.Plo@am__quote@
|
|
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/swap.Plo@am__quote@
|
|
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sysinfo.Plo@am__quote@
|
|
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/uptime.Plo@am__quote@
|
|
|
|
.c.o:
|
|
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
|
|
-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
|
|
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
|
|
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
|
|
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
|
@am__fastdepCC_FALSE@ $(COMPILE) -c $<
|
|
|
|
.c.obj:
|
|
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
|
|
-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
|
|
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
|
|
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
|
|
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
|
@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
|
|
|
|
.c.lo:
|
|
@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
|
|
-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
|
|
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
|
|
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
|
|
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
|
@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
|
|
@@ -391,20 +398,23 @@ clean-libtool:
|
|
install-libgtopincludeHEADERS: $(libgtopinclude_HEADERS)
|
|
@$(NORMAL_INSTALL)
|
|
test -z "$(libgtopincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libgtopincludedir)"
|
|
- @list='$(libgtopinclude_HEADERS)'; for p in $$list; do \
|
|
+ @list='$(libgtopinclude_HEADERS)'; test -n "$(libgtopincludedir)" || list=; \
|
|
+ for p in $$list; do \
|
|
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
|
|
- f=$(am__strip_dir) \
|
|
- echo " $(libgtopincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(libgtopincludedir)/$$f'"; \
|
|
- $(libgtopincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(libgtopincludedir)/$$f"; \
|
|
+ echo "$$d$$p"; \
|
|
+ done | $(am__base_list) | \
|
|
+ while read files; do \
|
|
+ echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(libgtopincludedir)'"; \
|
|
+ $(INSTALL_HEADER) $$files "$(DESTDIR)$(libgtopincludedir)" || exit $$?; \
|
|
done
|
|
|
|
uninstall-libgtopincludeHEADERS:
|
|
@$(NORMAL_UNINSTALL)
|
|
- @list='$(libgtopinclude_HEADERS)'; for p in $$list; do \
|
|
- f=$(am__strip_dir) \
|
|
- echo " rm -f '$(DESTDIR)$(libgtopincludedir)/$$f'"; \
|
|
- rm -f "$(DESTDIR)$(libgtopincludedir)/$$f"; \
|
|
- done
|
|
+ @list='$(libgtopinclude_HEADERS)'; test -n "$(libgtopincludedir)" || list=; \
|
|
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
|
|
+ test -n "$$files" || exit 0; \
|
|
+ echo " ( cd '$(DESTDIR)$(libgtopincludedir)' && rm -f" $$files ")"; \
|
|
+ cd "$(DESTDIR)$(libgtopincludedir)" && rm -f $$files
|
|
|
|
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
|
|
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
|
|
@@ -418,7 +428,7 @@ tags: TAGS
|
|
|
|
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
|
|
$(TAGS_FILES) $(LISP)
|
|
- tags=; \
|
|
+ set x; \
|
|
here=`pwd`; \
|
|
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
|
|
unique=`for i in $$list; do \
|
|
@@ -426,29 +436,34 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP
|
|
done | \
|
|
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
|
|
END { if (nonempty) { for (i in files) print i; }; }'`; \
|
|
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
|
|
+ shift; \
|
|
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
|
|
test -n "$$unique" || unique=$$empty_fix; \
|
|
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
|
|
- $$tags $$unique; \
|
|
+ if test $$# -gt 0; then \
|
|
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
|
|
+ "$$@" $$unique; \
|
|
+ else \
|
|
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
|
|
+ $$unique; \
|
|
+ fi; \
|
|
fi
|
|
ctags: CTAGS
|
|
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
|
|
$(TAGS_FILES) $(LISP)
|
|
- tags=; \
|
|
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
|
|
unique=`for i in $$list; do \
|
|
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
|
|
done | \
|
|
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
|
|
END { if (nonempty) { for (i in files) print i; }; }'`; \
|
|
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
|
|
+ test -z "$(CTAGS_ARGS)$$unique" \
|
|
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
|
|
- $$tags $$unique
|
|
+ $$unique
|
|
|
|
GTAGS:
|
|
here=`$(am__cd) $(top_builddir) && pwd` \
|
|
- && cd $(top_srcdir) \
|
|
- && gtags -i $(GTAGS_ARGS) $$here
|
|
+ && $(am__cd) $(top_srcdir) \
|
|
+ && gtags -i $(GTAGS_ARGS) "$$here"
|
|
|
|
distclean-tags:
|
|
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
|
|
@@ -469,13 +484,17 @@ distdir: $(DISTFILES)
|
|
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
|
|
if test -d $$d/$$file; then \
|
|
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
|
|
+ if test -d "$(distdir)/$$file"; then \
|
|
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
|
|
+ fi; \
|
|
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
|
|
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
|
|
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
|
|
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
|
|
fi; \
|
|
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
|
|
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
|
|
else \
|
|
- test -f $(distdir)/$$file \
|
|
- || cp -p $$d/$$file $(distdir)/$$file \
|
|
+ test -f "$(distdir)/$$file" \
|
|
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|
|
|| exit 1; \
|
|
fi; \
|
|
done
|
|
@@ -506,6 +525,7 @@ clean-generic:
|
|
|
|
distclean-generic:
|
|
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
|
|
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
|
|
|
|
maintainer-clean-generic:
|
|
@echo "This command is intended for maintainers to use"
|
|
@@ -527,6 +547,8 @@ dvi-am:
|
|
|
|
html: html-am
|
|
|
|
+html-am:
|
|
+
|
|
info: info-am
|
|
|
|
info-am:
|
|
@@ -535,18 +557,28 @@ install-data-am: install-libgtopincludeH
|
|
|
|
install-dvi: install-dvi-am
|
|
|
|
+install-dvi-am:
|
|
+
|
|
install-exec-am:
|
|
|
|
install-html: install-html-am
|
|
|
|
+install-html-am:
|
|
+
|
|
install-info: install-info-am
|
|
|
|
+install-info-am:
|
|
+
|
|
install-man:
|
|
|
|
install-pdf: install-pdf-am
|
|
|
|
+install-pdf-am:
|
|
+
|
|
install-ps: install-ps-am
|
|
|
|
+install-ps-am:
|
|
+
|
|
installcheck-am:
|
|
|
|
maintainer-clean: maintainer-clean-am
|
|
@@ -585,6 +617,7 @@ uninstall-am: uninstall-libgtopincludeHE
|
|
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
|
|
tags uninstall uninstall-am uninstall-libgtopincludeHEADERS
|
|
|
|
+
|
|
# Tell versions [3.59,3.63) of GNU make to not export all variables.
|
|
# Otherwise a system limit (for SysV at least) may be exceeded.
|
|
.NOEXPORT:
|
|
Index: libgtop-2.28.0/sysdeps/stub_suid/Makefile.in
|
|
===================================================================
|
|
--- libgtop-2.28.0.orig/sysdeps/stub_suid/Makefile.in 2009-11-22 17:53:43.509188414 +0100
|
|
+++ libgtop-2.28.0/sysdeps/stub_suid/Makefile.in 2009-11-22 17:53:11.749683235 +0100
|
|
@@ -1,8 +1,9 @@
|
|
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
|
|
+# Makefile.in generated by automake 1.11 from Makefile.am.
|
|
# @configure_input@
|
|
|
|
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
|
|
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
|
|
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
|
|
+# Inc.
|
|
# This Makefile.in is free software; the Free Software Foundation
|
|
# gives unlimited permission to copy and/or distribute it,
|
|
# with or without modifications, as long as this notice is preserved.
|
|
@@ -17,8 +18,9 @@
|
|
|
|
VPATH = @srcdir@
|
|
pkgdatadir = $(datadir)/@PACKAGE@
|
|
-pkglibdir = $(libdir)/@PACKAGE@
|
|
pkgincludedir = $(includedir)/@PACKAGE@
|
|
+pkglibdir = $(libdir)/@PACKAGE@
|
|
+pkglibexecdir = $(libexecdir)/@PACKAGE@
|
|
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
|
|
install_sh_DATA = $(install_sh) -c -m 644
|
|
install_sh_PROGRAM = $(install_sh) -c
|
|
@@ -44,6 +46,7 @@ am__configure_deps = $(am__aclocal_m4_de
|
|
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
|
|
CONFIG_HEADER = $(top_builddir)/config.h
|
|
CONFIG_CLEAN_FILES =
|
|
+CONFIG_CLEAN_VPATH_FILES =
|
|
LTLIBRARIES = $(noinst_LTLIBRARIES)
|
|
libgtop_sysdeps_2_0_la_LIBADD =
|
|
am_libgtop_sysdeps_2_0_la_OBJECTS = nosuid.lo siglist.lo
|
|
@@ -66,6 +69,7 @@ libgtop_sysdeps_suid_2_0_la_LINK = $(LIB
|
|
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
|
|
depcomp = $(SHELL) $(top_srcdir)/depcomp
|
|
am__depfiles_maybe = depfiles
|
|
+am__mv = mv -f
|
|
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
|
|
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
|
|
LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
|
|
@@ -84,9 +88,23 @@ am__vpath_adj = case $$p in \
|
|
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
|
|
*) f=$$p;; \
|
|
esac;
|
|
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
|
|
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
|
|
+am__install_max = 40
|
|
+am__nobase_strip_setup = \
|
|
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
|
|
+am__nobase_strip = \
|
|
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
|
|
+am__nobase_list = $(am__nobase_strip_setup); \
|
|
+ for p in $$list; do echo "$$p $$p"; done | \
|
|
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
|
|
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
|
|
+ if (++n[$$2] == $(am__install_max)) \
|
|
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
|
|
+ END { for (dir in files) print dir, files[dir] }'
|
|
+am__base_list = \
|
|
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
|
|
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
|
|
am__installdirs = "$(DESTDIR)$(libgtopincludedir)"
|
|
-libgtopincludeHEADERS_INSTALL = $(INSTALL_HEADER)
|
|
HEADERS = $(libgtopinclude_HEADERS) $(noinst_HEADERS)
|
|
ETAGS = etags
|
|
CTAGS = ctags
|
|
@@ -139,29 +157,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
|
|
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
|
|
INSTOBJEXT = @INSTOBJEXT@
|
|
INTLLIBS = @INTLLIBS@
|
|
-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
|
|
-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
|
|
-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
|
|
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
|
|
-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
|
|
-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
|
|
INTLTOOL_MERGE = @INTLTOOL_MERGE@
|
|
-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@
|
|
-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
|
|
-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
|
|
-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
|
|
-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
|
|
-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
|
|
-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
|
|
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
|
|
-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
|
|
-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
|
|
-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
|
|
KVM_LIBS = @KVM_LIBS@
|
|
LD = @LD@
|
|
LDFLAGS = @LDFLAGS@
|
|
@@ -200,6 +199,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
|
|
PACKAGE_NAME = @PACKAGE_NAME@
|
|
PACKAGE_STRING = @PACKAGE_STRING@
|
|
PACKAGE_TARNAME = @PACKAGE_TARNAME@
|
|
+PACKAGE_URL = @PACKAGE_URL@
|
|
PACKAGE_VERSION = @PACKAGE_VERSION@
|
|
PATH_SEPARATOR = @PATH_SEPARATOR@
|
|
PERL = @PERL@
|
|
@@ -281,6 +281,7 @@ sysconfdir = @sysconfdir@
|
|
sysdeps_dir = @sysdeps_dir@
|
|
sysdeps_suid_lib = @sysdeps_suid_lib@
|
|
target_alias = @target_alias@
|
|
+top_build_prefix = @top_build_prefix@
|
|
top_builddir = @top_builddir@
|
|
top_srcdir = @top_srcdir@
|
|
noinst_LTLIBRARIES = libgtop_sysdeps-2.0.la libgtop_sysdeps_suid-2.0.la
|
|
@@ -310,9 +311,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefi
|
|
exit 1;; \
|
|
esac; \
|
|
done; \
|
|
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu sysdeps/stub_suid/Makefile'; \
|
|
- cd $(top_srcdir) && \
|
|
- $(AUTOMAKE) --gnu sysdeps/stub_suid/Makefile
|
|
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu sysdeps/stub_suid/Makefile'; \
|
|
+ $(am__cd) $(top_srcdir) && \
|
|
+ $(AUTOMAKE) --gnu sysdeps/stub_suid/Makefile
|
|
.PRECIOUS: Makefile
|
|
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
|
|
@case '$?' in \
|
|
@@ -330,6 +331,7 @@ $(top_srcdir)/configure: $(am__configur
|
|
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
|
|
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
|
|
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
|
|
+$(am__aclocal_m4_deps):
|
|
|
|
clean-noinstLTLIBRARIES:
|
|
-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
|
|
@@ -377,21 +379,21 @@ distclean-compile:
|
|
|
|
.c.o:
|
|
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
|
|
-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
|
|
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
|
|
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
|
|
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
|
@am__fastdepCC_FALSE@ $(COMPILE) -c $<
|
|
|
|
.c.obj:
|
|
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
|
|
-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
|
|
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
|
|
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
|
|
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
|
@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
|
|
|
|
.c.lo:
|
|
@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
|
|
-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
|
|
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
|
|
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
|
|
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
|
@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
|
|
@@ -404,20 +406,23 @@ clean-libtool:
|
|
install-libgtopincludeHEADERS: $(libgtopinclude_HEADERS)
|
|
@$(NORMAL_INSTALL)
|
|
test -z "$(libgtopincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libgtopincludedir)"
|
|
- @list='$(libgtopinclude_HEADERS)'; for p in $$list; do \
|
|
+ @list='$(libgtopinclude_HEADERS)'; test -n "$(libgtopincludedir)" || list=; \
|
|
+ for p in $$list; do \
|
|
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
|
|
- f=$(am__strip_dir) \
|
|
- echo " $(libgtopincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(libgtopincludedir)/$$f'"; \
|
|
- $(libgtopincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(libgtopincludedir)/$$f"; \
|
|
+ echo "$$d$$p"; \
|
|
+ done | $(am__base_list) | \
|
|
+ while read files; do \
|
|
+ echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(libgtopincludedir)'"; \
|
|
+ $(INSTALL_HEADER) $$files "$(DESTDIR)$(libgtopincludedir)" || exit $$?; \
|
|
done
|
|
|
|
uninstall-libgtopincludeHEADERS:
|
|
@$(NORMAL_UNINSTALL)
|
|
- @list='$(libgtopinclude_HEADERS)'; for p in $$list; do \
|
|
- f=$(am__strip_dir) \
|
|
- echo " rm -f '$(DESTDIR)$(libgtopincludedir)/$$f'"; \
|
|
- rm -f "$(DESTDIR)$(libgtopincludedir)/$$f"; \
|
|
- done
|
|
+ @list='$(libgtopinclude_HEADERS)'; test -n "$(libgtopincludedir)" || list=; \
|
|
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
|
|
+ test -n "$$files" || exit 0; \
|
|
+ echo " ( cd '$(DESTDIR)$(libgtopincludedir)' && rm -f" $$files ")"; \
|
|
+ cd "$(DESTDIR)$(libgtopincludedir)" && rm -f $$files
|
|
|
|
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
|
|
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
|
|
@@ -431,7 +436,7 @@ tags: TAGS
|
|
|
|
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
|
|
$(TAGS_FILES) $(LISP)
|
|
- tags=; \
|
|
+ set x; \
|
|
here=`pwd`; \
|
|
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
|
|
unique=`for i in $$list; do \
|
|
@@ -439,29 +444,34 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP
|
|
done | \
|
|
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
|
|
END { if (nonempty) { for (i in files) print i; }; }'`; \
|
|
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
|
|
+ shift; \
|
|
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
|
|
test -n "$$unique" || unique=$$empty_fix; \
|
|
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
|
|
- $$tags $$unique; \
|
|
+ if test $$# -gt 0; then \
|
|
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
|
|
+ "$$@" $$unique; \
|
|
+ else \
|
|
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
|
|
+ $$unique; \
|
|
+ fi; \
|
|
fi
|
|
ctags: CTAGS
|
|
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
|
|
$(TAGS_FILES) $(LISP)
|
|
- tags=; \
|
|
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
|
|
unique=`for i in $$list; do \
|
|
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
|
|
done | \
|
|
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
|
|
END { if (nonempty) { for (i in files) print i; }; }'`; \
|
|
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
|
|
+ test -z "$(CTAGS_ARGS)$$unique" \
|
|
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
|
|
- $$tags $$unique
|
|
+ $$unique
|
|
|
|
GTAGS:
|
|
here=`$(am__cd) $(top_builddir) && pwd` \
|
|
- && cd $(top_srcdir) \
|
|
- && gtags -i $(GTAGS_ARGS) $$here
|
|
+ && $(am__cd) $(top_srcdir) \
|
|
+ && gtags -i $(GTAGS_ARGS) "$$here"
|
|
|
|
distclean-tags:
|
|
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
|
|
@@ -482,13 +492,17 @@ distdir: $(DISTFILES)
|
|
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
|
|
if test -d $$d/$$file; then \
|
|
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
|
|
+ if test -d "$(distdir)/$$file"; then \
|
|
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
|
|
+ fi; \
|
|
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
|
|
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
|
|
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
|
|
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
|
|
fi; \
|
|
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
|
|
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
|
|
else \
|
|
- test -f $(distdir)/$$file \
|
|
- || cp -p $$d/$$file $(distdir)/$$file \
|
|
+ test -f "$(distdir)/$$file" \
|
|
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|
|
|| exit 1; \
|
|
fi; \
|
|
done
|
|
@@ -519,6 +533,7 @@ clean-generic:
|
|
|
|
distclean-generic:
|
|
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
|
|
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
|
|
|
|
maintainer-clean-generic:
|
|
@echo "This command is intended for maintainers to use"
|
|
@@ -540,6 +555,8 @@ dvi-am:
|
|
|
|
html: html-am
|
|
|
|
+html-am:
|
|
+
|
|
info: info-am
|
|
|
|
info-am:
|
|
@@ -548,18 +565,28 @@ install-data-am: install-libgtopincludeH
|
|
|
|
install-dvi: install-dvi-am
|
|
|
|
+install-dvi-am:
|
|
+
|
|
install-exec-am:
|
|
|
|
install-html: install-html-am
|
|
|
|
+install-html-am:
|
|
+
|
|
install-info: install-info-am
|
|
|
|
+install-info-am:
|
|
+
|
|
install-man:
|
|
|
|
install-pdf: install-pdf-am
|
|
|
|
+install-pdf-am:
|
|
+
|
|
install-ps: install-ps-am
|
|
|
|
+install-ps-am:
|
|
+
|
|
installcheck-am:
|
|
|
|
maintainer-clean: maintainer-clean-am
|
|
@@ -598,6 +625,7 @@ uninstall-am: uninstall-libgtopincludeHE
|
|
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
|
|
tags uninstall uninstall-am uninstall-libgtopincludeHEADERS
|
|
|
|
+
|
|
# Tell versions [3.59,3.63) of GNU make to not export all variables.
|
|
# Otherwise a system limit (for SysV at least) may be exceeded.
|
|
.NOEXPORT:
|
|
Index: libgtop-2.28.0/sysdeps/sun4/Makefile.in
|
|
===================================================================
|
|
--- libgtop-2.28.0.orig/sysdeps/sun4/Makefile.in 2009-11-22 17:53:43.261187769 +0100
|
|
+++ libgtop-2.28.0/sysdeps/sun4/Makefile.in 2009-11-22 17:53:11.865683373 +0100
|
|
@@ -1,8 +1,9 @@
|
|
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
|
|
+# Makefile.in generated by automake 1.11 from Makefile.am.
|
|
# @configure_input@
|
|
|
|
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
|
|
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
|
|
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
|
|
+# Inc.
|
|
# This Makefile.in is free software; the Free Software Foundation
|
|
# gives unlimited permission to copy and/or distribute it,
|
|
# with or without modifications, as long as this notice is preserved.
|
|
@@ -17,8 +18,9 @@
|
|
|
|
VPATH = @srcdir@
|
|
pkgdatadir = $(datadir)/@PACKAGE@
|
|
-pkglibdir = $(libdir)/@PACKAGE@
|
|
pkgincludedir = $(includedir)/@PACKAGE@
|
|
+pkglibdir = $(libdir)/@PACKAGE@
|
|
+pkglibexecdir = $(libexecdir)/@PACKAGE@
|
|
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
|
|
install_sh_DATA = $(install_sh) -c -m 644
|
|
install_sh_PROGRAM = $(install_sh) -c
|
|
@@ -44,6 +46,7 @@ am__configure_deps = $(am__aclocal_m4_de
|
|
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
|
|
CONFIG_HEADER = $(top_builddir)/config.h
|
|
CONFIG_CLEAN_FILES =
|
|
+CONFIG_CLEAN_VPATH_FILES =
|
|
LTLIBRARIES = $(noinst_LTLIBRARIES)
|
|
libgtop_sysdeps_2_0_la_DEPENDENCIES =
|
|
am_libgtop_sysdeps_2_0_la_OBJECTS = nosuid.lo siglist.lo
|
|
@@ -66,6 +69,7 @@ libgtop_sysdeps_suid_2_0_la_LINK = $(LIB
|
|
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
|
|
depcomp = $(SHELL) $(top_srcdir)/depcomp
|
|
am__depfiles_maybe = depfiles
|
|
+am__mv = mv -f
|
|
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
|
|
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
|
|
LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
|
|
@@ -84,9 +88,23 @@ am__vpath_adj = case $$p in \
|
|
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
|
|
*) f=$$p;; \
|
|
esac;
|
|
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
|
|
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
|
|
+am__install_max = 40
|
|
+am__nobase_strip_setup = \
|
|
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
|
|
+am__nobase_strip = \
|
|
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
|
|
+am__nobase_list = $(am__nobase_strip_setup); \
|
|
+ for p in $$list; do echo "$$p $$p"; done | \
|
|
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
|
|
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
|
|
+ if (++n[$$2] == $(am__install_max)) \
|
|
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
|
|
+ END { for (dir in files) print dir, files[dir] }'
|
|
+am__base_list = \
|
|
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
|
|
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
|
|
am__installdirs = "$(DESTDIR)$(libgtopincludedir)"
|
|
-libgtopincludeHEADERS_INSTALL = $(INSTALL_HEADER)
|
|
HEADERS = $(libgtopinclude_HEADERS) $(noinst_HEADERS)
|
|
ETAGS = etags
|
|
CTAGS = ctags
|
|
@@ -139,29 +157,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
|
|
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
|
|
INSTOBJEXT = @INSTOBJEXT@
|
|
INTLLIBS = @INTLLIBS@
|
|
-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
|
|
-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
|
|
-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
|
|
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
|
|
-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
|
|
-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
|
|
INTLTOOL_MERGE = @INTLTOOL_MERGE@
|
|
-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@
|
|
-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
|
|
-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
|
|
-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
|
|
-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
|
|
-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
|
|
-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
|
|
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
|
|
-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
|
|
-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
|
|
-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
|
|
KVM_LIBS = @KVM_LIBS@
|
|
LD = @LD@
|
|
LDFLAGS = @LDFLAGS@
|
|
@@ -200,6 +199,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
|
|
PACKAGE_NAME = @PACKAGE_NAME@
|
|
PACKAGE_STRING = @PACKAGE_STRING@
|
|
PACKAGE_TARNAME = @PACKAGE_TARNAME@
|
|
+PACKAGE_URL = @PACKAGE_URL@
|
|
PACKAGE_VERSION = @PACKAGE_VERSION@
|
|
PATH_SEPARATOR = @PATH_SEPARATOR@
|
|
PERL = @PERL@
|
|
@@ -281,6 +281,7 @@ sysconfdir = @sysconfdir@
|
|
sysdeps_dir = @sysdeps_dir@
|
|
sysdeps_suid_lib = @sysdeps_suid_lib@
|
|
target_alias = @target_alias@
|
|
+top_build_prefix = @top_build_prefix@
|
|
top_builddir = @top_builddir@
|
|
top_srcdir = @top_srcdir@
|
|
noinst_LTLIBRARIES = libgtop_sysdeps-2.0.la libgtop_sysdeps_suid-2.0.la
|
|
@@ -311,9 +312,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefi
|
|
exit 1;; \
|
|
esac; \
|
|
done; \
|
|
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu sysdeps/sun4/Makefile'; \
|
|
- cd $(top_srcdir) && \
|
|
- $(AUTOMAKE) --gnu sysdeps/sun4/Makefile
|
|
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu sysdeps/sun4/Makefile'; \
|
|
+ $(am__cd) $(top_srcdir) && \
|
|
+ $(AUTOMAKE) --gnu sysdeps/sun4/Makefile
|
|
.PRECIOUS: Makefile
|
|
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
|
|
@case '$?' in \
|
|
@@ -331,6 +332,7 @@ $(top_srcdir)/configure: $(am__configur
|
|
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
|
|
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
|
|
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
|
|
+$(am__aclocal_m4_deps):
|
|
|
|
clean-noinstLTLIBRARIES:
|
|
-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
|
|
@@ -375,21 +377,21 @@ distclean-compile:
|
|
|
|
.c.o:
|
|
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
|
|
-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
|
|
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
|
|
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
|
|
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
|
@am__fastdepCC_FALSE@ $(COMPILE) -c $<
|
|
|
|
.c.obj:
|
|
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
|
|
-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
|
|
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
|
|
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
|
|
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
|
@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
|
|
|
|
.c.lo:
|
|
@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
|
|
-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
|
|
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
|
|
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
|
|
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
|
@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
|
|
@@ -402,20 +404,23 @@ clean-libtool:
|
|
install-libgtopincludeHEADERS: $(libgtopinclude_HEADERS)
|
|
@$(NORMAL_INSTALL)
|
|
test -z "$(libgtopincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libgtopincludedir)"
|
|
- @list='$(libgtopinclude_HEADERS)'; for p in $$list; do \
|
|
+ @list='$(libgtopinclude_HEADERS)'; test -n "$(libgtopincludedir)" || list=; \
|
|
+ for p in $$list; do \
|
|
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
|
|
- f=$(am__strip_dir) \
|
|
- echo " $(libgtopincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(libgtopincludedir)/$$f'"; \
|
|
- $(libgtopincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(libgtopincludedir)/$$f"; \
|
|
+ echo "$$d$$p"; \
|
|
+ done | $(am__base_list) | \
|
|
+ while read files; do \
|
|
+ echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(libgtopincludedir)'"; \
|
|
+ $(INSTALL_HEADER) $$files "$(DESTDIR)$(libgtopincludedir)" || exit $$?; \
|
|
done
|
|
|
|
uninstall-libgtopincludeHEADERS:
|
|
@$(NORMAL_UNINSTALL)
|
|
- @list='$(libgtopinclude_HEADERS)'; for p in $$list; do \
|
|
- f=$(am__strip_dir) \
|
|
- echo " rm -f '$(DESTDIR)$(libgtopincludedir)/$$f'"; \
|
|
- rm -f "$(DESTDIR)$(libgtopincludedir)/$$f"; \
|
|
- done
|
|
+ @list='$(libgtopinclude_HEADERS)'; test -n "$(libgtopincludedir)" || list=; \
|
|
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
|
|
+ test -n "$$files" || exit 0; \
|
|
+ echo " ( cd '$(DESTDIR)$(libgtopincludedir)' && rm -f" $$files ")"; \
|
|
+ cd "$(DESTDIR)$(libgtopincludedir)" && rm -f $$files
|
|
|
|
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
|
|
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
|
|
@@ -429,7 +434,7 @@ tags: TAGS
|
|
|
|
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
|
|
$(TAGS_FILES) $(LISP)
|
|
- tags=; \
|
|
+ set x; \
|
|
here=`pwd`; \
|
|
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
|
|
unique=`for i in $$list; do \
|
|
@@ -437,29 +442,34 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP
|
|
done | \
|
|
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
|
|
END { if (nonempty) { for (i in files) print i; }; }'`; \
|
|
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
|
|
+ shift; \
|
|
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
|
|
test -n "$$unique" || unique=$$empty_fix; \
|
|
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
|
|
- $$tags $$unique; \
|
|
+ if test $$# -gt 0; then \
|
|
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
|
|
+ "$$@" $$unique; \
|
|
+ else \
|
|
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
|
|
+ $$unique; \
|
|
+ fi; \
|
|
fi
|
|
ctags: CTAGS
|
|
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
|
|
$(TAGS_FILES) $(LISP)
|
|
- tags=; \
|
|
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
|
|
unique=`for i in $$list; do \
|
|
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
|
|
done | \
|
|
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
|
|
END { if (nonempty) { for (i in files) print i; }; }'`; \
|
|
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
|
|
+ test -z "$(CTAGS_ARGS)$$unique" \
|
|
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
|
|
- $$tags $$unique
|
|
+ $$unique
|
|
|
|
GTAGS:
|
|
here=`$(am__cd) $(top_builddir) && pwd` \
|
|
- && cd $(top_srcdir) \
|
|
- && gtags -i $(GTAGS_ARGS) $$here
|
|
+ && $(am__cd) $(top_srcdir) \
|
|
+ && gtags -i $(GTAGS_ARGS) "$$here"
|
|
|
|
distclean-tags:
|
|
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
|
|
@@ -480,13 +490,17 @@ distdir: $(DISTFILES)
|
|
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
|
|
if test -d $$d/$$file; then \
|
|
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
|
|
+ if test -d "$(distdir)/$$file"; then \
|
|
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
|
|
+ fi; \
|
|
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
|
|
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
|
|
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
|
|
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
|
|
fi; \
|
|
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
|
|
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
|
|
else \
|
|
- test -f $(distdir)/$$file \
|
|
- || cp -p $$d/$$file $(distdir)/$$file \
|
|
+ test -f "$(distdir)/$$file" \
|
|
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|
|
|| exit 1; \
|
|
fi; \
|
|
done
|
|
@@ -517,6 +531,7 @@ clean-generic:
|
|
|
|
distclean-generic:
|
|
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
|
|
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
|
|
|
|
maintainer-clean-generic:
|
|
@echo "This command is intended for maintainers to use"
|
|
@@ -538,6 +553,8 @@ dvi-am:
|
|
|
|
html: html-am
|
|
|
|
+html-am:
|
|
+
|
|
info: info-am
|
|
|
|
info-am:
|
|
@@ -546,18 +563,28 @@ install-data-am: install-libgtopincludeH
|
|
|
|
install-dvi: install-dvi-am
|
|
|
|
+install-dvi-am:
|
|
+
|
|
install-exec-am:
|
|
|
|
install-html: install-html-am
|
|
|
|
+install-html-am:
|
|
+
|
|
install-info: install-info-am
|
|
|
|
+install-info-am:
|
|
+
|
|
install-man:
|
|
|
|
install-pdf: install-pdf-am
|
|
|
|
+install-pdf-am:
|
|
+
|
|
install-ps: install-ps-am
|
|
|
|
+install-ps-am:
|
|
+
|
|
installcheck-am:
|
|
|
|
maintainer-clean: maintainer-clean-am
|
|
@@ -596,6 +623,7 @@ uninstall-am: uninstall-libgtopincludeHE
|
|
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
|
|
tags uninstall uninstall-am uninstall-libgtopincludeHEADERS
|
|
|
|
+
|
|
# Tell versions [3.59,3.63) of GNU make to not export all variables.
|
|
# Otherwise a system limit (for SysV at least) may be exceeded.
|
|
.NOEXPORT:
|