summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua Nichols <nichoj@gentoo.org>2007-05-25 01:38:27 +0000
committerJoshua Nichols <nichoj@gentoo.org>2007-05-25 01:38:27 +0000
commitd0c418787aa192a6a842e4e92bc89a3e4878049f (patch)
treedfb20154824cf6992f1751637ba337612ca2b0a0 /projects
parentAdded gtk-engines-rezlooks. (diff)
downloadnichoj-d0c418787aa192a6a842e4e92bc89a3e4878049f.tar.gz
nichoj-d0c418787aa192a6a842e4e92bc89a3e4878049f.tar.bz2
nichoj-d0c418787aa192a6a842e4e92bc89a3e4878049f.zip
Checking in...
svn path=/; revision=101
Diffstat (limited to 'projects')
-rw-r--r--projects/gvpndialer/trunk/TODO6
-rw-r--r--projects/gvpndialer/trunk/aclocal.m46
-rw-r--r--projects/gvpndialer/trunk/autom4te.cache/output.07145
-rw-r--r--projects/gvpndialer/trunk/autom4te.cache/requests271
-rw-r--r--projects/gvpndialer/trunk/autom4te.cache/traces.01147
-rw-r--r--projects/gvpndialer/trunk/config.h6
-rw-r--r--projects/gvpndialer/trunk/gvpn_dialer.glade190
-rw-r--r--projects/gvpndialer/trunk/po/Makefile.in20
-rw-r--r--projects/gvpndialer/trunk/po/Makefile.in.in18
-rw-r--r--projects/gvpndialer/trunk/src/.deps/callbacks.Po315
-rw-r--r--projects/gvpndialer/trunk/src/.deps/interface.Po281
-rw-r--r--projects/gvpndialer/trunk/src/.deps/main.Po299
-rw-r--r--projects/gvpndialer/trunk/src/.deps/support.Po247
-rw-r--r--projects/gvpndialer/trunk/src/callbacks.c2351
-rw-r--r--projects/gvpndialer/trunk/src/interface.c11
15 files changed, 6942 insertions, 5371 deletions
diff --git a/projects/gvpndialer/trunk/TODO b/projects/gvpndialer/trunk/TODO
index c79b388..194ca76 100644
--- a/projects/gvpndialer/trunk/TODO
+++ b/projects/gvpndialer/trunk/TODO
@@ -2,6 +2,12 @@ TODO:
---
Allow user to create their own PCF file.
+Make connect/disconnect modal
+
+Disable selection of profile/hostname when connected
+
+Fix tray menu to not appear on top of panel
+
BUGS:
--
(really a vpnclient bug). If you shutdown your ethernet interface,
diff --git a/projects/gvpndialer/trunk/aclocal.m4 b/projects/gvpndialer/trunk/aclocal.m4
index ec459ca..39e2f82 100644
--- a/projects/gvpndialer/trunk/aclocal.m4
+++ b/projects/gvpndialer/trunk/aclocal.m4
@@ -114,7 +114,8 @@ AC_SUBST($1)dnl
#-----------------
glib_DEFUN([GLIB_WITH_NLS],
dnl NLS is obligatory
- [USE_NLS=yes
+ [AC_REQUIRE([AC_CANONICAL_HOST])dnl
+ USE_NLS=yes
AC_SUBST(USE_NLS)
gt_cv_have_gettext=no
@@ -389,8 +390,10 @@ glib_DEFUN([GLIB_DEFINE_LOCALEDIR],
[glib_REQUIRE([GLIB_GNU_GETTEXT])dnl
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
@@ -398,6 +401,7 @@ else
fi
prefix="$glib_save_prefix"
exec_prefix="$glib_save_exec_prefix"
+datarootdir="$glib_save_datarootdir"
AC_DEFINE_UNQUOTED($1, "$localedir",
[Define the location where the catalogs will be installed])
])
diff --git a/projects/gvpndialer/trunk/autom4te.cache/output.0 b/projects/gvpndialer/trunk/autom4te.cache/output.0
index fa3eb8b..608254c 100644
--- a/projects/gvpndialer/trunk/autom4te.cache/output.0
+++ b/projects/gvpndialer/trunk/autom4te.cache/output.0
@@ -1,25 +1,54 @@
@%:@! /bin/sh
@%:@ Guess values for system-dependent variables and create Makefiles.
-@%:@ Generated by GNU Autoconf 2.59.
+@%:@ Generated by GNU Autoconf 2.61.
@%:@
-@%:@ Copyright (C) 2003 Free Software Foundation, Inc.
+@%:@ Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+@%:@ 2002, 2003, 2004, 2005, 2006 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. ##
## --------------------- ##
-# Be Bourne compatible
+# Be more Bourne compatible
+DUALCASE=1; export DUALCASE # for MKS sh
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+"$@"}'='"$@"'
-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
- set -o posix
+ setopt NO_GLOB_SUBST
+else
+ 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=';'
+ else
+ PATH_SEPARATOR=:
+ fi
+ rm -f conf$$.sh
fi
-DUALCASE=1; export DUALCASE # for MKS sh
# Support unset when possible.
if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
@@ -29,8 +58,43 @@ else
fi
+# IFS
+# We need space, tab and new line, in precisely that order. Quoting is
+# 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
+ *[\\/]* ) 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
+IFS=$as_save_IFS
+
+ ;;
+esac
+# We did not find ourselves, most probably we were run as `sh COMMAND'
+# in which case we are not to be found in the path.
+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; }
+fi
+
# Work around bugs in pre-3.0 UWIN ksh.
-$as_unset ENV MAIL MAILPATH
+for as_var in ENV MAIL MAILPATH
+do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+done
PS1='$ '
PS2='> '
PS4='+ '
@@ -44,18 +108,19 @@ 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
+ ($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; then
+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
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
as_basename=basename
else
as_basename=false
@@ -63,157 +128,388 @@ fi
# Name of the executable.
-as_me=`$as_basename "$0" ||
+as_me=`$as_basename -- "$0" ||
$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
X"$0" : 'X\(//\)$' \| \
- X"$0" : 'X\(/\)$' \| \
- . : '\(.\)' 2>/dev/null ||
+ X"$0" : 'X\(/\)' \| . 2>/dev/null ||
echo X/"$0" |
- sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
- /^X\/\(\/\/\)$/{ s//\1/; q; }
- /^X\/\(\/\).*/{ s//\1/; q; }
- s/.*/./; q'`
+ sed '/^.*\/\([^/][^/]*\)\/*$/{
+ s//\1/
+ q
+ }
+ /^X\/\(\/\/\)$/{
+ s//\1/
+ q
+ }
+ /^X\/\(\/\).*/{
+ s//\1/
+ q
+ }
+ s/.*/./; q'`
+# CDPATH.
+$as_unset CDPATH
-# PATH needs CR, and LINENO needs CR and PATH.
-# 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=';'
- else
- PATH_SEPARATOR=:
- fi
- rm -f conf$$.sh
+if test "x$CONFIG_SHELL" = x; then
+ if (eval ":") 2>/dev/null; then
+ as_have_required=yes
+else
+ as_have_required=no
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_lineno_1=$LINENO
- as_lineno_2=$LINENO
- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
- test "x$as_lineno_1" != "x$as_lineno_2" &&
- test "x$as_lineno_3" = "x$as_lineno_2" || {
- # Find who we are. Look in the path if we contain no path at all
- # relative or not.
- 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
+exitcode=0
+if as_func_success; then
+ :
+else
+ exitcode=1
+ echo as_func_success failed.
+fi
- ;;
- esac
- # We did not find ourselves, most probably we were run as `sh COMMAND'
- # in which case we are not to be found in the path.
- if test "x$as_myself" = x; then
- as_myself=$0
- fi
- if test ! -f "$as_myself"; then
- { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2
- { (exit 1); exit 1; }; }
- fi
- case $CONFIG_SHELL in
- '')
+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
+ :
+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; }
+") 2> /dev/null; then
+ :
+else
+ as_candidate_shells=
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for as_base in sh bash ksh sh5; do
- case $as_dir in
+ case $as_dir in
/*)
- if ("$as_dir/$as_base" -c '
+ for as_base in sh bash ksh sh5; do
+ as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
+ done;;
+ esac
+done
+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
+
+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
+
+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
+ :
+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
- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
test "x$as_lineno_1" != "x$as_lineno_2" &&
- test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then
- $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
- $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
- CONFIG_SHELL=$as_dir/$as_base
- export CONFIG_SHELL
- exec "$CONFIG_SHELL" "$0" ${1+"$@"}
- fi;;
- esac
- done
-done
-;;
- esac
+ 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
+
+
+
+(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
+}
+
+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
+ :
+else
+ exitcode=1
+ echo positional parameters were not saved.
+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_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 before each line; the second 'sed' does the real
- # work. The second script uses 'N' to pair each line-number line
- # with the numbered line, and appends trailing '-' during
- # substitution so that $LINENO is not a special case at line end.
+ # 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
- # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-)
- sed '=' <$as_myself |
+ # 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
- s,$,-,
- : loop
- s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
+ :loop
+ s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
t loop
- s,-$,,
- s,^['$as_cr_digits']*\n,,
+ s/-\n.*//
' >$as_me.lineno &&
- chmod +x $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 sensible to this).
- . ./$as_me.lineno
+ # original and so on. Autoconf is especially sensitive to this).
+ . "./$as_me.lineno"
# Exit status is that of the last command.
exit
}
-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
- *c*,-n*) ECHO_N= ECHO_C='
-' ECHO_T=' ' ;;
- *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;;
- *) ECHO_N= ECHO_C='\c' ECHO_T= ;;
+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
+-n*)
+ case `echo 'x\c'` in
+ *c*) ECHO_T=' ';; # ECHO_T is single tab character.
+ *) ECHO_C='\c';;
+ esac;;
+*)
+ ECHO_N='-n';;
esac
-if expr a : '\(a\)' >/dev/null 2>&1; then
+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
+fi
echo >conf$$.file
if ln -s conf$$.file conf$$ 2>/dev/null; then
- # We could just check for DJGPP; but this test a) works b) is more generic
- # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
- if test -f conf$$.exe; then
- # Don't use ln at all; we don't have any links
+ 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'
- else
- as_ln_s='ln -s'
- fi
elif ln conf$$.file conf$$ 2>/dev/null; then
as_ln_s=ln
else
as_ln_s='cp -p'
fi
-rm -f conf$$ conf$$.exe conf$$.file
+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
+rmdir conf$$.dir 2>/dev/null
if mkdir -p . 2>/dev/null; then
as_mkdir_p=:
@@ -222,7 +518,28 @@ else
as_mkdir_p=false
fi
-as_executable_p="test -f"
+if test -x / >/dev/null 2>&1; then
+ as_test_x='test -x'
+else
+ if ls -dL / >/dev/null 2>&1; then
+ as_ls_L_option=L
+ else
+ as_ls_L_option=
+ fi
+ as_test_x='
+ eval sh -c '\''
+ if test -d "$1"; then
+ test -d "$1/.";
+ else
+ case $1 in
+ -*)set "./$1";;
+ esac;
+ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
+ ???[sx]*):;;*)false;;esac;fi
+ '\'' sh
+ '
+fi
+as_executable_p=$as_test_x
# Sed expression to map a string onto a valid CPP name.
as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -231,39 +548,27 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-# IFS
-# We need space, tab and new line, in precisely that order.
-as_nl='
-'
-IFS=" $as_nl"
-
-# CDPATH.
-$as_unset CDPATH
+exec 7<&0 </dev/null 6>&1
# Name of the host.
# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
# so uname gets run too.
ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
-exec 6>&1
-
#
# Initializations.
#
ac_default_prefix=/usr/local
+ac_clean_files=
ac_config_libobj_dir=.
+LIB@&t@OBJS=
cross_compiling=no
subdirs=
MFLAGS=
MAKEFLAGS=
SHELL=${CONFIG_SHELL-/bin/sh}
-# Maximum number of lines to put in a shell here document.
-# This variable seems obsolete. It should probably be removed, and
-# only ac_max_sed_lines should be used.
-: ${ac_max_here_lines=38}
-
# Identity of this package.
PACKAGE_NAME=
PACKAGE_TARNAME=
@@ -275,42 +580,162 @@ ac_unique_file="configure.in"
# Factoring default headers for most tests.
ac_includes_default="\
#include <stdio.h>
-#if HAVE_SYS_TYPES_H
+#ifdef HAVE_SYS_TYPES_H
# include <sys/types.h>
#endif
-#if HAVE_SYS_STAT_H
+#ifdef HAVE_SYS_STAT_H
# include <sys/stat.h>
#endif
-#if STDC_HEADERS
+#ifdef STDC_HEADERS
# include <stdlib.h>
# include <stddef.h>
#else
-# if HAVE_STDLIB_H
+# ifdef HAVE_STDLIB_H
# include <stdlib.h>
# endif
#endif
-#if HAVE_STRING_H
-# if !STDC_HEADERS && HAVE_MEMORY_H
+#ifdef HAVE_STRING_H
+# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
# include <memory.h>
# endif
# include <string.h>
#endif
-#if HAVE_STRINGS_H
+#ifdef HAVE_STRINGS_H
# include <strings.h>
#endif
-#if HAVE_INTTYPES_H
+#ifdef HAVE_INTTYPES_H
# include <inttypes.h>
-#else
-# if HAVE_STDINT_H
-# include <stdint.h>
-# endif
#endif
-#if HAVE_UNISTD_H
+#ifdef HAVE_STDINT_H
+# include <stdint.h>
+#endif
+#ifdef HAVE_UNISTD_H
# 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 datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT 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 EGREP PKG_CONFIG PACKAGE_CFLAGS PACKAGE_LIBS GETTEXT_PACKAGE USE_NLS MSGFMT GMSGFMT XGETTEXT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB MKINSTALLDIRS LIB@&t@OBJS LTLIBOBJS'
+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
+build_alias
+host_alias
+target_alias
+INSTALL_PROGRAM
+INSTALL_SCRIPT
+INSTALL_DATA
+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
+MAINTAINER_MODE_TRUE
+MAINTAINER_MODE_FALSE
+MAINT
+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
+PKG_CONFIG
+PACKAGE_CFLAGS
+PACKAGE_LIBS
+GETTEXT_PACKAGE
+build
+build_cpu
+build_vendor
+build_os
+host
+host_cpu
+host_vendor
+host_os
+USE_NLS
+MSGFMT
+GMSGFMT
+XGETTEXT
+CATALOGS
+CATOBJEXT
+DATADIRNAME
+GMOFILES
+INSTOBJEXT
+INTLLIBS
+PO_IN_DATADIR_TRUE
+PO_IN_DATADIR_FALSE
+POFILES
+POSUB
+MKINSTALLDIRS
+LIB@&t@OBJS
+LTLIBOBJS'
ac_subst_files=''
+ ac_precious_vars='build_alias
+host_alias
+target_alias
+CC
+CFLAGS
+LDFLAGS
+LIBS
+CPPFLAGS
+CPP
+PKG_CONFIG
+PACKAGE_CFLAGS
+PACKAGE_LIBS'
+
# Initialize some variables set by options.
ac_init_help=
@@ -337,34 +762,48 @@ x_libraries=NONE
# and all the variables that are supposed to be based on exec_prefix
# by default will actually change.
# Use braces instead of parens because sh, perl, etc. also accept them.
+# (The list follows the same order as the GNU Coding Standards.)
bindir='${exec_prefix}/bin'
sbindir='${exec_prefix}/sbin'
libexecdir='${exec_prefix}/libexec'
-datadir='${prefix}/share'
+datarootdir='${prefix}/share'
+datadir='${datarootdir}'
sysconfdir='${prefix}/etc'
sharedstatedir='${prefix}/com'
localstatedir='${prefix}/var'
-libdir='${exec_prefix}/lib'
includedir='${prefix}/include'
oldincludedir='/usr/include'
-infodir='${prefix}/info'
-mandir='${prefix}/man'
+docdir='${datarootdir}/doc/${PACKAGE}'
+infodir='${datarootdir}/info'
+htmldir='${docdir}'
+dvidir='${docdir}'
+pdfdir='${docdir}'
+psdir='${docdir}'
+libdir='${exec_prefix}/lib'
+localedir='${datarootdir}/locale'
+mandir='${datarootdir}/man'
ac_prev=
+ac_dashdash=
for ac_option
do
# If the previous option needs an argument, assign it.
if test -n "$ac_prev"; then
- eval "$ac_prev=\$ac_option"
+ eval $ac_prev=\$ac_option
ac_prev=
continue
fi
- ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'`
+ case $ac_option in
+ *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
+ *) ac_optarg=yes ;;
+ esac
# Accept the important Cygnus configure options, so we can diagnose typos.
- case $ac_option in
+ case $ac_dashdash$ac_option in
+ --)
+ ac_dashdash=yes ;;
-bindir | --bindir | --bindi | --bind | --bin | --bi)
ac_prev=bindir ;;
@@ -386,33 +825,45 @@ do
--config-cache | -C)
cache_file=config.cache ;;
- -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
+ -datadir | --datadir | --datadi | --datad)
ac_prev=datadir ;;
- -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
- | --da=*)
+ -datadir=* | --datadir=* | --datadi=* | --datad=*)
datadir=$ac_optarg ;;
+ -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
+ | --dataroo | --dataro | --datar)
+ ac_prev=datarootdir ;;
+ -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
+ | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
+ datarootdir=$ac_optarg ;;
+
-disable-* | --disable-*)
ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
# Reject names that are not valid shell variable names.
- expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
+ 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" ;;
+ ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
+ eval enable_$ac_feature=no ;;
+
+ -docdir | --docdir | --docdi | --doc | --do)
+ ac_prev=docdir ;;
+ -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
+ docdir=$ac_optarg ;;
+
+ -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
+ ac_prev=dvidir ;;
+ -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
+ dvidir=$ac_optarg ;;
-enable-* | --enable-*)
ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
# Reject names that are not valid shell variable names.
- expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
+ 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'`
- case $ac_option in
- *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
- *) ac_optarg=yes ;;
- esac
- eval "enable_$ac_feature='$ac_optarg'" ;;
+ ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
+ eval enable_$ac_feature=\$ac_optarg ;;
-exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
| --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
@@ -439,6 +890,12 @@ do
-host=* | --host=* | --hos=* | --ho=*)
host_alias=$ac_optarg ;;
+ -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
+ ac_prev=htmldir ;;
+ -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
+ | --ht=*)
+ htmldir=$ac_optarg ;;
+
-includedir | --includedir | --includedi | --included | --include \
| --includ | --inclu | --incl | --inc)
ac_prev=includedir ;;
@@ -463,13 +920,16 @@ do
| --libexe=* | --libex=* | --libe=*)
libexecdir=$ac_optarg ;;
+ -localedir | --localedir | --localedi | --localed | --locale)
+ ac_prev=localedir ;;
+ -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
+ localedir=$ac_optarg ;;
+
-localstatedir | --localstatedir | --localstatedi | --localstated \
- | --localstate | --localstat | --localsta | --localst \
- | --locals | --local | --loca | --loc | --lo)
+ | --localstate | --localstat | --localsta | --localst | --locals)
ac_prev=localstatedir ;;
-localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
- | --localstate=* | --localstat=* | --localsta=* | --localst=* \
- | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
+ | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
localstatedir=$ac_optarg ;;
-mandir | --mandir | --mandi | --mand | --man | --ma | --m)
@@ -534,6 +994,16 @@ do
| --progr-tra=* | --program-tr=* | --program-t=*)
program_transform_name=$ac_optarg ;;
+ -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
+ ac_prev=pdfdir ;;
+ -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
+ pdfdir=$ac_optarg ;;
+
+ -psdir | --psdir | --psdi | --psd | --ps)
+ ac_prev=psdir ;;
+ -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
+ psdir=$ac_optarg ;;
+
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
| -silent | --silent | --silen | --sile | --sil)
silent=yes ;;
@@ -586,24 +1056,20 @@ do
-with-* | --with-*)
ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
# Reject names that are not valid shell variable names.
- expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
+ 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'`
- case $ac_option in
- *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
- *) ac_optarg=yes ;;
- esac
- eval "with_$ac_package='$ac_optarg'" ;;
+ ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
+ eval with_$ac_package=\$ac_optarg ;;
-without-* | --without-*)
ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
# Reject names that are not valid shell variable names.
- expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
+ 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" ;;
+ ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
+ eval with_$ac_package=no ;;
--x)
# Obsolete; use --with-x.
@@ -634,8 +1100,7 @@ Try \`$0 --help' for more information." >&2
expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
{ echo "$as_me: error: invalid variable name: $ac_envvar" >&2
{ (exit 1); exit 1; }; }
- ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
- eval "$ac_envvar='$ac_optarg'"
+ eval $ac_envvar=\$ac_optarg
export $ac_envvar ;;
*)
@@ -655,27 +1120,19 @@ if test -n "$ac_prev"; then
{ (exit 1); exit 1; }; }
fi
-# Be sure to have absolute paths.
-for ac_var in exec_prefix prefix
-do
- eval ac_val=$`echo $ac_var`
- case $ac_val in
- [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
- *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
- { (exit 1); exit 1; }; };;
- esac
-done
-
-# Be sure to have absolute paths.
-for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
- localstatedir libdir includedir oldincludedir infodir mandir
+# Be sure to have absolute directory names.
+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=$`echo $ac_var`
+ eval ac_val=\$$ac_var
case $ac_val in
- [\\/$]* | ?:[\\/]* ) ;;
- *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
- { (exit 1); exit 1; }; };;
+ [\\/$]* | ?:[\\/]* ) 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; }; }
done
# There might be people who depend on the old broken behavior: `$host'
@@ -702,74 +1159,76 @@ test -n "$host_alias" && ac_tool_prefix=$host_alias-
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; }; }
+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; }; }
+
+
# 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 its parent.
- ac_confdir=`(dirname "$0") 2>/dev/null ||
+ # 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 ||
+ X"$0" : 'X\(/\)' \| . 2>/dev/null ||
echo X"$0" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
- /^X\(\/\/\)$/{ s//\1/; q; }
- /^X\(\/\).*/{ s//\1/; q; }
- s/.*/./; q'`
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)[^/].*/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\).*/{
+ s//\1/
+ q
+ }
+ s/.*/./; q'`
srcdir=$ac_confdir
- if test ! -r $srcdir/$ac_unique_file; then
+ if test ! -r "$srcdir/$ac_unique_file"; then
srcdir=..
fi
else
ac_srcdir_defaulted=no
fi
-if test ! -r $srcdir/$ac_unique_file; then
- if test "$ac_srcdir_defaulted" = yes; then
- { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2
+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; }; }
- else
- { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
- { (exit 1); exit 1; }; }
- fi
fi
-(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
- { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2
+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; }; }
-srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
-ac_env_build_alias_set=${build_alias+set}
-ac_env_build_alias_value=$build_alias
-ac_cv_env_build_alias_set=${build_alias+set}
-ac_cv_env_build_alias_value=$build_alias
-ac_env_host_alias_set=${host_alias+set}
-ac_env_host_alias_value=$host_alias
-ac_cv_env_host_alias_set=${host_alias+set}
-ac_cv_env_host_alias_value=$host_alias
-ac_env_target_alias_set=${target_alias+set}
-ac_env_target_alias_value=$target_alias
-ac_cv_env_target_alias_set=${target_alias+set}
-ac_cv_env_target_alias_value=$target_alias
-ac_env_CC_set=${CC+set}
-ac_env_CC_value=$CC
-ac_cv_env_CC_set=${CC+set}
-ac_cv_env_CC_value=$CC
-ac_env_CFLAGS_set=${CFLAGS+set}
-ac_env_CFLAGS_value=$CFLAGS
-ac_cv_env_CFLAGS_set=${CFLAGS+set}
-ac_cv_env_CFLAGS_value=$CFLAGS
-ac_env_LDFLAGS_set=${LDFLAGS+set}
-ac_env_LDFLAGS_value=$LDFLAGS
-ac_cv_env_LDFLAGS_set=${LDFLAGS+set}
-ac_cv_env_LDFLAGS_value=$LDFLAGS
-ac_env_CPPFLAGS_set=${CPPFLAGS+set}
-ac_env_CPPFLAGS_value=$CPPFLAGS
-ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set}
-ac_cv_env_CPPFLAGS_value=$CPPFLAGS
-ac_env_CPP_set=${CPP+set}
-ac_env_CPP_value=$CPP
-ac_cv_env_CPP_set=${CPP+set}
-ac_cv_env_CPP_value=$CPP
+ pwd)`
+# When building in place, set srcdir=.
+if test "$ac_abs_confdir" = "$ac_pwd"; then
+ srcdir=.
+fi
+# Remove unnecessary trailing slashes from srcdir.
+# Double slashes in file names in object file debugging info
+# mess up M-x gdb in Emacs.
+case $srcdir in
+*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
+esac
+for ac_var in $ac_precious_vars; do
+ eval ac_env_${ac_var}_set=\${${ac_var}+set}
+ eval ac_env_${ac_var}_value=\$${ac_var}
+ eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
+ eval ac_cv_env_${ac_var}_value=\$${ac_var}
+done
#
# Report the --help message.
@@ -798,9 +1257,6 @@ Configuration:
-n, --no-create do not create output files
--srcdir=DIR find the sources in DIR [configure dir or \`..']
-_ACEOF
-
- cat <<_ACEOF
Installation directories:
--prefix=PREFIX install architecture-independent files in PREFIX
[$ac_default_prefix]
@@ -818,15 +1274,22 @@ 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]
- --datadir=DIR read-only architecture-independent data [PREFIX/share]
--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]
- --infodir=DIR info documentation [PREFIX/info]
- --mandir=DIR man documentation [PREFIX/man]
+ --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/PACKAGE@:>@
+ --htmldir=DIR html documentation [DOCDIR]
+ --dvidir=DIR dvi documentation [DOCDIR]
+ --pdfdir=DIR pdf documentation [DOCDIR]
+ --psdir=DIR ps documentation [DOCDIR]
_ACEOF
cat <<\_ACEOF
@@ -835,6 +1298,10 @@ Program names:
--program-prefix=PREFIX prepend PREFIX to installed program names
--program-suffix=SUFFIX append SUFFIX to installed program names
--program-transform-name=PROGRAM run sed PROGRAM on installed program names
+
+System types:
+ --build=BUILD configure for building on BUILD [guessed]
+ --host=HOST cross-compile to build programs to run on HOST [BUILD]
_ACEOF
fi
@@ -855,126 +1322,100 @@ Some influential environment variables:
CFLAGS C compiler flags
LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
nonstandard directory <lib dir>
- CPPFLAGS C/C++ preprocessor flags, e.g. -I<include dir> if you have
- headers in a nonstandard directory <include dir>
+ LIBS libraries to pass to the linker, e.g. -l<library>
+ CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
+ you have headers in a nonstandard directory <include dir>
CPP C preprocessor
+ PKG_CONFIG path to pkg-config utility
+ PACKAGE_CFLAGS
+ C compiler flags for PACKAGE, overriding pkg-config
+ PACKAGE_LIBS
+ linker flags for PACKAGE, overriding pkg-config
Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations.
_ACEOF
+ac_status=$?
fi
if test "$ac_init_help" = "recursive"; then
# If there are subdirs, report their specific --help.
- ac_popdir=`pwd`
for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
- test -d $ac_dir || continue
+ test -d "$ac_dir" || continue
ac_builddir=.
-if test "$ac_dir" != .; then
+case "$ac_dir" in
+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
+*)
ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
- # A "../" for each directory in $ac_dir_suffix.
- ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-else
- ac_dir_suffix= ac_top_builddir=
-fi
+ # A ".." for each directory in $ac_dir_suffix.
+ ac_top_builddir_sub=`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/ ;;
+ esac ;;
+esac
+ac_abs_top_builddir=$ac_pwd
+ac_abs_builddir=$ac_pwd$ac_dir_suffix
+# for backward compatibility:
+ac_top_builddir=$ac_top_build_prefix
case $srcdir in
- .) # No --srcdir option. We are building in place.
+ .) # We are building in place.
ac_srcdir=.
- if test -z "$ac_top_builddir"; then
- ac_top_srcdir=.
- else
- ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
- fi ;;
- [\\/]* | ?:[\\/]* ) # Absolute path.
+ ac_top_srcdir=$ac_top_builddir_sub
+ ac_abs_top_srcdir=$ac_pwd ;;
+ [\\/]* | ?:[\\/]* ) # Absolute name.
ac_srcdir=$srcdir$ac_dir_suffix;
- ac_top_srcdir=$srcdir ;;
- *) # Relative path.
- ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
- ac_top_srcdir=$ac_top_builddir$srcdir ;;
-esac
-
-# Do not use `cd foo && pwd` to compute absolute paths, because
-# the directories may not exist.
-case `pwd` in
-.) ac_abs_builddir="$ac_dir";;
-*)
- case "$ac_dir" in
- .) ac_abs_builddir=`pwd`;;
- [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
- *) ac_abs_builddir=`pwd`/"$ac_dir";;
- esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_builddir=${ac_top_builddir}.;;
-*)
- case ${ac_top_builddir}. in
- .) ac_abs_top_builddir=$ac_abs_builddir;;
- [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
- *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
- esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_srcdir=$ac_srcdir;;
-*)
- case $ac_srcdir in
- .) ac_abs_srcdir=$ac_abs_builddir;;
- [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
- *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
- esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_srcdir=$ac_top_srcdir;;
-*)
- case $ac_top_srcdir in
- .) ac_abs_top_srcdir=$ac_abs_builddir;;
- [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
- *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
- esac;;
+ ac_top_srcdir=$srcdir
+ ac_abs_top_srcdir=$srcdir ;;
+ *) # Relative name.
+ ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
+ ac_top_srcdir=$ac_top_build_prefix$srcdir
+ ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
esac
-
- cd $ac_dir
- # Check for guested configure; otherwise get Cygnus style configure.
- if test -f $ac_srcdir/configure.gnu; then
- echo
- $SHELL $ac_srcdir/configure.gnu --help=recursive
- elif test -f $ac_srcdir/configure; then
- echo
- $SHELL $ac_srcdir/configure --help=recursive
- elif test -f $ac_srcdir/configure.ac ||
- test -f $ac_srcdir/configure.in; then
- echo
- $ac_configure --help
+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
+
+ cd "$ac_dir" || { ac_status=$?; continue; }
+ # Check for guested configure.
+ if test -f "$ac_srcdir/configure.gnu"; then
+ echo &&
+ $SHELL "$ac_srcdir/configure.gnu" --help=recursive
+ elif test -f "$ac_srcdir/configure"; then
+ echo &&
+ $SHELL "$ac_srcdir/configure" --help=recursive
else
echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
- fi
- cd $ac_popdir
+ fi || ac_status=$?
+ cd "$ac_pwd" || { ac_status=$?; break; }
done
fi
-test -n "$ac_init_help" && exit 0
+test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
+configure
+generated by GNU Autoconf 2.61
-Copyright (C) 2003 Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+2002, 2003, 2004, 2005, 2006 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 0
+ exit
fi
-exec 5>config.log
-cat >&5 <<_ACEOF
+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 $as_me, which was
-generated by GNU Autoconf 2.59. Invocation command line was
+generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
_ACEOF
+exec 5>>config.log
{
cat <<_ASUNAME
@%:@@%:@ --------- @%:@@%:@
@@ -993,7 +1434,7 @@ uname -v = `(uname -v) 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`
-hostinfo = `(hostinfo) 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`
@@ -1007,6 +1448,7 @@ do
test -z "$as_dir" && as_dir=.
echo "PATH: $as_dir"
done
+IFS=$as_save_IFS
} >&5
@@ -1028,7 +1470,6 @@ _ACEOF
ac_configure_args=
ac_configure_args0=
ac_configure_args1=
-ac_sep=
ac_must_keep_next=false
for ac_pass in 1 2
do
@@ -1039,7 +1480,7 @@ do
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
| -silent | --silent | --silen | --sile | --sil)
continue ;;
- *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
+ *\'*)
ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
esac
case $ac_pass in
@@ -1061,9 +1502,7 @@ do
-* ) ac_must_keep_next=true ;;
esac
fi
- ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
- # Get rid of the leading space.
- ac_sep=" "
+ ac_configure_args="$ac_configure_args '$ac_arg'"
;;
esac
done
@@ -1074,8 +1513,8 @@ $as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_
# When interrupted or exit'd, cleanup temporary files, and complete
# config.log. We remove comments because anyway the quotes in there
# would cause problems or look ugly.
-# WARNING: Be sure not to use single quotes in there, as some shells,
-# such as our DU 5.0 friend, will then `close' the trap.
+# WARNING: Use '\'' to represent an apostrophe within the trap.
+# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
trap 'exit_status=$?
# Save into config.log some information that might help in debugging.
{
@@ -1088,20 +1527,34 @@ trap 'exit_status=$?
_ASBOX
echo
# The following way of writing the cache mishandles newlines in values,
-{
+(
+ for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
+ eval ac_val=\$$ac_var
+ 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;} ;;
+ esac
+ case $ac_var in #(
+ _ | IFS | as_nl) ;; #(
+ *) $as_unset $ac_var ;;
+ esac ;;
+ esac
+ done
(set) 2>&1 |
- case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
- *ac_space=\ *)
+ case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
+ *${as_nl}ac_space=\ *)
sed -n \
- "s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
- s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
- ;;
+ "s/'\''/'\''\\\\'\'''\''/g;
+ s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
+ ;; #(
*)
- sed -n \
- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
+ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
;;
- esac;
-}
+ esac |
+ sort
+)
echo
cat <<\_ASBOX
@@ -1112,22 +1565,28 @@ _ASBOX
echo
for ac_var in $ac_subst_vars
do
- eval ac_val=$`echo $ac_var`
- echo "$ac_var='"'"'$ac_val'"'"'"
+ eval ac_val=\$$ac_var
+ case $ac_val in
+ *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+ esac
+ echo "$ac_var='\''$ac_val'\''"
done | sort
echo
if test -n "$ac_subst_files"; then
cat <<\_ASBOX
-@%:@@%:@ ------------- @%:@@%:@
-@%:@@%:@ Output files. @%:@@%:@
-@%:@@%:@ ------------- @%:@@%:@
+@%:@@%:@ ------------------- @%:@@%:@
+@%:@@%:@ File substitutions. @%:@@%:@
+@%:@@%:@ ------------------- @%:@@%:@
_ASBOX
echo
for ac_var in $ac_subst_files
do
- eval ac_val=$`echo $ac_var`
- echo "$ac_var='"'"'$ac_val'"'"'"
+ eval ac_val=\$$ac_var
+ case $ac_val in
+ *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+ esac
+ echo "$ac_var='\''$ac_val'\''"
done | sort
echo
fi
@@ -1139,26 +1598,24 @@ _ASBOX
@%:@@%:@ ----------- @%:@@%:@
_ASBOX
echo
- sed "/^$/d" confdefs.h | sort
+ cat confdefs.h
echo
fi
test "$ac_signal" != 0 &&
echo "$as_me: caught signal $ac_signal"
echo "$as_me: exit $exit_status"
} >&5
- rm -f core *.core &&
- rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
+ rm -f core *.core core.conftest.* &&
+ rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
exit $exit_status
- ' 0
+' 0
for ac_signal in 1 2 13 15; do
trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
done
ac_signal=0
# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -rf conftest* confdefs.h
-# AIX cpp loses on an empty file, so make sure it contains at least a newline.
-echo >confdefs.h
+rm -f -r conftest* confdefs.h
# Predefined preprocessor variables.
@@ -1189,14 +1646,17 @@ _ACEOF
# Let the site file select an alternate cache file if it wants to.
# Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
- if test "x$prefix" != xNONE; then
- CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
- else
- CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
- fi
+if test -n "$CONFIG_SITE"; then
+ set x "$CONFIG_SITE"
+elif test "x$prefix" != xNONE; then
+ set x "$prefix/share/config.site" "$prefix/etc/config.site"
+else
+ set x "$ac_default_prefix/share/config.site" \
+ "$ac_default_prefix/etc/config.site"
fi
-for ac_site_file in $CONFIG_SITE; do
+shift
+for ac_site_file
+do
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;}
@@ -1212,8 +1672,8 @@ if test -r "$cache_file"; then
{ echo "$as_me:$LINENO: loading cache $cache_file" >&5
echo "$as_me: loading cache $cache_file" >&6;}
case $cache_file in
- [\\/]* | ?:[\\/]* ) . $cache_file;;
- *) . ./$cache_file;;
+ [\\/]* | ?:[\\/]* ) . "$cache_file";;
+ *) . "./$cache_file";;
esac
fi
else
@@ -1225,12 +1685,11 @@ fi
# Check that the precious variables saved in the cache have kept the same
# value.
ac_cache_corrupted=false
-for ac_var in `(set) 2>&1 |
- sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
+for ac_var in $ac_precious_vars; do
eval ac_old_set=\$ac_cv_env_${ac_var}_set
eval ac_new_set=\$ac_env_${ac_var}_set
- eval ac_old_val="\$ac_cv_env_${ac_var}_value"
- eval ac_new_val="\$ac_env_${ac_var}_value"
+ eval ac_old_val=\$ac_cv_env_${ac_var}_value
+ 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
@@ -1255,8 +1714,7 @@ echo "$as_me: current value: $ac_new_val" >&2;}
# 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=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
*) ac_arg=$ac_var=$ac_new_val ;;
esac
case " $ac_configure_args " in
@@ -1273,12 +1731,6 @@ echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start ov
{ (exit 1); exit 1; }; }
fi
-ac_ext=c
-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
-
@@ -1295,33 +1747,44 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ac_ext=c
+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
am__api_version="1.9"
ac_aux_dir=
-for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
- if test -f $ac_dir/install-sh; then
+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
+ 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
+ elif test -f "$ac_dir/shtool"; then
ac_aux_dir=$ac_dir
ac_install_sh="$ac_aux_dir/shtool install -c"
break
fi
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;}
+ { { 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; }; }
fi
-ac_config_guess="$SHELL $ac_aux_dir/config.guess"
-ac_config_sub="$SHELL $ac_aux_dir/config.sub"
-ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
+
+# These three variables are undocumented and unsupported,
+# and are intended to be withdrawn in a future Autoconf release.
+# They can cause serious problems if a builder's source tree is in a directory
+# whose full name contains unusual characters.
+ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var.
+ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var.
+ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
+
# Find a good install program. We prefer a C program (faster),
# so one script is as good as another. But avoid the broken or
@@ -1336,8 +1799,8 @@ ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
# 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
+{ 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
@@ -1359,7 +1822,7 @@ case $as_dir/ in
# by default.
for ac_prog in ginstall scoinst install; do
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
+ 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.
@@ -1378,21 +1841,22 @@ case $as_dir/ in
;;
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. We don't cache a
- # path for INSTALL within a source directory, because that will
+ # 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 path is relative.
+ # 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
+{ 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.
@@ -1402,8 +1866,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
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
+{ echo "$as_me:$LINENO: checking whether build environment is sane" >&5
+echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6; }
# Just in case
sleep 1
echo timestamp > conftest.file
@@ -1445,20 +1909,20 @@ echo "$as_me: error: newly created file is older than distributed files!
Check your system clock" >&2;}
{ (exit 1); exit 1; }; }
fi
-echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+{ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
test "$program_prefix" != NONE &&
- program_transform_name="s,^,$program_prefix,;$program_transform_name"
+ 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"
+ program_transform_name="s&\$&$program_suffix&;$program_transform_name"
# Double any \ or $. echo might interpret backslashes.
# 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 conftest.sed
+rm -f conftest.sed
# expand $ac_aux_dir to an absolute path
am_aux_dir=`cd $ac_aux_dir && pwd`
@@ -1510,8 +1974,8 @@ 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
+{ 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
else
@@ -1524,54 +1988,57 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ 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
break 2
fi
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
+ { echo "$as_me:$LINENO: result: $AWK" >&5
+echo "${ECHO_T}$AWK" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}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 dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'`
-if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
+{ 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
else
cat >conftest.make <<\_ACEOF
+SHELL = /bin/sh
all:
- @echo 'ac_maketemp="$(MAKE)"'
+ @echo '@@@%%%=$(MAKE)=@@@%%%'
_ACEOF
# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=`
-if test -n "$ac_maketemp"; then
- eval ac_cv_prog_make_${ac_make}_set=yes
-else
- eval ac_cv_prog_make_${ac_make}_set=no
-fi
+case `${MAKE-make} -f conftest.make 2>/dev/null` in
+ *@@@%%%=?*=@@@%%%*)
+ eval ac_cv_prog_make_${ac_make}_set=yes;;
+ *)
+ eval ac_cv_prog_make_${ac_make}_set=no;;
+esac
rm -f conftest.make
fi
-if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
SET_MAKE=
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
SET_MAKE="MAKE=${MAKE-make}"
fi
@@ -1604,7 +2071,7 @@ fi
# Define the identity of the package.
PACKAGE=gvpndialer
- VERSION=1.0
+ VERSION=1.1
cat >>confdefs.h <<_ACEOF
@@ -1642,8 +2109,8 @@ 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
+{ 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
@@ -1656,32 +2123,34 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ 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
+ { 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
+ { 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
+{ 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
@@ -1694,27 +2163,41 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ 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
- test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":"
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
+ { 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
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
- STRIP=$ac_ct_STRIP
+ 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
@@ -1734,17 +2217,17 @@ am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
-echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
-echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6
- # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
+{ echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6; }
+ # Check whether --enable-maintainer-mode was given.
if test "${enable_maintainer_mode+set}" = set; then
- enableval="$enable_maintainer_mode"
- USE_MAINTAINER_MODE=$enableval
+ enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
else
USE_MAINTAINER_MODE=no
-fi;
- echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
-echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6
+fi
+
+ { echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
+echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6; }
if test $USE_MAINTAINER_MODE = yes; then
@@ -1758,12 +2241,12 @@ fi
MAINT=$MAINTAINER_MODE_TRUE
- ac_config_headers="$ac_config_headers config.h"
+ac_config_headers="$ac_config_headers config.h"
DEPDIR="${am__leading_dot}deps"
- ac_config_commands="$ac_config_commands depfiles"
+ac_config_commands="$ac_config_commands depfiles"
am_make=${MAKE-make}
@@ -1773,8 +2256,8 @@ am__doit:
.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
+{ 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; }
am__include="#"
am__quote=
_am_result=none
@@ -1801,15 +2284,15 @@ if test "$am__include" = "#"; then
fi
-echo "$as_me:$LINENO: result: $_am_result" >&5
-echo "${ECHO_T}$_am_result" >&6
+{ echo "$as_me:$LINENO: result: $_am_result" >&5
+echo "${ECHO_T}$_am_result" >&6; }
rm -f confinc confmf
-# Check whether --enable-dependency-tracking or --disable-dependency-tracking was given.
+# Check whether --enable-dependency-tracking was given.
if test "${enable_dependency_tracking+set}" = set; then
- enableval="$enable_dependency_tracking"
-
-fi;
+ enableval=$enable_dependency_tracking;
+fi
+
if test "x$enable_dependency_tracking" != xno; then
am_depcomp="$ac_aux_dir/depcomp"
AMDEPBACKSLASH='\'
@@ -1834,8 +2317,8 @@ 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
+{ 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
else
@@ -1848,32 +2331,34 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ 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
break 2
fi
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
+ { echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
fi
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
+{ 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
else
@@ -1886,36 +2371,51 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ 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
break 2
fi
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
+ { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+echo "${ECHO_T}$ac_ct_CC" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
- CC=$ac_ct_CC
+ if test "x$ac_ct_CC" = x; then
+ CC=""
+ 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
+ CC=$ac_ct_CC
+ fi
else
CC="$ac_cv_prog_CC"
fi
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.
+ 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
+{ 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
else
@@ -1928,74 +2428,34 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ 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
break 2
fi
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
+ { echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
-fi
-if test -z "$ac_cv_prog_CC"; then
- ac_ct_CC=$CC
- # 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_ac_ct_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test -n "$ac_ct_CC"; then
- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # 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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_ac_ct_CC="cc"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-
-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
-else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
- CC=$ac_ct_CC
-else
- CC="$ac_cv_prog_CC"
-fi
+ fi
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
+{ 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
else
@@ -2009,7 +2469,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ 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
@@ -2020,6 +2480,7 @@ do
fi
done
done
+IFS=$as_save_IFS
if test $ac_prog_rejected = yes; then
# We found a bogon in the path, so make sure we never use it.
@@ -2037,22 +2498,23 @@ fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
+ { echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
fi
if test -z "$CC"; then
if test -n "$ac_tool_prefix"; then
- for ac_prog in cl
+ for ac_prog in cl.exe
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
+{ 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
else
@@ -2065,36 +2527,38 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ 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
break 2
fi
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
+ { echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
test -n "$CC" && break
done
fi
if test -z "$CC"; then
ac_ct_CC=$CC
- for ac_prog in cl
+ for ac_prog in cl.exe
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
+{ 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
else
@@ -2107,29 +2571,45 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ 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
break 2
fi
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
+ { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+echo "${ECHO_T}$ac_ct_CC" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
test -n "$ac_ct_CC" && break
done
- CC=$ac_ct_CC
+ if test "x$ac_ct_CC" = x; then
+ CC=""
+ 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
+ CC=$ac_ct_CC
+ fi
fi
fi
@@ -2142,21 +2622,35 @@ See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
# Provide some information about the compiler.
-echo "$as_me:$LINENO:" \
- "checking for C compiler version" >&5
+echo "$as_me:$LINENO: checking for C compiler version" >&5
ac_compiler=`set X $ac_compile; echo $2`
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
- (eval $ac_compiler --version </dev/null >&5) 2>&5
+{ (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); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
- (eval $ac_compiler -v </dev/null >&5) 2>&5
+{ (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); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
- (eval $ac_compiler -V </dev/null >&5) 2>&5
+{ (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); }
@@ -2181,47 +2675,77 @@ ac_clean_files="$ac_clean_files a.out a.exe b.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
+{ 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[^ ]*//'`
-if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5
- (eval $ac_link_default) 2>&5
+#
+# 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.
+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_rmfiles="$ac_rmfiles $ac_file";;
+ esac
+done
+rm -f $ac_rmfiles
+
+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_link_default") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
- # Find the output, starting from the most likely. This scheme is
-# not robust to junk in `.', hence go to wildcards (a.*) only as a last
-# resort.
-
-# Be careful to initialize this variable, since it used to be cached.
-# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile.
-ac_cv_exeext=
-# b.out is created by i960 compilers.
-for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out
+ # 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,
+# so that the user can short-circuit this test for compilers unknown to
+# Autoconf.
+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 | *.o | *.obj )
- ;;
- conftest.$ac_ext )
- # This is the source file.
+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj )
;;
[ab].out )
# We found the default executable, but exeext='' is most
# certainly right.
break;;
*.* )
- ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
- # FIXME: I believe we export ac_cv_exeext for Libtool,
- # but it would be cool to find out if it's true. Does anybody
- # maintain Libtool? --akim.
- export ac_cv_exeext
+ if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
+ then :; else
+ ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+ fi
+ # We set ac_cv_exeext here because the later test for it is not
+ # safe: cross compilers may not add the suffix if given an `-o'
+ # argument, so we may need to know it at that point already.
+ # Even if this section looks crufty: it has the advantage of
+ # actually working.
break;;
* )
break;;
esac
done
+test "$ac_cv_exeext" = no && ac_cv_exeext=
+
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
sed 's/^/| /' conftest.$ac_ext >&5
@@ -2233,19 +2757,21 @@ See \`config.log' for more details." >&2;}
fi
ac_exeext=$ac_cv_exeext
-echo "$as_me:$LINENO: result: $ac_file" >&5
-echo "${ECHO_T}$ac_file" >&6
-# Check the compiler produces executables we can run. If not, either
+# 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
+{ 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
# If not cross compiling, check that we can run a simple program.
if test "$cross_compiling" != yes; then
if { ac_try='./$ac_file'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&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_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -2264,22 +2790,27 @@ See \`config.log' for more details." >&2;}
fi
fi
fi
-echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+{ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
rm -f a.out a.exe conftest$ac_cv_exeext b.out
ac_clean_files=$ac_clean_files_save
-# Check the compiler produces executables we can run. If not, either
+# 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 { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
+{ 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"
+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); }; then
@@ -2290,9 +2821,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
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 | *.o | *.obj ) ;;
+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
*.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
- export ac_cv_exeext
break;;
* ) break;;
esac
@@ -2306,14 +2836,14 @@ See \`config.log' for more details." >&2;}
fi
rm -f conftest$ac_cv_exeext
-echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
-echo "${ECHO_T}$ac_cv_exeext" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
+echo "${ECHO_T}$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
+{ 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
else
@@ -2333,14 +2863,20 @@ main ()
}
_ACEOF
rm -f conftest.o conftest.obj
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
+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>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
- for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
+ 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 ) ;;
+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;;
*) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
break;;
esac
@@ -2358,12 +2894,12 @@ 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
+{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
+echo "${ECHO_T}$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
+{ 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
else
@@ -2386,50 +2922,49 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+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); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; 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 conftest.err conftest.$ac_objext conftest.$ac_ext
+
+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
+{ 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`
ac_test_CFLAGS=${CFLAGS+set}
ac_save_CFLAGS=$CFLAGS
-CFLAGS="-g"
-echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
+{ 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
else
- cat >conftest.$ac_ext <<_ACEOF
+ 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
@@ -2445,38 +2980,118 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+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); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; 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
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&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
+
+ 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
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
ac_cv_prog_cc_g=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_prog_cc_g=no
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+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
+{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
+echo "${ECHO_T}$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
@@ -2492,12 +3107,12 @@ else
CFLAGS=
fi
fi
-echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
-echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
-if test "${ac_cv_prog_cc_stdc+set}" = set; then
+{ 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
else
- ac_cv_prog_cc_stdc=no
+ ac_cv_prog_cc_c89=no
ac_save_CC=$CC
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -2531,12 +3146,17 @@ static char *f (char * (*g) (char **, int), char **p, ...)
/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has
function prototypes and stuff, but not '\xHH' hex character constants.
These don't provoke an error unfortunately, instead are silently treated
- as 'x'. The following induces an error, until -std1 is added to get
+ as 'x'. The following induces an error, until -std is added to get
proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an
array size at least. It's necessary to write '\x00'==0 to get something
- that's true only with -std1. */
+ that's true only with -std. */
int osf4_cc_array ['\x00' == 0 ? 1 : -1];
+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
+ inside strings and character constants. */
+#define FOO(x) 'x'
+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
+
int test (int i, double x);
struct s1 {int (*f) (int a);};
struct s2 {int (*f) (double a);};
@@ -2551,205 +3171,57 @@ return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1];
return 0;
}
_ACEOF
-# Don't try gcc -ansi; that turns off useful extensions and
-# breaks some systems' header files.
-# AIX -qlanglvl=ansi
-# Ultrix and OSF/1 -std1
-# HP-UX 10.20 and later -Ae
-# HP-UX older versions -Aa -D_HPUX_SOURCE
-# SVR4 -Xc -D__EXTENSIONS__
-for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
+ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
do
CC="$ac_save_CC $ac_arg"
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+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); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_prog_cc_stdc=$ac_arg
-break
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; 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 conftest.err conftest.$ac_objext
+
+rm -f core conftest.err conftest.$ac_objext
+ test "x$ac_cv_prog_cc_c89" != "xno" && break
done
-rm -f conftest.$ac_ext conftest.$ac_objext
+rm -f conftest.$ac_ext
CC=$ac_save_CC
fi
-
-case "x$ac_cv_prog_cc_stdc" in
- x|xno)
- echo "$as_me:$LINENO: result: none needed" >&5
-echo "${ECHO_T}none needed" >&6 ;;
+# 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; } ;;
+ xno)
+ { echo "$as_me:$LINENO: result: unsupported" >&5
+echo "${ECHO_T}unsupported" >&6; } ;;
*)
- echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
- CC="$CC $ac_cv_prog_cc_stdc" ;;
+ 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; } ;;
esac
-# Some people use a C++ compiler to compile C. Since we use `exit',
-# in C++ we need to declare it. In case someone uses the same compiler
-# for both compiling C and C++ we need to have the C++ compiler decide
-# the declaration of exit, since it's the most demanding environment.
-cat >conftest.$ac_ext <<_ACEOF
-@%:@ifndef __cplusplus
- choke me
-@%:@endif
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- for ac_declaration in \
- '' \
- 'extern "C" void std::exit (int) throw (); using std::exit;' \
- 'extern "C" void std::exit (int); using std::exit;' \
- 'extern "C" void exit (int) throw ();' \
- 'extern "C" void exit (int);' \
- 'void exit (int);'
-do
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_declaration
-@%:@include <stdlib.h>
-int
-main ()
-{
-exit (42);
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- :
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-continue
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_declaration
-int
-main ()
-{
-exit (42);
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- break
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-rm -f conftest*
-if test -n "$ac_declaration"; then
- echo '#ifdef __cplusplus' >>confdefs.h
- echo $ac_declaration >>confdefs.h
- echo '#endif' >>confdefs.h
-fi
-
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -2758,8 +3230,8 @@ 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
+{ 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
else
@@ -2848,8 +3320,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
+{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
+echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
@@ -2866,13 +3338,12 @@ fi
-echo "$as_me:$LINENO: checking for library containing strerror" >&5
-echo $ECHO_N "checking for library containing strerror... $ECHO_C" >&6
+{ 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
else
ac_func_search_save_LIBS=$LIBS
-ac_cv_search_strerror=no
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -2880,115 +3351,73 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-/* Override any gcc2 internal prototype to avoid an error. */
+/* 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
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
char strerror ();
int
main ()
{
-strerror ();
+return strerror ();
;
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+for ac_lib in '' cposix; do
+ if test -z "$ac_lib"; then
+ ac_res="none required"
+ else
+ 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); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_search_strerror="none required"
+ (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_search_strerror=$ac_res
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-if test "$ac_cv_search_strerror" = no; then
- for ac_lib in cposix; do
- LIBS="-l$ac_lib $ac_func_search_save_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 gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char strerror ();
-int
-main ()
-{
-strerror ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&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); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_search_strerror="-l$ac_lib"
-break
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext
+ if test "${ac_cv_search_strerror+set}" = set; then
+ break
fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- done
+done
+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
-if test "$ac_cv_search_strerror" != no; then
- test "$ac_cv_search_strerror" = "none required" || LIBS="$ac_cv_search_strerror $LIBS"
+{ echo "$as_me:$LINENO: result: $ac_cv_search_strerror" >&5
+echo "${ECHO_T}$ac_cv_search_strerror" >&6; }
+ac_res=$ac_cv_search_strerror
+if test "$ac_res" != no; then
+ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
fi
@@ -3000,8 +3429,8 @@ 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
+{ 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
else
@@ -3014,32 +3443,34 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ 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
break 2
fi
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
+ { echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
fi
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
+{ 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
else
@@ -3052,36 +3483,51 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ 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
break 2
fi
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
+ { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+echo "${ECHO_T}$ac_ct_CC" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
- CC=$ac_ct_CC
+ if test "x$ac_ct_CC" = x; then
+ CC=""
+ 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
+ CC=$ac_ct_CC
+ fi
else
CC="$ac_cv_prog_CC"
fi
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.
+ 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
+{ 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
else
@@ -3094,74 +3540,34 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ 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
break 2
fi
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
+ { echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
-fi
-if test -z "$ac_cv_prog_CC"; then
- ac_ct_CC=$CC
- # 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_ac_ct_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test -n "$ac_ct_CC"; then
- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # 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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_ac_ct_CC="cc"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-
-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
-else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
- CC=$ac_ct_CC
-else
- CC="$ac_cv_prog_CC"
-fi
+ fi
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
+{ 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
else
@@ -3175,7 +3581,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ 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
@@ -3186,6 +3592,7 @@ do
fi
done
done
+IFS=$as_save_IFS
if test $ac_prog_rejected = yes; then
# We found a bogon in the path, so make sure we never use it.
@@ -3203,22 +3610,23 @@ fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
+ { echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
fi
if test -z "$CC"; then
if test -n "$ac_tool_prefix"; then
- for ac_prog in cl
+ for ac_prog in cl.exe
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
+{ 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
else
@@ -3231,36 +3639,38 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ 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
break 2
fi
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
+ { echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
test -n "$CC" && break
done
fi
if test -z "$CC"; then
ac_ct_CC=$CC
- for ac_prog in cl
+ for ac_prog in cl.exe
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
+{ 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
else
@@ -3273,29 +3683,45 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ 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
break 2
fi
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
+ { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+echo "${ECHO_T}$ac_ct_CC" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
test -n "$ac_ct_CC" && break
done
- CC=$ac_ct_CC
+ if test "x$ac_ct_CC" = x; then
+ CC=""
+ 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
+ CC=$ac_ct_CC
+ fi
fi
fi
@@ -3308,27 +3734,41 @@ See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
# Provide some information about the compiler.
-echo "$as_me:$LINENO:" \
- "checking for C compiler version" >&5
+echo "$as_me:$LINENO: checking for C compiler version" >&5
ac_compiler=`set X $ac_compile; echo $2`
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
- (eval $ac_compiler --version </dev/null >&5) 2>&5
+{ (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); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
- (eval $ac_compiler -v </dev/null >&5) 2>&5
+{ (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); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
- (eval $ac_compiler -V </dev/null >&5) 2>&5
+{ (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); }
-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
+{ 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
else
@@ -3351,50 +3791,49 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+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); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; 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 conftest.err conftest.$ac_objext conftest.$ac_ext
+
+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
+{ 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`
ac_test_CFLAGS=${CFLAGS+set}
ac_save_CFLAGS=$CFLAGS
-CFLAGS="-g"
-echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
+{ 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
else
- cat >conftest.$ac_ext <<_ACEOF
+ 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
@@ -3410,38 +3849,118 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+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); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; 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
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&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
+
+ 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
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
ac_cv_prog_cc_g=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_prog_cc_g=no
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+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
+{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
+echo "${ECHO_T}$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
@@ -3457,12 +3976,12 @@ else
CFLAGS=
fi
fi
-echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
-echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
-if test "${ac_cv_prog_cc_stdc+set}" = set; then
+{ 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
else
- ac_cv_prog_cc_stdc=no
+ ac_cv_prog_cc_c89=no
ac_save_CC=$CC
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -3496,12 +4015,17 @@ static char *f (char * (*g) (char **, int), char **p, ...)
/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has
function prototypes and stuff, but not '\xHH' hex character constants.
These don't provoke an error unfortunately, instead are silently treated
- as 'x'. The following induces an error, until -std1 is added to get
+ as 'x'. The following induces an error, until -std is added to get
proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an
array size at least. It's necessary to write '\x00'==0 to get something
- that's true only with -std1. */
+ that's true only with -std. */
int osf4_cc_array ['\x00' == 0 ? 1 : -1];
+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
+ inside strings and character constants. */
+#define FOO(x) 'x'
+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
+
int test (int i, double x);
struct s1 {int (*f) (int a);};
struct s2 {int (*f) (double a);};
@@ -3516,205 +4040,57 @@ return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1];
return 0;
}
_ACEOF
-# Don't try gcc -ansi; that turns off useful extensions and
-# breaks some systems' header files.
-# AIX -qlanglvl=ansi
-# Ultrix and OSF/1 -std1
-# HP-UX 10.20 and later -Ae
-# HP-UX older versions -Aa -D_HPUX_SOURCE
-# SVR4 -Xc -D__EXTENSIONS__
-for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
+ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
do
CC="$ac_save_CC $ac_arg"
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+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); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_prog_cc_stdc=$ac_arg
-break
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; 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 conftest.err conftest.$ac_objext
+
+rm -f core conftest.err conftest.$ac_objext
+ test "x$ac_cv_prog_cc_c89" != "xno" && break
done
-rm -f conftest.$ac_ext conftest.$ac_objext
+rm -f conftest.$ac_ext
CC=$ac_save_CC
fi
-
-case "x$ac_cv_prog_cc_stdc" in
- x|xno)
- echo "$as_me:$LINENO: result: none needed" >&5
-echo "${ECHO_T}none needed" >&6 ;;
+# 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; } ;;
+ xno)
+ { echo "$as_me:$LINENO: result: unsupported" >&5
+echo "${ECHO_T}unsupported" >&6; } ;;
*)
- echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
- CC="$CC $ac_cv_prog_cc_stdc" ;;
+ 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; } ;;
esac
-# Some people use a C++ compiler to compile C. Since we use `exit',
-# in C++ we need to declare it. In case someone uses the same compiler
-# for both compiling C and C++ we need to have the C++ compiler decide
-# the declaration of exit, since it's the most demanding environment.
-cat >conftest.$ac_ext <<_ACEOF
-@%:@ifndef __cplusplus
- choke me
-@%:@endif
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- for ac_declaration in \
- '' \
- 'extern "C" void std::exit (int) throw (); using std::exit;' \
- 'extern "C" void std::exit (int); using std::exit;' \
- 'extern "C" void exit (int) throw ();' \
- 'extern "C" void exit (int);' \
- 'void exit (int);'
-do
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_declaration
-@%:@include <stdlib.h>
-int
-main ()
-{
-exit (42);
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- :
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-continue
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_declaration
-int
-main ()
-{
-exit (42);
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- break
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-rm -f conftest*
-if test -n "$ac_declaration"; then
- echo '#ifdef __cplusplus' >>confdefs.h
- echo $ac_declaration >>confdefs.h
- echo '#endif' >>confdefs.h
-fi
-
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -3723,8 +4099,8 @@ 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
+{ 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
else
@@ -3813,8 +4189,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
+{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
+echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
@@ -3838,8 +4214,8 @@ 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
+{ 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
else
@@ -3852,32 +4228,34 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ 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
break 2
fi
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
+ { echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
fi
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
+{ 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
else
@@ -3890,36 +4268,51 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ 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
break 2
fi
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
+ { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+echo "${ECHO_T}$ac_ct_CC" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
- CC=$ac_ct_CC
+ if test "x$ac_ct_CC" = x; then
+ CC=""
+ 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
+ CC=$ac_ct_CC
+ fi
else
CC="$ac_cv_prog_CC"
fi
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.
+ 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
+{ 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
else
@@ -3932,74 +4325,34 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ 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
break 2
fi
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
+ { echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
-fi
-if test -z "$ac_cv_prog_CC"; then
- ac_ct_CC=$CC
- # 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_ac_ct_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test -n "$ac_ct_CC"; then
- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # 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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_ac_ct_CC="cc"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-
-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
-else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
- CC=$ac_ct_CC
-else
- CC="$ac_cv_prog_CC"
-fi
+ fi
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
+{ 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
else
@@ -4013,7 +4366,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ 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
@@ -4024,6 +4377,7 @@ do
fi
done
done
+IFS=$as_save_IFS
if test $ac_prog_rejected = yes; then
# We found a bogon in the path, so make sure we never use it.
@@ -4041,22 +4395,23 @@ fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
+ { echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
fi
if test -z "$CC"; then
if test -n "$ac_tool_prefix"; then
- for ac_prog in cl
+ for ac_prog in cl.exe
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
+{ 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
else
@@ -4069,36 +4424,38 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ 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
break 2
fi
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
+ { echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
test -n "$CC" && break
done
fi
if test -z "$CC"; then
ac_ct_CC=$CC
- for ac_prog in cl
+ for ac_prog in cl.exe
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
+{ 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
else
@@ -4111,29 +4468,45 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ 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
break 2
fi
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
+ { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+echo "${ECHO_T}$ac_ct_CC" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
test -n "$ac_ct_CC" && break
done
- CC=$ac_ct_CC
+ if test "x$ac_ct_CC" = x; then
+ CC=""
+ 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
+ CC=$ac_ct_CC
+ fi
fi
fi
@@ -4146,27 +4519,41 @@ See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
# Provide some information about the compiler.
-echo "$as_me:$LINENO:" \
- "checking for C compiler version" >&5
+echo "$as_me:$LINENO: checking for C compiler version" >&5
ac_compiler=`set X $ac_compile; echo $2`
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
- (eval $ac_compiler --version </dev/null >&5) 2>&5
+{ (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); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
- (eval $ac_compiler -v </dev/null >&5) 2>&5
+{ (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); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
- (eval $ac_compiler -V </dev/null >&5) 2>&5
+{ (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); }
-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
+{ 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
else
@@ -4189,50 +4576,49 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+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); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; 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 conftest.err conftest.$ac_objext conftest.$ac_ext
+
+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
+{ 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`
ac_test_CFLAGS=${CFLAGS+set}
ac_save_CFLAGS=$CFLAGS
-CFLAGS="-g"
-echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
+{ 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
else
- cat >conftest.$ac_ext <<_ACEOF
+ 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
@@ -4248,38 +4634,118 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+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); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; 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
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&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
+
+ 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
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
ac_cv_prog_cc_g=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_prog_cc_g=no
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+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
+{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
+echo "${ECHO_T}$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
@@ -4295,12 +4761,12 @@ else
CFLAGS=
fi
fi
-echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
-echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
-if test "${ac_cv_prog_cc_stdc+set}" = set; then
+{ 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
else
- ac_cv_prog_cc_stdc=no
+ ac_cv_prog_cc_c89=no
ac_save_CC=$CC
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -4334,12 +4800,17 @@ static char *f (char * (*g) (char **, int), char **p, ...)
/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has
function prototypes and stuff, but not '\xHH' hex character constants.
These don't provoke an error unfortunately, instead are silently treated
- as 'x'. The following induces an error, until -std1 is added to get
+ as 'x'. The following induces an error, until -std is added to get
proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an
array size at least. It's necessary to write '\x00'==0 to get something
- that's true only with -std1. */
+ that's true only with -std. */
int osf4_cc_array ['\x00' == 0 ? 1 : -1];
+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
+ inside strings and character constants. */
+#define FOO(x) 'x'
+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
+
int test (int i, double x);
struct s1 {int (*f) (int a);};
struct s2 {int (*f) (double a);};
@@ -4354,205 +4825,57 @@ return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1];
return 0;
}
_ACEOF
-# Don't try gcc -ansi; that turns off useful extensions and
-# breaks some systems' header files.
-# AIX -qlanglvl=ansi
-# Ultrix and OSF/1 -std1
-# HP-UX 10.20 and later -Ae
-# HP-UX older versions -Aa -D_HPUX_SOURCE
-# SVR4 -Xc -D__EXTENSIONS__
-for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
+ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
do
CC="$ac_save_CC $ac_arg"
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+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); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_prog_cc_stdc=$ac_arg
-break
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; 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 conftest.err conftest.$ac_objext
+
+rm -f core conftest.err conftest.$ac_objext
+ test "x$ac_cv_prog_cc_c89" != "xno" && break
done
-rm -f conftest.$ac_ext conftest.$ac_objext
+rm -f conftest.$ac_ext
CC=$ac_save_CC
fi
-
-case "x$ac_cv_prog_cc_stdc" in
- x|xno)
- echo "$as_me:$LINENO: result: none needed" >&5
-echo "${ECHO_T}none needed" >&6 ;;
+# 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; } ;;
+ xno)
+ { echo "$as_me:$LINENO: result: unsupported" >&5
+echo "${ECHO_T}unsupported" >&6; } ;;
*)
- echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
- CC="$CC $ac_cv_prog_cc_stdc" ;;
+ 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; } ;;
esac
-# Some people use a C++ compiler to compile C. Since we use `exit',
-# in C++ we need to declare it. In case someone uses the same compiler
-# for both compiling C and C++ we need to have the C++ compiler decide
-# the declaration of exit, since it's the most demanding environment.
-cat >conftest.$ac_ext <<_ACEOF
-@%:@ifndef __cplusplus
- choke me
-@%:@endif
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- for ac_declaration in \
- '' \
- 'extern "C" void std::exit (int) throw (); using std::exit;' \
- 'extern "C" void std::exit (int); using std::exit;' \
- 'extern "C" void exit (int) throw ();' \
- 'extern "C" void exit (int);' \
- 'void exit (int);'
-do
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_declaration
-@%:@include <stdlib.h>
-int
-main ()
-{
-exit (42);
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- :
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-continue
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_declaration
-int
-main ()
-{
-exit (42);
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- break
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-rm -f conftest*
-if test -n "$ac_declaration"; then
- echo '#ifdef __cplusplus' >>confdefs.h
- echo $ac_declaration >>confdefs.h
- echo '#endif' >>confdefs.h
-fi
-
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -4561,8 +4884,8 @@ 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
+{ 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
else
@@ -4651,8 +4974,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
+{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
+echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
@@ -4676,8 +4999,8 @@ 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
+{ 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; }
# On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then
CPP=
@@ -4711,24 +5034,22 @@ cat >>conftest.$ac_ext <<_ACEOF
@%:@endif
Syntax error
_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+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; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+ (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
@@ -4737,9 +5058,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
# Broken: fails on valid input.
continue
fi
+
rm -f conftest.err conftest.$ac_ext
- # OK, works on sane cases. Now check whether non-existent headers
+ # OK, works on sane cases. Now check whether nonexistent headers
# can be detected and how.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -4749,24 +5071,22 @@ cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@%:@include <ac_nonexistent.h>
_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+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; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
# Broken: success on invalid input.
continue
else
@@ -4777,6 +5097,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_preproc_ok=:
break
fi
+
rm -f conftest.err conftest.$ac_ext
done
@@ -4794,8 +5115,8 @@ fi
else
ac_cv_prog_CPP=$CPP
fi
-echo "$as_me:$LINENO: result: $CPP" >&5
-echo "${ECHO_T}$CPP" >&6
+{ echo "$as_me:$LINENO: result: $CPP" >&5
+echo "${ECHO_T}$CPP" >&6; }
ac_preproc_ok=false
for ac_c_preproc_warn_flag in '' yes
do
@@ -4818,24 +5139,22 @@ cat >>conftest.$ac_ext <<_ACEOF
@%:@endif
Syntax error
_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+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; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+ (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
@@ -4844,9 +5163,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
# Broken: fails on valid input.
continue
fi
+
rm -f conftest.err conftest.$ac_ext
- # OK, works on sane cases. Now check whether non-existent headers
+ # OK, works on sane cases. Now check whether nonexistent headers
# can be detected and how.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -4856,24 +5176,22 @@ cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@%:@include <ac_nonexistent.h>
_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+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; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
# Broken: success on invalid input.
continue
else
@@ -4884,6 +5202,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_preproc_ok=:
break
fi
+
rm -f conftest.err conftest.$ac_ext
done
@@ -4906,23 +5225,170 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
ac_compiler_gnu=$ac_cv_c_compiler_gnu
-echo "$as_me:$LINENO: checking for egrep" >&5
-echo $ECHO_N "checking for egrep... $ECHO_C" >&6
-if test "${ac_cv_prog_egrep+set}" = set; then
+{ 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
else
- if echo a | (grep -E '(a|b)') >/dev/null 2>&1
- then ac_cv_prog_egrep='grep -E'
- else ac_cv_prog_egrep='egrep'
+ 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
+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.
+ # 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"
+ while :
+ do
+ cat "conftest.in" "conftest.in" >"conftest.tmp"
+ mv "conftest.tmp" "conftest.in"
+ cp "conftest.in" "conftest.nl"
+ 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`
+ 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"
+ ac_path_GREP_max=$ac_count
fi
+ # 10*(2^10) chars as input seems more than enough
+ test $ac_count -gt 10 && break
+ done
+ rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+
+ $ac_path_GREP_found && break 3
+ done
+done
+
+done
+IFS=$as_save_IFS
+
+
fi
-echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
-echo "${ECHO_T}$ac_cv_prog_egrep" >&6
- EGREP=$ac_cv_prog_egrep
+
+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
+
+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; }
+ 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
+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
+ 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
+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.
+ # 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"
+ while :
+ do
+ cat "conftest.in" "conftest.in" >"conftest.tmp"
+ mv "conftest.tmp" "conftest.in"
+ cp "conftest.in" "conftest.nl"
+ 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`
+ 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"
+ ac_path_EGREP_max=$ac_count
+ fi
+ # 10*(2^10) chars as input seems more than enough
+ test $ac_count -gt 10 && break
+ done
+ rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+
+ $ac_path_EGREP_found && break 3
+ 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
+
+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; }
+ 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
+{ 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
else
@@ -4946,35 +5412,31 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+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); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; 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 conftest.err conftest.$ac_objext conftest.$ac_ext
+
+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.
@@ -5030,6 +5492,7 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <ctype.h>
+#include <stdlib.h>
#if ((' ' & 0x0FF) == 0x020)
# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
@@ -5049,18 +5512,27 @@ main ()
for (i = 0; i < 256; i++)
if (XOR (islower (i), ISLOWER (i))
|| toupper (i) != TOUPPER (i))
- exit(2);
- exit (0);
+ return 2;
+ return 0;
}
_ACEOF
rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
+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'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&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_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -5073,12 +5545,14 @@ sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
ac_cv_header_stdc=no
fi
-rm -f core *.core 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.$ac_ext
fi
+
+
fi
fi
-echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-echo "${ECHO_T}$ac_cv_header_stdc" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
+echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
if test $ac_cv_header_stdc = yes; then
cat >>confdefs.h <<\_ACEOF
@@ -5102,9 +5576,9 @@ 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 eval "test \"\${$as_ac_Header+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
else
cat >conftest.$ac_ext <<_ACEOF
@@ -5118,38 +5592,35 @@ $ac_includes_default
@%:@include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+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); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (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"
+ eval "$as_ac_Header=no"
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+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
@@ -5161,21 +5632,22 @@ done
-for ac_header in pcre/pcre.h
+for ac_header in pcre.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
- echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+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
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+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
+{ 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
@@ -5186,41 +5658,37 @@ $ac_includes_default
@%:@include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+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); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (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
+ ac_header_compiler=no
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
+
+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
+{ 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
@@ -5229,24 +5697,22 @@ cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@%:@include <$ac_header>
_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+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; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+ (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
@@ -5254,9 +5720,10 @@ 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
+{ 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
@@ -5280,25 +5747,19 @@ echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\
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 the AC_PACKAGE_NAME lists. @%:@@%:@
-@%:@@%:@ ------------------------------------------ @%:@@%:@
-_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 eval "test \"\${$as_ac_Header+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
else
eval "$as_ac_Header=\$ac_header_preproc"
fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+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
@@ -5318,18 +5779,19 @@ done
for ac_header in pty.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
- echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+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
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+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
+{ 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
@@ -5340,41 +5802,37 @@ $ac_includes_default
@%:@include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+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); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (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
+ ac_header_compiler=no
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
+
+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
+{ 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
@@ -5383,24 +5841,22 @@ cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@%:@include <$ac_header>
_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+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; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+ (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
@@ -5408,9 +5864,10 @@ 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
+{ 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
@@ -5434,25 +5891,19 @@ echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\
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 the AC_PACKAGE_NAME lists. @%:@@%:@
-@%:@@%:@ ------------------------------------------ @%:@@%:@
-_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 eval "test \"\${$as_ac_Header+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
else
eval "$as_ac_Header=\$ac_header_preproc"
fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+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
@@ -5468,8 +5919,8 @@ fi
done
-echo "$as_me:$LINENO: checking for \"/proc/net/route\"" >&5
-echo $ECHO_N "checking for \"/proc/net/route\"... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for \"/proc/net/route\"" >&5
+echo $ECHO_N "checking for \"/proc/net/route\"... $ECHO_C" >&6; }
if test "${ac_cv_file___proc_net_route_+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -5483,8 +5934,8 @@ else
ac_cv_file___proc_net_route_=no
fi
fi
-echo "$as_me:$LINENO: result: $ac_cv_file___proc_net_route_" >&5
-echo "${ECHO_T}$ac_cv_file___proc_net_route_" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_file___proc_net_route_" >&5
+echo "${ECHO_T}$ac_cv_file___proc_net_route_" >&6; }
if test $ac_cv_file___proc_net_route_ = yes; then
:
else
@@ -5496,13 +5947,13 @@ fi
pkg_modules="libgnomeui-2.0"
- succeeded=no
- if test -z "$PKG_CONFIG"; then
- # 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 "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+ 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
else
@@ -5517,82 +5968,215 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ 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
break 2
fi
done
done
+IFS=$as_save_IFS
- test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
;;
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
+ { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
+fi
+if test -z "$ac_cv_path_PKG_CONFIG"; then
+ 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
+else
+ case $ac_pt_PKG_CONFIG in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # 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_ac_pt_PKG_CONFIG="$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 "$PKG_CONFIG" = "no" ; then
- echo "*** The pkg-config script could not be found. Make sure it is"
- echo "*** in your path, or set the PKG_CONFIG environment variable"
- echo "*** to the full path to pkg-config."
- echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
+ ;;
+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; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+ if test "x$ac_pt_PKG_CONFIG" = x; then
+ PKG_CONFIG=""
else
- PKG_CONFIG_MIN_VERSION=0.9.0
- if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
- echo "$as_me:$LINENO: checking for $pkg_modules" >&5
-echo $ECHO_N "checking for $pkg_modules... $ECHO_C" >&6
-
- if $PKG_CONFIG --exists "$pkg_modules" ; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
- succeeded=yes
-
- echo "$as_me:$LINENO: checking PACKAGE_CFLAGS" >&5
-echo $ECHO_N "checking PACKAGE_CFLAGS... $ECHO_C" >&6
- PACKAGE_CFLAGS=`$PKG_CONFIG --cflags "$pkg_modules"`
- echo "$as_me:$LINENO: result: $PACKAGE_CFLAGS" >&5
-echo "${ECHO_T}$PACKAGE_CFLAGS" >&6
-
- echo "$as_me:$LINENO: checking PACKAGE_LIBS" >&5
-echo $ECHO_N "checking PACKAGE_LIBS... $ECHO_C" >&6
- PACKAGE_LIBS=`$PKG_CONFIG --libs "$pkg_modules"`
- echo "$as_me:$LINENO: result: $PACKAGE_LIBS" >&5
-echo "${ECHO_T}$PACKAGE_LIBS" >&6
- else
- PACKAGE_CFLAGS=""
- PACKAGE_LIBS=""
- ## If we have a custom action on failure, don't print errors, but
- ## do set a variable so people can do so.
- PACKAGE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$pkg_modules"`
- echo $PACKAGE_PKG_ERRORS
- fi
+ 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
+ PKG_CONFIG=$ac_pt_PKG_CONFIG
+ fi
+else
+ PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
+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; }
+ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+ { 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; }
+ PKG_CONFIG=""
+ fi
+
+fi
+
+pkg_failed=no
+{ echo "$as_me:$LINENO: checking for PACKAGE" >&5
+echo $ECHO_N "checking for PACKAGE... $ECHO_C" >&6; }
+
+if test -n "$PKG_CONFIG"; then
+ if test -n "$PACKAGE_CFLAGS"; then
+ pkg_cv_PACKAGE_CFLAGS="$PACKAGE_CFLAGS"
+ else
+ if test -n "$PKG_CONFIG" && \
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$pkg_modules\"") >&5
+ ($PKG_CONFIG --exists --print-errors "$pkg_modules") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ pkg_cv_PACKAGE_CFLAGS=`$PKG_CONFIG --cflags "$pkg_modules" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ fi
+else
+ pkg_failed=untried
+fi
+if test -n "$PKG_CONFIG"; then
+ if test -n "$PACKAGE_LIBS"; then
+ pkg_cv_PACKAGE_LIBS="$PACKAGE_LIBS"
+ else
+ if test -n "$PKG_CONFIG" && \
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$pkg_modules\"") >&5
+ ($PKG_CONFIG --exists --print-errors "$pkg_modules") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ pkg_cv_PACKAGE_LIBS=`$PKG_CONFIG --libs "$pkg_modules" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ fi
+else
+ pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
-
- else
- echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
- echo "*** See http://www.freedesktop.org/software/pkgconfig"
- fi
- fi
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi
+ if test $_pkg_short_errors_supported = yes; then
+ PACKAGE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$pkg_modules"`
+ else
+ PACKAGE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$pkg_modules"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$PACKAGE_PKG_ERRORS" >&5
- if test $succeeded = yes; then
- :
- else
- { { echo "$as_me:$LINENO: error: Library requirements ($pkg_modules) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
-echo "$as_me: error: Library requirements ($pkg_modules) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
+ { { echo "$as_me:$LINENO: error: Package requirements ($pkg_modules) were not met:
+
+$PACKAGE_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 PACKAGE_CFLAGS
+and PACKAGE_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 ($pkg_modules) were not met:
+
+$PACKAGE_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 PACKAGE_CFLAGS
+and PACKAGE_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+" >&2;}
{ (exit 1); exit 1; }; }
- fi
+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 PACKAGE_CFLAGS
+and PACKAGE_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
+See \`config.log' for more details." >&5
+echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables PACKAGE_CFLAGS
+and PACKAGE_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
+See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }
+else
+ PACKAGE_CFLAGS=$pkg_cv_PACKAGE_CFLAGS
+ PACKAGE_LIBS=$pkg_cv_PACKAGE_LIBS
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+ :
+fi
PACKAGE_LIBS="$PACKAGE_LIBS"
@@ -5605,23 +6189,107 @@ _ACEOF
ALL_LINGUAS=""
+# 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
+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; }; }
+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; }; }
+
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5
+echo "${ECHO_T}$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; }; };;
+esac
+build=$ac_cv_build
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_build
+shift
+build_cpu=$1
+build_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+build_os=$*
+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
+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; }; }
+fi
+
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5
+echo "${ECHO_T}$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; }; };;
+esac
+host=$ac_cv_host
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_host
+shift
+host_cpu=$1
+host_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+host_os=$*
+IFS=$ac_save_IFS
+case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
+
+
for ac_header in locale.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
- echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+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
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+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
+{ 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
@@ -5632,41 +6300,37 @@ $ac_includes_default
@%:@include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+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); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (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
+ ac_header_compiler=no
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
+
+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
+{ 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
@@ -5675,24 +6339,22 @@ cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@%:@include <$ac_header>
_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+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; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+ (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
@@ -5700,9 +6362,10 @@ 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
+{ 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
@@ -5726,25 +6389,19 @@ echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\
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 the AC_PACKAGE_NAME lists. @%:@@%:@
-@%:@@%:@ ------------------------------------------ @%:@@%:@
-_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 eval "test \"\${$as_ac_Header+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
else
eval "$as_ac_Header=\$ac_header_preproc"
fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+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
@@ -5757,8 +6414,8 @@ 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
+ { 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
@@ -5778,39 +6435,36 @@ return LC_MESSAGES
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+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); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (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
+ am_cv_val_LC_MESSAGES=no
fi
-rm -f conftest.err conftest.$ac_objext \
+
+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
+{ 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
@@ -5819,7 +6473,7 @@ _ACEOF
fi
fi
- USE_NLS=yes
+ USE_NLS=yes
gt_cv_have_gettext=no
@@ -5829,17 +6483,17 @@ _ACEOF
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
+ { 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
+{ 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
+{ 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
@@ -5850,41 +6504,37 @@ $ac_includes_default
@%:@include <libintl.h>
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+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); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (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
+ ac_header_compiler=no
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
+
+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
+{ 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
@@ -5893,24 +6543,22 @@ cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@%:@include <libintl.h>
_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+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; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+ (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
@@ -5918,9 +6566,10 @@ 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
+{ 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
@@ -5944,25 +6593,18 @@ echo "$as_me: WARNING: libintl.h: section \"Present But Cannot Be Compiled\"
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 the AC_PACKAGE_NAME lists. @%:@@%:@
-@%:@@%:@ ------------------------------------------ @%:@@%:@
-_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
+{ 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
+{ 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
@@ -5972,8 +6614,8 @@ if test $ac_cv_header_libintl_h = yes; then
#
# 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
+ { 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
@@ -5995,44 +6637,41 @@ return !ngettext ("","", 1)
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+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); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (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
+ gt_cv_func_ngettext_libc=no
fi
-rm -f conftest.err conftest.$ac_objext \
+
+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
+{ 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
+ { 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
@@ -6054,40 +6693,37 @@ return !dgettext ("","")
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+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); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (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
+ gt_cv_func_dgettext_libc=no
fi
-rm -f conftest.err conftest.$ac_objext \
+
+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
+{ 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
@@ -6095,9 +6731,9 @@ echo "${ECHO_T}$gt_cv_func_dgettext_libc" >&6
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 eval "test \"\${$as_ac_var+set}\" = set"; then
+{ 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
@@ -6123,68 +6759,60 @@ cat >>conftest.$ac_ext <<_ACEOF
#undef $ac_func
-/* Override any gcc2 internal prototype to avoid an error. */
+/* 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
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
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)
+#if defined __stub_$ac_func || defined __stub___$ac_func
choke me
-#else
-char (*f) () = $ac_func;
-#endif
-#ifdef __cplusplus
-}
#endif
int
main ()
{
-return f != $ac_func;
+return $ac_func ();
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+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); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (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"
+ eval "$as_ac_var=no"
fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+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
@@ -6202,8 +6830,8 @@ done
|| 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
+ { 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
@@ -6216,59 +6844,56 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-/* Override any gcc2 internal prototype to avoid an error. */
+/* 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
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
char bindtextdomain ();
int
main ()
{
-bindtextdomain ();
+return bindtextdomain ();
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+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); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (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
+ ac_cv_lib_intl_bindtextdomain=no
fi
-rm -f conftest.err conftest.$ac_objext \
+
+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
+{ 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
+ { 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
@@ -6281,59 +6906,56 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-/* Override any gcc2 internal prototype to avoid an error. */
+/* 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
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
char ngettext ();
int
main ()
{
-ngettext ();
+return ngettext ();
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+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); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (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
+ ac_cv_lib_intl_ngettext=no
fi
-rm -f conftest.err conftest.$ac_objext \
+
+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
+{ 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
+ { 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
@@ -6346,56 +6968,53 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-/* Override any gcc2 internal prototype to avoid an error. */
+/* 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
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
char dgettext ();
int
main ()
{
-dgettext ();
+return dgettext ();
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+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); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (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
+ ac_cv_lib_intl_dgettext=no
fi
-rm -f conftest.err conftest.$ac_objext \
+
+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
+{ 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
@@ -6406,12 +7025,12 @@ 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
+ { 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
@@ -6424,59 +7043,56 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-/* Override any gcc2 internal prototype to avoid an error. */
+/* 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
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
char ngettext ();
int
main ()
{
-ngettext ();
+return ngettext ();
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+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); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (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
+ ac_cv_lib_intl_ngettext=no
fi
-rm -f conftest.err conftest.$ac_objext \
+
+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
+{ 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
+ { 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
@@ -6489,56 +7105,53 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-/* Override any gcc2 internal prototype to avoid an error. */
+/* 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
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
char dcgettext ();
int
main ()
{
-dcgettext ();
+return dcgettext ();
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+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); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (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
+ ac_cv_lib_intl_dcgettext=no
fi
-rm -f conftest.err conftest.$ac_objext \
+
+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
+{ 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
@@ -6565,9 +7178,9 @@ fi
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 eval "test \"\${$as_ac_var+set}\" = set"; then
+{ 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
@@ -6593,68 +7206,60 @@ cat >>conftest.$ac_ext <<_ACEOF
#undef $ac_func
-/* Override any gcc2 internal prototype to avoid an error. */
+/* 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
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
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)
+#if defined __stub_$ac_func || defined __stub___$ac_func
choke me
-#else
-char (*f) () = $ac_func;
-#endif
-#ifdef __cplusplus
-}
#endif
int
main ()
{
-return f != $ac_func;
+return $ac_func ();
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+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); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (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"
+ eval "$as_ac_var=no"
fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+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
@@ -6693,8 +7298,8 @@ _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
+{ 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
@@ -6720,11 +7325,11 @@ esac
fi
MSGFMT="$ac_cv_path_MSGFMT"
if test "$MSGFMT" != "no"; then
- echo "$as_me:$LINENO: result: $MSGFMT" >&5
-echo "${ECHO_T}$MSGFMT" >&6
+ { 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
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
if test "$MSGFMT" != "no"; then
glib_save_LIBS="$LIBS"
@@ -6733,9 +7338,9 @@ fi
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 eval "test \"\${$as_ac_var+set}\" = set"; then
+{ 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
@@ -6761,68 +7366,60 @@ cat >>conftest.$ac_ext <<_ACEOF
#undef $ac_func
-/* Override any gcc2 internal prototype to avoid an error. */
+/* 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
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
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)
+#if defined __stub_$ac_func || defined __stub___$ac_func
choke me
-#else
-char (*f) () = $ac_func;
-#endif
-#ifdef __cplusplus
-}
#endif
int
main ()
{
-return f != $ac_func;
+return $ac_func ();
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+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); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (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"
+ eval "$as_ac_var=no"
fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+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
@@ -6833,8 +7430,8 @@ done
# 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
+{ 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
@@ -6849,32 +7446,33 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ 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
+ { 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
+ { 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
+{ 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
@@ -6900,11 +7498,11 @@ esac
fi
XGETTEXT="$ac_cv_path_XGETTEXT"
if test "$XGETTEXT" != ":"; then
- echo "$as_me:$LINENO: result: $XGETTEXT" >&5
-echo "${ECHO_T}$XGETTEXT" >&6
+ { 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
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
cat >conftest.$ac_ext <<_ACEOF
@@ -6924,37 +7522,33 @@ extern int _nl_msg_cat_cntr;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+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); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (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
+ 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
+ { 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
@@ -6981,68 +7575,59 @@ cat >>conftest.$ac_ext <<_ACEOF
#undef bind_textdomain_codeset
-/* Override any gcc2 internal prototype to avoid an error. */
+/* 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
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
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)
+#if defined __stub_bind_textdomain_codeset || defined __stub___bind_textdomain_codeset
choke me
-#else
-char (*f) () = bind_textdomain_codeset;
-#endif
-#ifdef __cplusplus
-}
#endif
int
main ()
{
-return f != bind_textdomain_codeset;
+return bind_textdomain_codeset ();
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+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); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (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
+ ac_cv_func_bind_textdomain_codeset=no
fi
-rm -f conftest.err conftest.$ac_objext \
+
+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
+{ 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
@@ -7058,7 +7643,8 @@ fi
;;
esac
fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS="$glib_save_LIBS"
INSTOBJEXT=.mo
@@ -7083,8 +7669,8 @@ _ACEOF
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
+ { 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
@@ -7092,7 +7678,7 @@ echo "${ECHO_T}found xgettext program is not GNU xgettext; ignore it" >&6
# We need to process the po/ directory.
POSUB=po
- ac_config_commands="$ac_config_commands default-1"
+ ac_config_commands="$ac_config_commands default-1"
for lang in $ALL_LINGUAS; do
@@ -7116,8 +7702,8 @@ echo "${ECHO_T}found xgettext program is not GNU xgettext; ignore it" >&6
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
+ { 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
@@ -7141,8 +7727,8 @@ echo $ECHO_N "checking for catalogs to be installed... $ECHO_C" >&6
fi
done
LINGUAS=$NEW_LINGUAS
- echo "$as_me:$LINENO: result: $LINGUAS" >&5
-echo "${ECHO_T}$LINGUAS" >&6
+ { echo "$as_me:$LINENO: result: $LINGUAS" >&5
+echo "${ECHO_T}$LINGUAS" >&6; }
fi
if test -n "$LINGUAS"; then
@@ -7174,7 +7760,8 @@ echo "${ECHO_T}$LINGUAS" >&6
< $srcdir/po/POTFILES.in > po/POTFILES
- ac_config_files="$ac_config_files Makefile src/Makefile po/Makefile.in"
+ac_config_files="$ac_config_files Makefile src/Makefile po/Makefile.in"
+
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
# tests run on this system so they can be shared between configure
@@ -7193,39 +7780,58 @@ _ACEOF
# The following way of writing the cache mishandles newlines in values,
# but we know of no workaround that is simple, portable, and efficient.
-# So, don't put newlines in cache variables' values.
+# So, we kill variables containing newlines.
# Ultrix sh set writes to stderr and can't be redirected directly,
# and sets the high bit in the cache file unless we assign to the vars.
-{
+(
+ for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
+ eval ac_val=\$$ac_var
+ 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;} ;;
+ esac
+ case $ac_var in #(
+ _ | IFS | as_nl) ;; #(
+ *) $as_unset $ac_var ;;
+ esac ;;
+ esac
+ done
+
(set) 2>&1 |
- case `(ac_space=' '; set | grep ac_space) 2>&1` in
- *ac_space=\ *)
+ 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 \).
sed -n \
"s/'/'\\\\''/g;
s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
- ;;
+ ;; #(
*)
# `set' quotes correctly as required by POSIX, so do not add quotes.
- sed -n \
- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
+ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
;;
- esac;
-} |
+ esac |
+ sort
+) |
sed '
+ /^ac_cv_env_/b end
t clear
- : clear
+ :clear
s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
t end
- /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
- : end' >>confcache
-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 "updating cache $cache_file"
+ s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+ :end' >>confcache
+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;}
cat confcache >$cache_file
else
- echo "not updating unwritable cache $cache_file"
+ { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
+echo "$as_me: not updating unwritable cache $cache_file" >&6;}
fi
fi
rm -f confcache
@@ -7234,32 +7840,18 @@ test "x$prefix" = xNONE && prefix=$ac_default_prefix
# Let make expand exec_prefix.
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-# VPATH may cause trouble with some makes, so we remove $(srcdir),
-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
-# trailing colons and then remove the whole line if VPATH becomes empty
-# (actually we leave an empty line to preserve line numbers).
-if test "x$srcdir" = x.; then
- ac_vpsub='/^[ ]*VPATH[ ]*=/{
-s/:*\$(srcdir):*/:/;
-s/:*\${srcdir}:*/:/;
-s/:*@srcdir@:*/:/;
-s/^\([^=]*=[ ]*\):*/\1/;
-s/:*$//;
-s/^[^=]*=[ ]*$//;
-}'
-fi
-
DEFS=-DHAVE_CONFIG_H
ac_libobjs=
ac_ltlibobjs=
for ac_i in : $LIB@&t@OBJS; do test "x$ac_i" = x: && continue
# 1. Remove the extension, and $U if already installed.
- ac_i=`echo "$ac_i" |
- sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
- # 2. Add them.
- ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"
- ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'
+ ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
+ ac_i=`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'
done
LIB@&t@OBJS=$ac_libobjs
@@ -7325,17 +7917,45 @@ cat >>$CONFIG_STATUS <<\_ACEOF
## M4sh Initialization. ##
## --------------------- ##
-# Be Bourne compatible
+# Be more Bourne compatible
+DUALCASE=1; export DUALCASE # for MKS sh
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+"$@"}'='"$@"'
-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
- set -o posix
+ setopt NO_GLOB_SUBST
+else
+ 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=';'
+ else
+ PATH_SEPARATOR=:
+ fi
+ rm -f conf$$.sh
fi
-DUALCASE=1; export DUALCASE # for MKS sh
# Support unset when possible.
if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
@@ -7345,8 +7965,43 @@ else
fi
+# IFS
+# We need space, tab and new line, in precisely that order. Quoting is
+# 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
+ *[\\/]* ) 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
+IFS=$as_save_IFS
+
+ ;;
+esac
+# We did not find ourselves, most probably we were run as `sh COMMAND'
+# in which case we are not to be found in the path.
+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; }
+fi
+
# Work around bugs in pre-3.0 UWIN ksh.
-$as_unset ENV MAIL MAILPATH
+for as_var in ENV MAIL MAILPATH
+do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+done
PS1='$ '
PS2='> '
PS4='+ '
@@ -7360,18 +8015,19 @@ 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
+ ($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; then
+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
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
as_basename=basename
else
as_basename=false
@@ -7379,159 +8035,120 @@ fi
# Name of the executable.
-as_me=`$as_basename "$0" ||
+as_me=`$as_basename -- "$0" ||
$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
X"$0" : 'X\(//\)$' \| \
- X"$0" : 'X\(/\)$' \| \
- . : '\(.\)' 2>/dev/null ||
+ X"$0" : 'X\(/\)' \| . 2>/dev/null ||
echo X/"$0" |
- sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
- /^X\/\(\/\/\)$/{ s//\1/; q; }
- /^X\/\(\/\).*/{ s//\1/; q; }
- s/.*/./; q'`
-
+ sed '/^.*\/\([^/][^/]*\)\/*$/{
+ s//\1/
+ q
+ }
+ /^X\/\(\/\/\)$/{
+ s//\1/
+ q
+ }
+ /^X\/\(\/\).*/{
+ s//\1/
+ q
+ }
+ s/.*/./; q'`
-# PATH needs CR, and LINENO needs CR and PATH.
-# 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
+# CDPATH.
+$as_unset CDPATH
-# 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=';'
- else
- PATH_SEPARATOR=:
- fi
- rm -f conf$$.sh
-fi
as_lineno_1=$LINENO
as_lineno_2=$LINENO
- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
test "x$as_lineno_1" != "x$as_lineno_2" &&
- test "x$as_lineno_3" = "x$as_lineno_2" || {
- # Find who we are. Look in the path if we contain no path at all
- # relative or not.
- 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
-
- ;;
- esac
- # We did not find ourselves, most probably we were run as `sh COMMAND'
- # in which case we are not to be found in the path.
- if test "x$as_myself" = x; then
- as_myself=$0
- fi
- if test ! -f "$as_myself"; then
- { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5
-echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;}
- { (exit 1); exit 1; }; }
- fi
- case $CONFIG_SHELL in
- '')
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for as_base in sh bash ksh sh5; do
- case $as_dir in
- /*)
- if ("$as_dir/$as_base" -c '
- as_lineno_1=$LINENO
- as_lineno_2=$LINENO
- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
- test "x$as_lineno_1" != "x$as_lineno_2" &&
- test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then
- $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
- $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
- CONFIG_SHELL=$as_dir/$as_base
- export CONFIG_SHELL
- exec "$CONFIG_SHELL" "$0" ${1+"$@"}
- fi;;
- esac
- done
-done
-;;
- esac
+ 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 before each line; the second 'sed' does the real
- # work. The second script uses 'N' to pair each line-number line
- # with the numbered line, and appends trailing '-' during
- # substitution so that $LINENO is not a special case at line end.
+ # 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
- # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-)
- sed '=' <$as_myself |
+ # 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
- s,$,-,
- : loop
- s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
+ :loop
+ s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
t loop
- s,-$,,
- s,^['$as_cr_digits']*\n,,
+ s/-\n.*//
' >$as_me.lineno &&
- chmod +x $as_me.lineno ||
- { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5
-echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;}
+ 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 sensible to this).
- . ./$as_me.lineno
+ # original and so on. Autoconf is especially sensitive to this).
+ . "./$as_me.lineno"
# Exit status is that of the last command.
exit
}
-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
- *c*,-n*) ECHO_N= ECHO_C='
-' ECHO_T=' ' ;;
- *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;;
- *) ECHO_N= ECHO_C='\c' ECHO_T= ;;
+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
+-n*)
+ case `echo 'x\c'` in
+ *c*) ECHO_T=' ';; # ECHO_T is single tab character.
+ *) ECHO_C='\c';;
+ esac;;
+*)
+ ECHO_N='-n';;
esac
-if expr a : '\(a\)' >/dev/null 2>&1; then
+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
+fi
echo >conf$$.file
if ln -s conf$$.file conf$$ 2>/dev/null; then
- # We could just check for DJGPP; but this test a) works b) is more generic
- # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
- if test -f conf$$.exe; then
- # Don't use ln at all; we don't have any links
+ 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'
- else
- as_ln_s='ln -s'
- fi
elif ln conf$$.file conf$$ 2>/dev/null; then
as_ln_s=ln
else
as_ln_s='cp -p'
fi
-rm -f conf$$ conf$$.exe conf$$.file
+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
+rmdir conf$$.dir 2>/dev/null
if mkdir -p . 2>/dev/null; then
as_mkdir_p=:
@@ -7540,7 +8157,28 @@ else
as_mkdir_p=false
fi
-as_executable_p="test -f"
+if test -x / >/dev/null 2>&1; then
+ as_test_x='test -x'
+else
+ if ls -dL / >/dev/null 2>&1; then
+ as_ls_L_option=L
+ else
+ as_ls_L_option=
+ fi
+ as_test_x='
+ eval sh -c '\''
+ if test -d "$1"; then
+ test -d "$1/.";
+ else
+ case $1 in
+ -*)set "./$1";;
+ esac;
+ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
+ ???[sx]*):;;*)false;;esac;fi
+ '\'' sh
+ '
+fi
+as_executable_p=$as_test_x
# Sed expression to map a string onto a valid CPP name.
as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -7549,31 +8187,14 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-# IFS
-# We need space, tab and new line, in precisely that order.
-as_nl='
-'
-IFS=" $as_nl"
-
-# CDPATH.
-$as_unset CDPATH
-
exec 6>&1
-# Open the log real soon, to keep \$[0] and so on meaningful, and to
+# 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. Logging --version etc. is OK.
-exec 5>>config.log
-{
- echo
- sed 'h;s/./-/g;s/^.../@%:@@%:@ /;s/...$/ @%:@@%:@/;p;x;p;x' <<_ASBOX
-@%:@@%:@ Running $as_me. @%:@@%:@
-_ASBOX
-} >&5
-cat >&5 <<_CSEOF
-
+# values after options handling.
+ac_log="
This file was extended by $as_me, which was
-generated by GNU Autoconf 2.59. Invocation command line was
+generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
@@ -7581,30 +8202,20 @@ generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_COMMANDS = $CONFIG_COMMANDS
$ $0 $@
-_CSEOF
-echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5
-echo >&5
+on `(hostname || uname -n) 2>/dev/null | sed 1q`
+"
+
_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF
# Files that config.status was made for.
-if test -n "$ac_config_files"; then
- echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS
-fi
-
-if test -n "$ac_config_headers"; then
- echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS
-fi
-
-if test -n "$ac_config_links"; then
- echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS
-fi
+config_files="$ac_config_files"
+config_headers="$ac_config_headers"
+config_commands="$ac_config_commands"
-if test -n "$ac_config_commands"; then
- echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS
-fi
+_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF
-
ac_cs_usage="\
\`$as_me' instantiates files from templates according to the
current configuration.
@@ -7612,7 +8223,7 @@ current configuration.
Usage: $0 [OPTIONS] [FILE]...
-h, --help print this help, then exit
- -V, --version print version number, then exit
+ -V, --version print version number and configuration settings, then exit
-q, --quiet do not print progress messages
-d, --debug don't remove temporary files
--recheck update $as_me by reconfiguring in the same conditions
@@ -7631,19 +8242,21 @@ Configuration commands:
$config_commands
Report bugs to <bug-autoconf@gnu.org>."
-_ACEOF
+_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
config.status
-configured by $0, generated by GNU Autoconf 2.59,
- with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
+configured by $0, generated by GNU Autoconf 2.61,
+ with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
-Copyright (C) 2003 Free Software Foundation, Inc.
+Copyright (C) 2006 Free Software Foundation, Inc.
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
-srcdir=$srcdir
-INSTALL="$INSTALL"
+
+ac_pwd='$ac_pwd'
+srcdir='$srcdir'
+INSTALL='$INSTALL'
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF
@@ -7654,39 +8267,24 @@ while test $# != 0
do
case $1 in
--*=*)
- ac_option=`expr "x$1" : 'x\([^=]*\)='`
- ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
+ ac_option=`expr "X$1" : 'X\([^=]*\)='`
+ ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
ac_shift=:
;;
- -*)
+ *)
ac_option=$1
ac_optarg=$2
ac_shift=shift
;;
- *) # This is not an option, so the user has probably given explicit
- # arguments.
- ac_option=$1
- ac_need_defaults=false;;
esac
case $ac_option in
# Handling of the options.
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
ac_cs_recheck=: ;;
- --version | --vers* | -V )
- echo "$ac_cs_version"; exit 0 ;;
- --he | --h)
- # Conflict between --help and --header
- { { echo "$as_me:$LINENO: error: ambiguous option: $1
-Try \`$0 --help' for more information." >&5
-echo "$as_me: error: ambiguous option: $1
-Try \`$0 --help' for more information." >&2;}
- { (exit 1); exit 1; }; };;
- --help | --hel | -h )
- echo "$ac_cs_usage"; exit 0 ;;
- --debug | --d* | -d )
+ --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
+ echo "$ac_cs_version"; exit ;;
+ --debug | --debu | --deb | --de | --d | -d )
debug=: ;;
--file | --fil | --fi | --f )
$ac_shift
@@ -7696,18 +8294,24 @@ Try \`$0 --help' for more information." >&2;}
$ac_shift
CONFIG_HEADERS="$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; }; };;
+ --help | --hel | -h )
+ 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:$LINENO: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&5
-echo "$as_me: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&2;}
+ -*) { echo "$as_me: error: unrecognized option: $1
+Try \`$0 --help' for more information." >&2
{ (exit 1); exit 1; }; } ;;
- *) ac_config_targets="$ac_config_targets $1" ;;
+ *) ac_config_targets="$ac_config_targets $1"
+ ac_need_defaults=false ;;
esac
shift
@@ -7723,41 +8327,53 @@ fi
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
if \$ac_cs_recheck; then
- echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
- exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+ echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
+ CONFIG_SHELL=$SHELL
+ export CONFIG_SHELL
+ exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
fi
_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF
+exec 5>>config.log
+{
+ echo
+ sed 'h;s/./-/g;s/^.../@%:@@%:@ /;s/...$/ @%:@@%:@/;p;x;p;x' <<_ASBOX
+@%:@@%:@ Running $as_me. @%:@@%:@
+_ASBOX
+ echo "$ac_log"
+} >&5
+_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
#
-# INIT-COMMANDS section.
+# INIT-COMMANDS
#
-
AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
_ACEOF
-
-
cat >>$CONFIG_STATUS <<\_ACEOF
+
+# Handling of arguments.
for ac_config_target in $ac_config_targets
do
- case "$ac_config_target" in
- # Handling of arguments.
- "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
- "src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
- "po/Makefile.in" ) CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
- "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
- "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
- "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
+ case $ac_config_target in
+ "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
+ "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
+ "default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
+ "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+ "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
+ "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
+
*) { { 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; }; };;
esac
done
+
# If the user did not use the arguments to specify the items to instantiate,
# then the envvar interface is used. Set only those that are not.
# We use the long form for the default assignment because of an extremely
@@ -7769,597 +8385,595 @@ if $ac_need_defaults; then
fi
# Have a temporary directory for convenience. Make it in the build tree
-# simply because there is no reason to put it here, and in addition,
+# simply because there is no reason against having it here, and in addition,
# creating and moving files from /tmp can sometimes cause problems.
-# Create a temporary directory, and hook for its removal unless debugging.
+# Hook for its removal unless debugging.
+# Note that there is a small window in which the directory will not be cleaned:
+# after its creation but before its name has been assigned to `$tmp'.
$debug ||
{
- trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
+ tmp=
+ 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
}
-
# Create a (secure) tmp directory for tmp files.
{
- tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` &&
+ tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
test -n "$tmp" && test -d "$tmp"
} ||
{
- tmp=./confstat$$-$RANDOM
- (umask 077 && mkdir $tmp)
+ tmp=./conf$$-$RANDOM
+ (umask 077 && mkdir "$tmp")
} ||
{
echo "$me: cannot create a temporary directory in ." >&2
{ (exit 1); exit 1; }
}
-_ACEOF
-
-cat >>$CONFIG_STATUS <<_ACEOF
-
#
-# CONFIG_FILES section.
+# Set up the sed scripts for CONFIG_FILES section.
#
# No need to generate the scripts if there are no CONFIG_FILES.
# This happens for instance when ./config.status config.h
-if test -n "\$CONFIG_FILES"; then
- # Protect against being on the right side of a sed subst in config.status.
- sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g;
- s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF
-s,@SHELL@,$SHELL,;t t
-s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t
-s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t
-s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t
-s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t
-s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t
-s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t
-s,@exec_prefix@,$exec_prefix,;t t
-s,@prefix@,$prefix,;t t
-s,@program_transform_name@,$program_transform_name,;t t
-s,@bindir@,$bindir,;t t
-s,@sbindir@,$sbindir,;t t
-s,@libexecdir@,$libexecdir,;t t
-s,@datadir@,$datadir,;t t
-s,@sysconfdir@,$sysconfdir,;t t
-s,@sharedstatedir@,$sharedstatedir,;t t
-s,@localstatedir@,$localstatedir,;t t
-s,@libdir@,$libdir,;t t
-s,@includedir@,$includedir,;t t
-s,@oldincludedir@,$oldincludedir,;t t
-s,@infodir@,$infodir,;t t
-s,@mandir@,$mandir,;t t
-s,@build_alias@,$build_alias,;t t
-s,@host_alias@,$host_alias,;t t
-s,@target_alias@,$target_alias,;t t
-s,@DEFS@,$DEFS,;t t
-s,@ECHO_C@,$ECHO_C,;t t
-s,@ECHO_N@,$ECHO_N,;t t
-s,@ECHO_T@,$ECHO_T,;t t
-s,@LIBS@,$LIBS,;t t
-s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
-s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
-s,@INSTALL_DATA@,$INSTALL_DATA,;t t
-s,@CYGPATH_W@,$CYGPATH_W,;t t
-s,@PACKAGE@,$PACKAGE,;t t
-s,@VERSION@,$VERSION,;t t
-s,@ACLOCAL@,$ACLOCAL,;t t
-s,@AUTOCONF@,$AUTOCONF,;t t
-s,@AUTOMAKE@,$AUTOMAKE,;t t
-s,@AUTOHEADER@,$AUTOHEADER,;t t
-s,@MAKEINFO@,$MAKEINFO,;t t
-s,@install_sh@,$install_sh,;t t
-s,@STRIP@,$STRIP,;t t
-s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t
-s,@INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t
-s,@mkdir_p@,$mkdir_p,;t t
-s,@AWK@,$AWK,;t t
-s,@SET_MAKE@,$SET_MAKE,;t t
-s,@am__leading_dot@,$am__leading_dot,;t t
-s,@AMTAR@,$AMTAR,;t t
-s,@am__tar@,$am__tar,;t t
-s,@am__untar@,$am__untar,;t t
-s,@MAINTAINER_MODE_TRUE@,$MAINTAINER_MODE_TRUE,;t t
-s,@MAINTAINER_MODE_FALSE@,$MAINTAINER_MODE_FALSE,;t t
-s,@MAINT@,$MAINT,;t t
-s,@CC@,$CC,;t t
-s,@CFLAGS@,$CFLAGS,;t t
-s,@LDFLAGS@,$LDFLAGS,;t t
-s,@CPPFLAGS@,$CPPFLAGS,;t t
-s,@ac_ct_CC@,$ac_ct_CC,;t t
-s,@EXEEXT@,$EXEEXT,;t t
-s,@OBJEXT@,$OBJEXT,;t t
-s,@DEPDIR@,$DEPDIR,;t t
-s,@am__include@,$am__include,;t t
-s,@am__quote@,$am__quote,;t t
-s,@AMDEP_TRUE@,$AMDEP_TRUE,;t t
-s,@AMDEP_FALSE@,$AMDEP_FALSE,;t t
-s,@AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t
-s,@CCDEPMODE@,$CCDEPMODE,;t t
-s,@am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t
-s,@am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t
-s,@CPP@,$CPP,;t t
-s,@EGREP@,$EGREP,;t t
-s,@PKG_CONFIG@,$PKG_CONFIG,;t t
-s,@PACKAGE_CFLAGS@,$PACKAGE_CFLAGS,;t t
-s,@PACKAGE_LIBS@,$PACKAGE_LIBS,;t t
-s,@GETTEXT_PACKAGE@,$GETTEXT_PACKAGE,;t t
-s,@USE_NLS@,$USE_NLS,;t t
-s,@MSGFMT@,$MSGFMT,;t t
-s,@GMSGFMT@,$GMSGFMT,;t t
-s,@XGETTEXT@,$XGETTEXT,;t t
-s,@CATALOGS@,$CATALOGS,;t t
-s,@CATOBJEXT@,$CATOBJEXT,;t t
-s,@DATADIRNAME@,$DATADIRNAME,;t t
-s,@GMOFILES@,$GMOFILES,;t t
-s,@INSTOBJEXT@,$INSTOBJEXT,;t t
-s,@INTLLIBS@,$INTLLIBS,;t t
-s,@PO_IN_DATADIR_TRUE@,$PO_IN_DATADIR_TRUE,;t t
-s,@PO_IN_DATADIR_FALSE@,$PO_IN_DATADIR_FALSE,;t t
-s,@POFILES@,$POFILES,;t t
-s,@POSUB@,$POSUB,;t t
-s,@MKINSTALLDIRS@,$MKINSTALLDIRS,;t t
-s,@LIB@&t@OBJS@,$LIB@&t@OBJS,;t t
-s,@LTLIBOBJS@,$LTLIBOBJS,;t t
-CEOF
-
-_ACEOF
-
- cat >>$CONFIG_STATUS <<\_ACEOF
- # Split the substitutions into bite-sized pieces for seds with
- # small command number limits, like on Digital OSF/1 and HP-UX.
- ac_max_sed_lines=48
- ac_sed_frag=1 # Number of current file.
- ac_beg=1 # First line for current file.
- ac_end=$ac_max_sed_lines # Line after last line for current file.
- ac_more_lines=:
- ac_sed_cmds=
- while $ac_more_lines; do
- if test $ac_beg -gt 1; then
- sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
- else
- sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
- fi
- if test ! -s $tmp/subs.frag; then
- ac_more_lines=false
- else
- # The purpose of the label and of the branching condition is to
- # speed up the sed processing (if there are no `@' at all, there
- # is no need to browse any of the substitutions).
- # These are the two extra sed commands mentioned above.
- (echo ':t
- /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
- if test -z "$ac_sed_cmds"; then
- ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
- else
- ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
- fi
- ac_sed_frag=`expr $ac_sed_frag + 1`
- ac_beg=$ac_end
- ac_end=`expr $ac_end + $ac_max_sed_lines`
- fi
- done
- if test -z "$ac_sed_cmds"; then
- ac_sed_cmds=cat
+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
+INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
+INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
+INSTALL_DATA!$INSTALL_DATA$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
+MAINTAINER_MODE_TRUE!$MAINTAINER_MODE_TRUE$ac_delim
+MAINTAINER_MODE_FALSE!$MAINTAINER_MODE_FALSE$ac_delim
+MAINT!$MAINT$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
+PKG_CONFIG!$PKG_CONFIG$ac_delim
+PACKAGE_CFLAGS!$PACKAGE_CFLAGS$ac_delim
+PACKAGE_LIBS!$PACKAGE_LIBS$ac_delim
+GETTEXT_PACKAGE!$GETTEXT_PACKAGE$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
+USE_NLS!$USE_NLS$ac_delim
+MSGFMT!$MSGFMT$ac_delim
+GMSGFMT!$GMSGFMT$ac_delim
+XGETTEXT!$XGETTEXT$ac_delim
+CATALOGS!$CATALOGS$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
-fi # test -n "$CONFIG_FILES"
+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`
+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
+_ACEOF
+
+ac_delim='%!_!# '
+for ac_last_try in false false false false false :; do
+ cat >conf$$subs.sed <<_ACEOF
+CATOBJEXT!$CATOBJEXT$ac_delim
+DATADIRNAME!$DATADIRNAME$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
+LIB@&t@OBJS!$LIB@&t@OBJS$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
+
+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 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
+_ACEOF
+
+
+# VPATH may cause trouble with some makes, so we remove $(srcdir),
+# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
+# trailing colons and then remove the whole line if VPATH becomes empty
+# (actually we leave an empty line to preserve line numbers).
+if test "x$srcdir" = x.; then
+ ac_vpsub='/^[ ]*VPATH[ ]*=/{
+s/:*\$(srcdir):*/:/
+s/:*\${srcdir}:*/:/
+s/:*@srcdir@:*/:/
+s/^\([^=]*=[ ]*\):*/\1/
+s/:*$//
+s/^[^=]*=[ ]*$//
+}'
+fi
+
cat >>$CONFIG_STATUS <<\_ACEOF
-for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
- # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
- case $ac_file in
- - | *:- | *:-:* ) # input from stdin
- cat >$tmp/stdin
- ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
- *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
- * ) ac_file_in=$ac_file.in ;;
+fi # test -n "$CONFIG_FILES"
+
+
+for ac_tag in :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS
+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; }; };;
+ :[FH]-) ac_tag=-:-;;
+ :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
+ esac
+ ac_save_IFS=$IFS
+ IFS=:
+ set x $ac_tag
+ IFS=$ac_save_IFS
+ shift
+ ac_file=$1
+ shift
+
+ case $ac_mode in
+ :L) ac_source=$1;;
+ :[FH])
+ ac_file_inputs=
+ for ac_f
+ do
+ case $ac_f in
+ -) ac_f="$tmp/stdin";;
+ *) # Look for the file first in the build tree, then in the source tree
+ # (if the path is not absolute). The absolute path cannot be DOS-style,
+ # because $ac_f cannot contain `:'.
+ test -f "$ac_f" ||
+ case $ac_f in
+ [\\/$]*) 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; }; };;
+ esac
+ ac_file_inputs="$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."
+ 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;}
+ fi
+
+ case $ac_tag in
+ *:-:* | *:-) cat >"$tmp/stdin";;
+ esac
+ ;;
esac
- # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
- ac_dir=`(dirname "$ac_file") 2>/dev/null ||
+ ac_dir=`$as_dirname -- "$ac_file" ||
$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
X"$ac_file" : 'X\(//\)[^/]' \| \
X"$ac_file" : 'X\(//\)$' \| \
- X"$ac_file" : 'X\(/\)' \| \
- . : '\(.\)' 2>/dev/null ||
+ 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'`
- { if $as_mkdir_p; then
- mkdir -p "$ac_dir"
- else
- as_dir="$ac_dir"
+ 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 test ! -d "$as_dir"; do
- as_dirs="$as_dir $as_dirs"
- as_dir=`(dirname "$as_dir") 2>/dev/null ||
+ 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 ||
+ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
echo X"$as_dir" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
- /^X\(\/\/\)$/{ s//\1/; q; }
- /^X\(\/\).*/{ s//\1/; q; }
- s/.*/./; q'`
+ 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 ! -n "$as_dirs" || mkdir $as_dirs
- fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
+ 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; }; }; }
-
ac_builddir=.
-if test "$ac_dir" != .; then
+case "$ac_dir" in
+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
+*)
ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
- # A "../" for each directory in $ac_dir_suffix.
- ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-else
- ac_dir_suffix= ac_top_builddir=
-fi
+ # A ".." for each directory in $ac_dir_suffix.
+ ac_top_builddir_sub=`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/ ;;
+ esac ;;
+esac
+ac_abs_top_builddir=$ac_pwd
+ac_abs_builddir=$ac_pwd$ac_dir_suffix
+# for backward compatibility:
+ac_top_builddir=$ac_top_build_prefix
case $srcdir in
- .) # No --srcdir option. We are building in place.
+ .) # We are building in place.
ac_srcdir=.
- if test -z "$ac_top_builddir"; then
- ac_top_srcdir=.
- else
- ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
- fi ;;
- [\\/]* | ?:[\\/]* ) # Absolute path.
+ ac_top_srcdir=$ac_top_builddir_sub
+ ac_abs_top_srcdir=$ac_pwd ;;
+ [\\/]* | ?:[\\/]* ) # Absolute name.
ac_srcdir=$srcdir$ac_dir_suffix;
- ac_top_srcdir=$srcdir ;;
- *) # Relative path.
- ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
- ac_top_srcdir=$ac_top_builddir$srcdir ;;
+ ac_top_srcdir=$srcdir
+ ac_abs_top_srcdir=$srcdir ;;
+ *) # Relative name.
+ ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
+ ac_top_srcdir=$ac_top_build_prefix$srcdir
+ ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
esac
+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-# Do not use `cd foo && pwd` to compute absolute paths, because
-# the directories may not exist.
-case `pwd` in
-.) ac_abs_builddir="$ac_dir";;
-*)
- case "$ac_dir" in
- .) ac_abs_builddir=`pwd`;;
- [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
- *) ac_abs_builddir=`pwd`/"$ac_dir";;
- esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_builddir=${ac_top_builddir}.;;
-*)
- case ${ac_top_builddir}. in
- .) ac_abs_top_builddir=$ac_abs_builddir;;
- [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
- *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
- esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_srcdir=$ac_srcdir;;
-*)
- case $ac_srcdir in
- .) ac_abs_srcdir=$ac_abs_builddir;;
- [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
- *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
- esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_srcdir=$ac_top_srcdir;;
-*)
- case $ac_top_srcdir in
- .) ac_abs_top_srcdir=$ac_abs_builddir;;
- [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
- *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
- esac;;
-esac
+ case $ac_mode in
+ :F)
+ #
+ # CONFIG_FILE
+ #
case $INSTALL in
[\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
- *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
+ *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
esac
+_ACEOF
- if test x"$ac_file" != x-; then
- { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
- rm -f "$ac_file"
- fi
- # 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. */
- if test x"$ac_file" = x-; then
- configure_input=
- else
- configure_input="$ac_file. "
- fi
- configure_input=$configure_input"Generated from `echo $ac_file_in |
- sed 's,.*/,,'` by configure."
-
- # First look for the input files in the build tree, otherwise in the
- # src tree.
- ac_file_inputs=`IFS=:
- for f in $ac_file_in; do
- case $f in
- -) echo $tmp/stdin ;;
- [\\/$]*)
- # Absolute (can't be DOS-style, as IFS=:)
- test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
- { (exit 1); exit 1; }; }
- echo "$f";;
- *) # Relative
- if test -f "$f"; then
- # Build tree
- echo "$f"
- elif test -f "$srcdir/$f"; then
- # Source tree
- echo "$srcdir/$f"
- else
- # /dev/null tree
- { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
- { (exit 1); exit 1; }; }
- fi;;
- esac
- done` || { (exit 1); exit 1; }
+cat >>$CONFIG_STATUS <<\_ACEOF
+# 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/ {
+ p
+ q
+}
+/@datadir@/p
+/@docdir@/p
+/@infodir@/p
+/@localedir@/p
+/@mandir@/p
+' $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;}
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
+ 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' ;;
+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
$extrasub
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF
:t
/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s,@configure_input@,$configure_input,;t t
-s,@srcdir@,$ac_srcdir,;t t
-s,@abs_srcdir@,$ac_abs_srcdir,;t t
-s,@top_srcdir@,$ac_top_srcdir,;t t
-s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t
-s,@builddir@,$ac_builddir,;t t
-s,@abs_builddir@,$ac_abs_builddir,;t t
-s,@top_builddir@,$ac_top_builddir,;t t
-s,@abs_top_builddir@,$ac_abs_top_builddir,;t t
-s,@INSTALL@,$ac_INSTALL,;t t
-" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
- rm -f $tmp/stdin
- if test x"$ac_file" != x-; then
- mv $tmp/out $ac_file
- else
- cat $tmp/out
- rm -f $tmp/out
- fi
-
-done
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-
-#
-# CONFIG_HEADER section.
-#
-
-# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where
-# NAME is the cpp macro being defined and VALUE is the value it is being given.
-#
-# ac_d sets the value in "#define NAME VALUE" lines.
-ac_dA='s,^\([ ]*\)#\([ ]*define[ ][ ]*\)'
-ac_dB='[ ].*$,\1#\2'
-ac_dC=' '
-ac_dD=',;t'
-# ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE".
-ac_uA='s,^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)'
-ac_uB='$,\1#\2define\3'
-ac_uC=' '
-ac_uD=',;t'
-
-for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
- # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
+s&@configure_input@&$configure_input&;t t
+s&@top_builddir@&$ac_top_builddir_sub&;t t
+s&@srcdir@&$ac_srcdir&;t t
+s&@abs_srcdir@&$ac_abs_srcdir&;t t
+s&@top_srcdir@&$ac_top_srcdir&;t t
+s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
+s&@builddir@&$ac_builddir&;t t
+s&@abs_builddir@&$ac_abs_builddir&;t t
+s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
+s&@INSTALL@&$ac_INSTALL&;t t
+$ac_datarootdir_hack
+" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" >$tmp/out
+
+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'
+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'
+which seems to be undefined. Please make sure it is defined." >&2;}
+
+ rm -f "$tmp/stdin"
case $ac_file in
- - | *:- | *:-:* ) # input from stdin
- cat >$tmp/stdin
- ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
- *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
- * ) ac_file_in=$ac_file.in ;;
+ -) cat "$tmp/out"; rm -f "$tmp/out";;
+ *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;;
esac
-
- test x"$ac_file" != x- && { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
-
- # First look for the input files in the build tree, otherwise in the
- # src tree.
- ac_file_inputs=`IFS=:
- for f in $ac_file_in; do
- case $f in
- -) echo $tmp/stdin ;;
- [\\/$]*)
- # Absolute (can't be DOS-style, as IFS=:)
- test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
- { (exit 1); exit 1; }; }
- # Do quote $f, to prevent DOS paths from being IFS'd.
- echo "$f";;
- *) # Relative
- if test -f "$f"; then
- # Build tree
- echo "$f"
- elif test -f "$srcdir/$f"; then
- # Source tree
- echo "$srcdir/$f"
- else
- # /dev/null tree
- { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
- { (exit 1); exit 1; }; }
- fi;;
- esac
- done` || { (exit 1); exit 1; }
- # Remove the trailing spaces.
- sed 's/[ ]*$//' $ac_file_inputs >$tmp/in
-
-_ACEOF
-
-# Transform confdefs.h into two sed scripts, `conftest.defines' and
-# `conftest.undefs', that substitutes the proper values into
-# config.h.in to produce config.h. The first handles `#define'
-# templates, and the second `#undef' templates.
-# And first: Protect against being on the right side of a sed subst in
-# config.status. Protect against being in an unquoted here document
-# in config.status.
-rm -f conftest.defines conftest.undefs
-# Using a here document instead of a string reduces the quoting nightmare.
-# Putting comments in sed scripts is not portable.
-#
-# `end' is used to avoid that the second main sed command (meant for
-# 0-ary CPP macros) applies to n-ary macro definitions.
-# See the Autoconf documentation for `clear'.
-cat >confdef2sed.sed <<\_ACEOF
-s/[\\&,]/\\&/g
-s,[\\$`],\\&,g
-t clear
-: clear
-s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*\)\(([^)]*)\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp
-t end
-s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp
-: end
-_ACEOF
-# If some macros were called several times there might be several times
-# the same #defines, which is useless. Nevertheless, we may not want to
-# sort them, since we want the *last* AC-DEFINE to be honored.
-uniq confdefs.h | sed -n -f confdef2sed.sed >conftest.defines
-sed 's/ac_d/ac_u/g' conftest.defines >conftest.undefs
-rm -f confdef2sed.sed
-
-# This sed command replaces #undef with comments. This is necessary, for
+ ;;
+ :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.
-cat >>conftest.undefs <<\_ACEOF
-s,^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */,
-_ACEOF
-
-# Break up conftest.defines because some shells have a limit on the size
-# of here documents, and old seds have small limits too (100 cmds).
-echo ' # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS
-echo ' if grep "^[ ]*#[ ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS
-echo ' # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS
-echo ' :' >>$CONFIG_STATUS
-rm -f conftest.tail
-while grep . conftest.defines >/dev/null
+# (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 limited-size here document to $tmp/defines.sed.
- echo ' cat >$tmp/defines.sed <<CEOF' >>$CONFIG_STATUS
- # Speed up: don't consider the non `#define' lines.
- echo '/^[ ]*#[ ]*define/!b' >>$CONFIG_STATUS
- # Work around the forget-to-reset-the-flag bug.
- echo 't clr' >>$CONFIG_STATUS
- echo ': clr' >>$CONFIG_STATUS
- sed ${ac_max_here_lines}q conftest.defines >>$CONFIG_STATUS
+ # 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 $tmp/in >$tmp/out
- rm -f $tmp/in
- mv $tmp/out $tmp/in
-' >>$CONFIG_STATUS
- sed 1,${ac_max_here_lines}d conftest.defines >conftest.tail
+ 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
-echo ' fi # grep' >>$CONFIG_STATUS
-echo >>$CONFIG_STATUS
-
-# Break up conftest.undefs because some shells have a limit on the size
-# of here documents, and old seds have small limits too (100 cmds).
-echo ' # Handle all the #undef templates' >>$CONFIG_STATUS
-rm -f conftest.tail
-while grep . conftest.undefs >/dev/null
-do
- # Write a limited-size here document to $tmp/undefs.sed.
- echo ' cat >$tmp/undefs.sed <<CEOF' >>$CONFIG_STATUS
- # Speed up: don't consider the non `#undef'
- echo '/^[ ]*#[ ]*undef/!b' >>$CONFIG_STATUS
- # Work around the forget-to-reset-the-flag bug.
- echo 't clr' >>$CONFIG_STATUS
- echo ': clr' >>$CONFIG_STATUS
- sed ${ac_max_here_lines}q conftest.undefs >>$CONFIG_STATUS
- echo 'CEOF
- sed -f $tmp/undefs.sed $tmp/in >$tmp/out
- rm -f $tmp/in
- mv $tmp/out $tmp/in
-' >>$CONFIG_STATUS
- sed 1,${ac_max_here_lines}d conftest.undefs >conftest.tail
- rm -f conftest.undefs
- mv conftest.tail conftest.undefs
-done
-rm -f conftest.undefs
+rm -f conftest.defines conftest.tail
+echo "ac_result=$ac_in" >>$CONFIG_STATUS
cat >>$CONFIG_STATUS <<\_ACEOF
- # 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. */
- if test x"$ac_file" = x-; then
- echo "/* Generated by configure. */" >$tmp/config.h
- else
- echo "/* $ac_file. Generated by configure. */" >$tmp/config.h
- fi
- cat $tmp/in >>$tmp/config.h
- rm -f $tmp/in
if test x"$ac_file" != x-; then
- if diff $ac_file $tmp/config.h >/dev/null 2>&1; 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;}
else
- ac_dir=`(dirname "$ac_file") 2>/dev/null ||
-$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'`
- { if $as_mkdir_p; then
- mkdir -p "$ac_dir"
- else
- as_dir="$ac_dir"
- as_dirs=
- while test ! -d "$as_dir"; do
- as_dirs="$as_dir $as_dirs"
- as_dir=`(dirname "$as_dir") 2>/dev/null ||
-$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" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
- /^X\(\/\/\)$/{ s//\1/; q; }
- /^X\(\/\).*/{ s//\1/; q; }
- s/.*/./; q'`
- done
- test ! -n "$as_dirs" || mkdir $as_dirs
- fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
- { (exit 1); exit 1; }; }; }
-
rm -f $ac_file
- mv $tmp/config.h $ac_file
+ mv "$tmp/config.h" $ac_file
fi
else
- cat $tmp/config.h
- rm -f $tmp/config.h
+ echo "/* $configure_input */"
+ cat "$ac_result"
fi
+ rm -f "$tmp/out12"
# Compute $ac_file's index in $config_headers.
_am_stamp_count=1
for _am_header in $config_headers :; do
@@ -8370,135 +8984,39 @@ for _am_header in $config_headers :; do
_am_stamp_count=`expr $_am_stamp_count + 1` ;;
esac
done
-echo "timestamp for $ac_file" >`(dirname $ac_file) 2>/dev/null ||
+echo "timestamp for $ac_file" >`$as_dirname -- $ac_file ||
$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
X$ac_file : 'X\(//\)[^/]' \| \
X$ac_file : 'X\(//\)$' \| \
- X$ac_file : 'X\(/\)' \| \
- . : '\(.\)' 2>/dev/null ||
+ 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'`/stamp-h$_am_stamp_count
-done
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-
-#
-# CONFIG_COMMANDS section.
-#
-for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue
- ac_dest=`echo "$ac_file" | sed 's,:.*,,'`
- ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'`
- ac_dir=`(dirname "$ac_dest") 2>/dev/null ||
-$as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$ac_dest" : 'X\(//\)[^/]' \| \
- X"$ac_dest" : 'X\(//\)$' \| \
- X"$ac_dest" : 'X\(/\)' \| \
- . : '\(.\)' 2>/dev/null ||
-echo X"$ac_dest" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
- /^X\(\/\/\)$/{ s//\1/; q; }
- /^X\(\/\).*/{ s//\1/; q; }
- s/.*/./; q'`
- { if $as_mkdir_p; then
- mkdir -p "$ac_dir"
- else
- as_dir="$ac_dir"
- as_dirs=
- while test ! -d "$as_dir"; do
- as_dirs="$as_dir $as_dirs"
- as_dir=`(dirname "$as_dir") 2>/dev/null ||
-$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" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
- /^X\(\/\/\)$/{ s//\1/; q; }
- /^X\(\/\).*/{ s//\1/; q; }
- s/.*/./; q'`
- done
- test ! -n "$as_dirs" || mkdir $as_dirs
- fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
- { (exit 1); exit 1; }; }; }
-
- ac_builddir=.
-
-if test "$ac_dir" != .; then
- ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
- # A "../" for each directory in $ac_dir_suffix.
- ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-else
- ac_dir_suffix= ac_top_builddir=
-fi
-
-case $srcdir in
- .) # No --srcdir option. We are building in place.
- ac_srcdir=.
- if test -z "$ac_top_builddir"; then
- ac_top_srcdir=.
- else
- ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
- fi ;;
- [\\/]* | ?:[\\/]* ) # Absolute path.
- ac_srcdir=$srcdir$ac_dir_suffix;
- ac_top_srcdir=$srcdir ;;
- *) # Relative path.
- ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
- ac_top_srcdir=$ac_top_builddir$srcdir ;;
-esac
-
-# Do not use `cd foo && pwd` to compute absolute paths, because
-# the directories may not exist.
-case `pwd` in
-.) ac_abs_builddir="$ac_dir";;
-*)
- case "$ac_dir" in
- .) ac_abs_builddir=`pwd`;;
- [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
- *) ac_abs_builddir=`pwd`/"$ac_dir";;
- esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_builddir=${ac_top_builddir}.;;
-*)
- case ${ac_top_builddir}. in
- .) ac_abs_top_builddir=$ac_abs_builddir;;
- [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
- *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
- esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_srcdir=$ac_srcdir;;
-*)
- case $ac_srcdir in
- .) ac_abs_srcdir=$ac_abs_builddir;;
- [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
- *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
- esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_srcdir=$ac_top_srcdir;;
-*)
- case $ac_top_srcdir in
- .) ac_abs_top_srcdir=$ac_abs_builddir;;
- [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
- *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
- esac;;
-esac
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)[^/].*/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\).*/{
+ s//\1/
+ q
+ }
+ 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;}
+ ;;
+ esac
- { echo "$as_me:$LINENO: executing $ac_dest commands" >&5
-echo "$as_me: executing $ac_dest commands" >&6;}
- case $ac_dest in
- depfiles ) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do
+ case $ac_file$ac_mode in
+ "depfiles":C) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; 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.
@@ -8508,18 +9026,29 @@ echo "$as_me: executing $ac_dest commands" >&6;}
# each Makefile.in and add a new line on top of each file to say so.
# So let's grep whole file.
if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
- dirpart=`(dirname "$mf") 2>/dev/null ||
+ dirpart=`$as_dirname -- "$mf" ||
$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
X"$mf" : 'X\(//\)[^/]' \| \
X"$mf" : 'X\(//\)$' \| \
- X"$mf" : 'X\(/\)' \| \
- . : '\(.\)' 2>/dev/null ||
+ X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
echo X"$mf" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
- /^X\(\/\/\)$/{ s//\1/; q; }
- /^X\(\/\).*/{ s//\1/; q; }
- s/.*/./; q'`
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)[^/].*/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\).*/{
+ s//\1/
+ q
+ }
+ s/.*/./; q'`
else
continue
fi
@@ -8541,56 +9070,82 @@ echo X"$mf" |
sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
# Make sure the directory exists.
test -f "$dirpart/$file" && continue
- fdir=`(dirname "$file") 2>/dev/null ||
+ fdir=`$as_dirname -- "$file" ||
$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
X"$file" : 'X\(//\)[^/]' \| \
X"$file" : 'X\(//\)$' \| \
- X"$file" : 'X\(/\)' \| \
- . : '\(.\)' 2>/dev/null ||
+ 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'`
- { if $as_mkdir_p; then
- mkdir -p $dirpart/$fdir
- else
- as_dir=$dirpart/$fdir
+ 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 test ! -d "$as_dir"; do
- as_dirs="$as_dir $as_dirs"
- as_dir=`(dirname "$as_dir") 2>/dev/null ||
+ 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 ||
+ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
echo X"$as_dir" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
- /^X\(\/\/\)$/{ s//\1/; q; }
- /^X\(\/\).*/{ s//\1/; q; }
- s/.*/./; q'`
+ 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 ! -n "$as_dirs" || mkdir $as_dirs
- fi || { { echo "$as_me:$LINENO: error: cannot create directory $dirpart/$fdir" >&5
-echo "$as_me: error: cannot create directory $dirpart/$fdir" >&2;}
+ 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
;;
- default-1 ) case "$CONFIG_FILES" in *po/Makefile.in*)
+ "default-1":C) case "$CONFIG_FILES" in *po/Makefile.in*)
sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
esac ;;
+
esac
-done
-_ACEOF
+done # for ac_tag
-cat >>$CONFIG_STATUS <<\_ACEOF
{ (exit 0); exit 0; }
_ACEOF
diff --git a/projects/gvpndialer/trunk/autom4te.cache/requests b/projects/gvpndialer/trunk/autom4te.cache/requests
index 8aa8c59..8e04c0c 100644
--- a/projects/gvpndialer/trunk/autom4te.cache/requests
+++ b/projects/gvpndialer/trunk/autom4te.cache/requests
@@ -11,120 +11,6 @@
],
[
'/usr/share/autoconf/autoconf/autoconf.m4f',
- 'aclocal.m4',
- 'configure.in'
- ],
- {
- '_LT_AC_TAGCONFIG' => 1,
- 'm4_pattern_forbid' => 1,
- 'AC_CANONICAL_TARGET' => 1,
- 'AC_CONFIG_LIBOBJ_DIR' => 1,
- 'AC_C_VOLATILE' => 1,
- 'AC_TYPE_OFF_T' => 1,
- 'AC_FUNC_CLOSEDIR_VOID' => 1,
- 'AC_REPLACE_FNMATCH' => 1,
- 'AC_PROG_LIBTOOL' => 1,
- 'AC_FUNC_STAT' => 1,
- 'AC_FUNC_WAIT3' => 1,
- 'AC_HEADER_TIME' => 1,
- 'AC_FUNC_LSTAT' => 1,
- 'AC_STRUCT_TM' => 1,
- 'AM_AUTOMAKE_VERSION' => 1,
- 'AC_FUNC_GETMNTENT' => 1,
- 'AC_TYPE_MODE_T' => 1,
- 'AC_FUNC_STRTOD' => 1,
- 'AC_CHECK_HEADERS' => 1,
- 'AC_FUNC_STRNLEN' => 1,
- 'm4_sinclude' => 1,
- 'AC_PROG_CXX' => 1,
- 'AC_PATH_X' => 1,
- 'AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK' => 1,
- 'AC_PROG_AWK' => 1,
- '_m4_warn' => 1,
- 'AC_HEADER_STDC' => 1,
- 'AC_HEADER_MAJOR' => 1,
- 'AC_FUNC_ERROR_AT_LINE' => 1,
- 'AC_PROG_GCC_TRADITIONAL' => 1,
- 'AC_LIBSOURCE' => 1,
- 'AC_FUNC_MBRTOWC' => 1,
- 'AC_STRUCT_ST_BLOCKS' => 1,
- 'AC_TYPE_SIGNAL' => 1,
- 'AC_CANONICAL_BUILD' => 1,
- 'AC_TYPE_UID_T' => 1,
- 'AC_PROG_MAKE_SET' => 1,
- 'AC_CONFIG_AUX_DIR' => 1,
- 'm4_pattern_allow' => 1,
- 'sinclude' => 1,
- 'AC_DEFINE_TRACE_LITERAL' => 1,
- 'AC_FUNC_STRERROR_R' => 1,
- 'AC_PROG_CC' => 1,
- 'AC_FUNC_FORK' => 1,
- 'AC_DECL_SYS_SIGLIST' => 1,
- 'AC_FUNC_STRCOLL' => 1,
- 'AC_FUNC_VPRINTF' => 1,
- 'AC_PROG_YACC' => 1,
- 'AC_INIT' => 1,
- 'AC_STRUCT_TIMEZONE' => 1,
- 'AC_FUNC_CHOWN' => 1,
- 'AC_SUBST' => 1,
- 'AC_FUNC_ALLOCA' => 1,
- 'AC_CANONICAL_HOST' => 1,
- 'AC_FUNC_GETPGRP' => 1,
- 'AC_PROG_RANLIB' => 1,
- 'AM_INIT_AUTOMAKE' => 1,
- 'AC_FUNC_SETPGRP' => 1,
- 'AC_CONFIG_SUBDIRS' => 1,
- 'AC_FUNC_MMAP' => 1,
- 'AC_FUNC_REALLOC' => 1,
- 'AC_TYPE_SIZE_T' => 1,
- 'AC_CONFIG_LINKS' => 1,
- 'AC_CHECK_TYPES' => 1,
- 'LT_SUPPORTED_TAG' => 1,
- 'AC_CHECK_MEMBERS' => 1,
- 'AM_MAINTAINER_MODE' => 1,
- 'AC_FUNC_UTIME_NULL' => 1,
- 'AC_FUNC_SELECT_ARGTYPES' => 1,
- 'AC_HEADER_STAT' => 1,
- 'AC_FUNC_STRFTIME' => 1,
- 'AC_PROG_CPP' => 1,
- 'AC_C_INLINE' => 1,
- 'AM_ENABLE_MULTILIB' => 1,
- 'AC_PROG_LEX' => 1,
- 'AC_C_CONST' => 1,
- 'AC_TYPE_PID_T' => 1,
- 'AC_CONFIG_FILES' => 1,
- 'include' => 1,
- 'AC_FUNC_SETVBUF_REVERSED' => 1,
- 'AC_PROG_INSTALL' => 1,
- 'AM_GNU_GETTEXT' => 1,
- 'AC_FUNC_OBSTACK' => 1,
- 'AC_CHECK_LIB' => 1,
- 'AC_FUNC_MALLOC' => 1,
- 'AC_FUNC_GETGROUPS' => 1,
- 'AC_FUNC_GETLOADAVG' => 1,
- 'AH_OUTPUT' => 1,
- 'AC_FUNC_FSEEKO' => 1,
- 'AM_PROG_CC_C_O' => 1,
- 'AC_FUNC_MKTIME' => 1,
- 'AC_CANONICAL_SYSTEM' => 1,
- 'AM_CONDITIONAL' => 1,
- 'AC_CONFIG_HEADERS' => 1,
- 'AC_HEADER_SYS_WAIT' => 1,
- 'AC_PROG_LN_S' => 1,
- 'AC_FUNC_MEMCMP' => 1,
- 'm4_include' => 1,
- 'AC_HEADER_DIRENT' => 1,
- 'AC_CHECK_FUNCS' => 1
- }
- ], 'Autom4te::Request' ),
- bless( [
- '1',
- 1,
- [
- '/usr/share/autoconf'
- ],
- [
- '/usr/share/autoconf/autoconf/autoconf.m4f',
'/usr/share/aclocal/glib-gettext.m4',
'/usr/share/aclocal/pkg.m4',
'/usr/share/aclocal-1.9/amversion.m4',
@@ -150,131 +36,106 @@
],
{
'm4_pattern_forbid' => 1,
- 'AC_CONFIG_LIBOBJ_DIR' => 1,
- 'AC_TYPE_OFF_T' => 1,
- 'AC_C_VOLATILE' => 1,
- 'AC_FUNC_CLOSEDIR_VOID' => 1,
- 'AC_REPLACE_FNMATCH' => 1,
+ 'jm_MAINTAINER_MODE' => 1,
+ 'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1,
+ '_AM_SET_OPTION' => 1,
'AC_DEFUN' => 1,
- 'AC_PROG_LIBTOOL' => 1,
- 'AC_FUNC_STAT' => 1,
+ 'AM_GLIB_DEFINE_LOCALEDIR' => 1,
'AM_GLIB_GNU_GETTEXT' => 1,
'AM_PROG_MKDIR_P' => 1,
- 'AC_HEADER_TIME' => 1,
- 'AC_FUNC_WAIT3' => 1,
- 'AC_STRUCT_TM' => 1,
- 'AC_FUNC_LSTAT' => 1,
+ 'AM_INIT_AUTOMAKE' => 1,
'AM_AUTOMAKE_VERSION' => 1,
- 'AC_TYPE_MODE_T' => 1,
- 'AC_FUNC_GETMNTENT' => 1,
'AM_MISSING_HAS_RUN' => 1,
- 'AC_FUNC_STRTOD' => 1,
- 'AC_CHECK_HEADERS' => 1,
'AM_MISSING_PROG' => 1,
- 'AC_FUNC_STRNLEN' => 1,
- 'm4_sinclude' => 1,
- 'AC_PROG_CXX' => 1,
- 'AC_PATH_X' => 1,
- 'AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK' => 1,
+ 'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
+ 'AM_MAINTAINER_MODE' => 1,
+ 'AC_DEFUN_ONCE' => 1,
'AM_PROG_INSTALL_STRIP' => 1,
- 'AC_PROG_AWK' => 1,
+ '_PKG_SHORT_ERRORS_SUPPORTED' => 1,
'_m4_warn' => 1,
- 'AC_HEADER_STDC' => 1,
- 'AC_HEADER_MAJOR' => 1,
+ 'fp_PROG_CC_STDC' => 1,
'AM_SANITY_CHECK' => 1,
+ 'PKG_CHECK_EXISTS' => 1,
+ 'include' => 1,
'_AM_PROG_TAR' => 1,
- 'AC_FUNC_ERROR_AT_LINE' => 1,
- 'AC_PROG_GCC_TRADITIONAL' => 1,
- 'AC_LIBSOURCE' => 1,
+ 'AM_AUX_DIR_EXPAND' => 1,
'AM_DEP_TRACK' => 1,
- 'AC_FUNC_MBRTOWC' => 1,
'AM_CONFIG_HEADER' => 1,
- 'AC_STRUCT_ST_BLOCKS' => 1,
- 'AC_TYPE_SIGNAL' => 1,
+ '_AM_SET_OPTIONS' => 1,
+ 'AM_RUN_LOG' => 1,
+ '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
'AM_PROG_CC_STDC' => 1,
- 'AC_TYPE_UID_T' => 1,
'_AM_IF_OPTION' => 1,
- 'AC_CONFIG_AUX_DIR' => 1,
- 'AC_PROG_MAKE_SET' => 1,
- 'sinclude' => 1,
'm4_pattern_allow' => 1,
+ '_AM_MANGLE_OPTION' => 1,
'AM_SET_LEADING_DOT' => 1,
- 'AC_DEFINE_TRACE_LITERAL' => 1,
+ 'AM_CONDITIONAL' => 1,
+ 'AM_SET_DEPDIR' => 1,
'_AM_DEPENDENCIES' => 1,
- 'AC_FUNC_STRERROR_R' => 1,
- 'AC_PROG_CC' => 1,
- 'AC_FUNC_FORK' => 1,
- 'AC_DECL_SYS_SIGLIST' => 1,
+ 'm4_include' => 1,
+ 'AM_PROG_INSTALL_SH' => 1,
+ 'PKG_PROG_PKG_CONFIG' => 1,
'PKG_CHECK_MODULES' => 1,
- 'AC_FUNC_VPRINTF' => 1,
- 'AC_FUNC_STRCOLL' => 1,
+ '_AC_AM_CONFIG_HEADER_HOOK' => 1,
'AU_DEFUN' => 1,
- 'AC_PROG_YACC' => 1,
+ 'AM_MAKE_INCLUDE' => 1
+ }
+ ], 'Autom4te::Request' ),
+ bless( [
+ '1',
+ 1,
+ [
+ '/usr/share/autoconf'
+ ],
+ [
+ '/usr/share/autoconf/autoconf/autoconf.m4f',
+ 'aclocal.m4',
+ 'configure.in'
+ ],
+ {
+ 'AM_PROG_F77_C_O' => 1,
+ '_LT_AC_TAGCONFIG' => 1,
+ 'm4_pattern_forbid' => 1,
'AC_INIT' => 1,
- 'AC_STRUCT_TIMEZONE' => 1,
- 'jm_MAINTAINER_MODE' => 1,
- 'AC_FUNC_CHOWN' => 1,
- 'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1,
+ 'AC_CANONICAL_TARGET' => 1,
+ 'AC_CONFIG_LIBOBJ_DIR' => 1,
'AC_SUBST' => 1,
- 'AC_FUNC_ALLOCA' => 1,
- '_AM_SET_OPTION' => 1,
'AC_CANONICAL_HOST' => 1,
- 'AC_FUNC_GETPGRP' => 1,
- 'AC_PROG_RANLIB' => 1,
- 'AM_GLIB_DEFINE_LOCALEDIR' => 1,
- 'AC_FUNC_SETPGRP' => 1,
+ 'AC_FC_SRCEXT' => 1,
+ 'AC_PROG_LIBTOOL' => 1,
'AM_INIT_AUTOMAKE' => 1,
'AC_CONFIG_SUBDIRS' => 1,
- 'AC_FUNC_MMAP' => 1,
- 'AC_FUNC_REALLOC' => 1,
- 'AC_TYPE_SIZE_T' => 1,
+ 'AM_AUTOMAKE_VERSION' => 1,
+ 'LT_CONFIG_LTDL_DIR' => 1,
+ 'AC_REQUIRE_AUX_FILE' => 1,
'AC_CONFIG_LINKS' => 1,
- 'AC_CHECK_TYPES' => 1,
- 'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
- 'AC_CHECK_MEMBERS' => 1,
+ 'LT_SUPPORTED_TAG' => 1,
+ 'm4_sinclude' => 1,
'AM_MAINTAINER_MODE' => 1,
- 'AC_FUNC_UTIME_NULL' => 1,
- 'AC_FUNC_SELECT_ARGTYPES' => 1,
- 'AC_HEADER_STAT' => 1,
- 'AC_FUNC_STRFTIME' => 1,
- 'fp_PROG_CC_STDC' => 1,
- 'AC_PROG_CPP' => 1,
- 'AC_C_INLINE' => 1,
- 'AC_TYPE_PID_T' => 1,
- 'AC_PROG_LEX' => 1,
- 'AC_C_CONST' => 1,
+ 'AM_GNU_GETTEXT_INTL_SUBDIR' => 1,
+ '_m4_warn' => 1,
+ 'AM_PROG_CXX_C_O' => 1,
+ 'AM_ENABLE_MULTILIB' => 1,
'AC_CONFIG_FILES' => 1,
'include' => 1,
- 'AC_FUNC_SETVBUF_REVERSED' => 1,
- 'AC_PROG_INSTALL' => 1,
- 'AM_AUX_DIR_EXPAND' => 1,
+ 'LT_INIT' => 1,
'AM_GNU_GETTEXT' => 1,
- 'AC_FUNC_OBSTACK' => 1,
- 'AC_CHECK_LIB' => 1,
- '_AM_SET_OPTIONS' => 1,
- 'AC_FUNC_MALLOC' => 1,
- '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
- 'AM_RUN_LOG' => 1,
- 'AC_FUNC_GETGROUPS' => 1,
- 'AC_FUNC_GETLOADAVG' => 1,
+ 'AC_LIBSOURCE' => 1,
+ 'AM_PROG_FC_C_O' => 1,
+ 'AC_CANONICAL_BUILD' => 1,
+ 'AC_FC_FREEFORM' => 1,
'AH_OUTPUT' => 1,
- 'AC_FUNC_FSEEKO' => 1,
+ '_AM_SUBST_NOTMAKE' => 1,
+ 'AC_CONFIG_AUX_DIR' => 1,
+ 'm4_pattern_allow' => 1,
'AM_PROG_CC_C_O' => 1,
- '_AM_MANGLE_OPTION' => 1,
- 'AC_CANONICAL_SYSTEM' => 1,
+ 'sinclude' => 1,
'AM_CONDITIONAL' => 1,
- 'AC_FUNC_MKTIME' => 1,
+ 'AC_CANONICAL_SYSTEM' => 1,
'AC_CONFIG_HEADERS' => 1,
- 'AM_SET_DEPDIR' => 1,
- 'AC_HEADER_SYS_WAIT' => 1,
- 'AC_PROG_LN_S' => 1,
- 'AC_FUNC_MEMCMP' => 1,
+ 'AC_DEFINE_TRACE_LITERAL' => 1,
'm4_include' => 1,
- 'AM_PROG_INSTALL_SH' => 1,
- 'AC_HEADER_DIRENT' => 1,
- '_AC_AM_CONFIG_HEADER_HOOK' => 1,
- 'AC_CHECK_FUNCS' => 1,
- 'AM_MAKE_INCLUDE' => 1
+ 'AC_SUBST_TRACE' => 1
}
], 'Autom4te::Request' )
);
diff --git a/projects/gvpndialer/trunk/autom4te.cache/traces.0 b/projects/gvpndialer/trunk/autom4te.cache/traces.0
index d6ca72a..a3199c3 100644
--- a/projects/gvpndialer/trunk/autom4te.cache/traces.0
+++ b/projects/gvpndialer/trunk/autom4te.cache/traces.0
@@ -1,4 +1,615 @@
-m4trace:configure.in:3: -1- AC_INIT([configure.in])
+m4trace:/usr/share/aclocal/glib-gettext.m4:399: -1- AC_DEFUN([AM_GLIB_GNU_GETTEXT], [GLIB_GNU_GETTEXT($@)])
+m4trace:/usr/share/aclocal/glib-gettext.m4:399: -1- AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR], [GLIB_DEFINE_LOCALEDIR($@)])
+m4trace:/usr/share/aclocal/pkg.m4:26: -1- AC_DEFUN([PKG_PROG_PKG_CONFIG], [m4_pattern_forbid([^_?PKG_[A-Z_]+$])
+m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
+AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+ AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
+fi
+if test -n "$PKG_CONFIG"; then
+ _pkg_min_version=m4_default([$1], [0.9.0])
+ AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
+ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+ AC_MSG_RESULT([yes])
+ else
+ AC_MSG_RESULT([no])
+ PKG_CONFIG=""
+ fi
+
+fi[]dnl
+])
+m4trace:/usr/share/aclocal/pkg.m4:56: -1- AC_DEFUN([PKG_CHECK_EXISTS], [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+if test -n "$PKG_CONFIG" && \
+ AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
+ m4_ifval([$2], [$2], [:])
+m4_ifvaln([$3], [else
+ $3])dnl
+fi])
+m4trace:/usr/share/aclocal/pkg.m4:84: -1- AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], [AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi[]dnl
+])
+m4trace:/usr/share/aclocal/pkg.m4:104: -1- AC_DEFUN([PKG_CHECK_MODULES], [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
+AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
+
+pkg_failed=no
+AC_MSG_CHECKING([for $1])
+
+_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
+_PKG_CONFIG([$1][_LIBS], [libs], [$2])
+
+m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
+and $1[]_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.])
+
+if test $pkg_failed = yes; then
+ _PKG_SHORT_ERRORS_SUPPORTED
+ if test $_pkg_short_errors_supported = yes; then
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
+ else
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
+
+ ifelse([$4], , [AC_MSG_ERROR(dnl
+[Package requirements ($2) were not met:
+
+$$1_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+_PKG_TEXT
+])],
+ [AC_MSG_RESULT([no])
+ $4])
+elif test $pkg_failed = untried; then
+ ifelse([$4], , [AC_MSG_FAILURE(dnl
+[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.
+
+_PKG_TEXT
+
+To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.])],
+ [$4])
+else
+ $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
+ $1[]_LIBS=$pkg_cv_[]$1[]_LIBS
+ AC_MSG_RESULT([yes])
+ ifelse([$3], , :, [$3])
+fi[]dnl
+])
+m4trace:/usr/share/aclocal-1.9/amversion.m4:13: -1- AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"])
+m4trace:/usr/share/aclocal-1.9/amversion.m4:19: -1- AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], [AM_AUTOMAKE_VERSION([1.9.6])])
+m4trace:/usr/share/aclocal-1.9/auxdir.m4:47: -1- AC_DEFUN([AM_AUX_DIR_EXPAND], [dnl Rely on autoconf to set up CDPATH properly.
+AC_PREREQ([2.50])dnl
+# expand $ac_aux_dir to an absolute path
+am_aux_dir=`cd $ac_aux_dir && pwd`
+])
+m4trace:/usr/share/aclocal-1.9/ccstdc.m4:17: -1- AU_DEFUN([AM_PROG_CC_STDC], [AC_PROG_CC
+AC_DIAGNOSE([obsolete], [$0:
+ your code should no longer depend upon `am_cv_prog_cc_stdc', but upon
+ `ac_cv_prog_cc_stdc'. Remove this warning and the assignment when
+ you adjust the code. You can also remove the above call to
+ AC_PROG_CC if you already called it elsewhere.])
+am_cv_prog_cc_stdc=$ac_cv_prog_cc_stdc
+])
+m4trace:/usr/share/aclocal-1.9/ccstdc.m4:17: -1- AC_DEFUN([AM_PROG_CC_STDC], [AC_DIAGNOSE([obsolete], [The macro `AM_PROG_CC_STDC' is obsolete.
+You should run autoupdate.])dnl
+AC_PROG_CC
+AC_DIAGNOSE([obsolete], [$0:
+ your code should no longer depend upon `am_cv_prog_cc_stdc', but upon
+ `ac_cv_prog_cc_stdc'. Remove this warning and the assignment when
+ you adjust the code. You can also remove the above call to
+ AC_PROG_CC if you already called it elsewhere.])
+am_cv_prog_cc_stdc=$ac_cv_prog_cc_stdc
+])
+m4trace:/usr/share/aclocal-1.9/ccstdc.m4:26: -1- AU_DEFUN([fp_PROG_CC_STDC])
+m4trace:/usr/share/aclocal-1.9/ccstdc.m4:26: -1- AC_DEFUN([fp_PROG_CC_STDC], [AC_DIAGNOSE([obsolete], [The macro `fp_PROG_CC_STDC' is obsolete.
+You should run autoupdate.])dnl
+])
+m4trace:/usr/share/aclocal-1.9/cond.m4:15: -1- AC_DEFUN([AM_CONDITIONAL], [AC_PREREQ(2.52)dnl
+ ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
+ [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
+AC_SUBST([$1_TRUE])
+AC_SUBST([$1_FALSE])
+if $2; then
+ $1_TRUE=
+ $1_FALSE='#'
+else
+ $1_TRUE='#'
+ $1_FALSE=
+fi
+AC_CONFIG_COMMANDS_PRE(
+[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
+ AC_MSG_ERROR([[conditional "$1" was never defined.
+Usually this means the macro was only invoked conditionally.]])
+fi])])
+m4trace:/usr/share/aclocal-1.9/depend.m4:29: -1- AC_DEFUN([_AM_DEPENDENCIES], [AC_REQUIRE([AM_SET_DEPDIR])dnl
+AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
+AC_REQUIRE([AM_MAKE_INCLUDE])dnl
+AC_REQUIRE([AM_DEP_TRACK])dnl
+
+ifelse([$1], CC, [depcc="$CC" am_compiler_list=],
+ [$1], CXX, [depcc="$CXX" am_compiler_list=],
+ [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
+ [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
+ [depcc="$$1" am_compiler_list=])
+
+AC_CACHE_CHECK([dependency style of $depcc],
+ [am_cv_$1_dependencies_compiler_type],
+[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+ # We make a subdir and do the tests there. Otherwise we can end up
+ # making bogus files that we don't know about and never remove. For
+ # instance it was reported that on HP-UX the gcc test will end up
+ # making a dummy file named `D' -- because `-MD' means `put the output
+ # in D'.
+ mkdir conftest.dir
+ # Copy depcomp to subdir because otherwise we won't find it if we're
+ # using a relative directory.
+ cp "$am_depcomp" conftest.dir
+ cd conftest.dir
+ # We will build objects and dependencies in a subdirectory because
+ # it helps to detect inapplicable dependency modes. For instance
+ # both Tru64's cc and ICC support -MD to output dependencies as a
+ # side effect of compilation, but ICC will put the dependencies in
+ # the current directory while Tru64 will put them in the object
+ # directory.
+ mkdir sub
+
+ am_cv_$1_dependencies_compiler_type=none
+ if test "$am_compiler_list" = ""; then
+ am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
+ fi
+ 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
+ # we should not choose a depcomp mode which is confused by this.
+ #
+ # We need to recreate these files for each test, as the compiler may
+ # overwrite some of them when testing with obscure command lines.
+ # This happens at least with the AIX C compiler.
+ : > sub/conftest.c
+ for i in 1 2 3 4 5 6; do
+ echo '#include "conftst'$i'.h"' >> sub/conftest.c
+ # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
+ # Solaris 8's {/usr,}/bin/sh.
+ touch sub/conftst$i.h
+ done
+ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+
+ case $depmode in
+ nosideeffect)
+ # after this tag, mechanisms are not by side-effect, so they'll
+ # only be used when explicitly requested
+ if test "x$enable_dependency_tracking" = xyes; then
+ continue
+ else
+ break
+ fi
+ ;;
+ 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} \
+ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+ $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
+ >/dev/null 2>conftest.err &&
+ grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+ grep sub/conftest.${OBJEXT-o} 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
+ # that says an option was ignored or not supported.
+ # When given -MP, icc 7.0 and 7.1 complain thusly:
+ # icc: Command line warning: ignoring option '-M'; no argument required
+ # The diagnosis changed in icc 8.0:
+ # icc: Command line remark: option '-MP' not supported
+ if (grep 'ignoring option' conftest.err ||
+ grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
+ am_cv_$1_dependencies_compiler_type=$depmode
+ break
+ fi
+ fi
+ done
+
+ cd ..
+ rm -rf conftest.dir
+else
+ am_cv_$1_dependencies_compiler_type=none
+fi
+])
+AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
+AM_CONDITIONAL([am__fastdep$1], [
+ test "x$enable_dependency_tracking" != xno \
+ && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
+])
+m4trace:/usr/share/aclocal-1.9/depend.m4:138: -1- AC_DEFUN([AM_SET_DEPDIR], [AC_REQUIRE([AM_SET_LEADING_DOT])dnl
+AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
+])
+m4trace:/usr/share/aclocal-1.9/depend.m4:146: -1- AC_DEFUN([AM_DEP_TRACK], [AC_ARG_ENABLE(dependency-tracking,
+[ --disable-dependency-tracking speeds up one-time build
+ --enable-dependency-tracking do not reject slow dependency extractors])
+if test "x$enable_dependency_tracking" != xno; then
+ am_depcomp="$ac_aux_dir/depcomp"
+ AMDEPBACKSLASH='\'
+fi
+AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
+AC_SUBST([AMDEPBACKSLASH])
+])
+m4trace:/usr/share/aclocal-1.9/depout.m4:14: -1- AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], [for mf in $CONFIG_FILES; 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.
+ # So let's grep whole file.
+ if grep '^#.*generated by automake' $mf > /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
+])
+m4trace:/usr/share/aclocal-1.9/depout.m4:63: -1- AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], [AC_CONFIG_COMMANDS([depfiles],
+ [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
+ [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
+])
+m4trace:/usr/share/aclocal-1.9/header.m4:12: -1- AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
+m4trace:/usr/share/aclocal-1.9/header.m4:12: -1- AC_DEFUN([AM_CONFIG_HEADER], [AC_DIAGNOSE([obsolete], [The macro `AM_CONFIG_HEADER' is obsolete.
+You should run autoupdate.])dnl
+AC_CONFIG_HEADERS($@)])
+m4trace:/usr/share/aclocal-1.9/init.m4:26: -1- AC_DEFUN([AM_INIT_AUTOMAKE], [AC_PREREQ([2.58])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
+AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
+AC_REQUIRE([AC_PROG_INSTALL])dnl
+# test to see if srcdir already configured
+if test "`cd $srcdir && pwd`" != "`pwd`" &&
+ test -f $srcdir/config.status; then
+ AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
+fi
+
+# test whether we have cygpath
+if test -z "$CYGPATH_W"; then
+ if (cygpath --version) >/dev/null 2>/dev/null; then
+ CYGPATH_W='cygpath -w'
+ else
+ CYGPATH_W=echo
+ fi
+fi
+AC_SUBST([CYGPATH_W])
+
+# Define the identity of the package.
+dnl Distinguish between old-style and new-style calls.
+m4_ifval([$2],
+[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
+ AC_SUBST([PACKAGE], [$1])dnl
+ AC_SUBST([VERSION], [$2])],
+[_AM_SET_OPTIONS([$1])dnl
+ AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
+ AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
+
+_AM_IF_OPTION([no-define],,
+[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
+ AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
+
+# Some tools Automake needs.
+AC_REQUIRE([AM_SANITY_CHECK])dnl
+AC_REQUIRE([AC_ARG_PROGRAM])dnl
+AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
+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_MKDIR_P])dnl
+# We need awk for the "check" target. The system "awk" is bad on
+# some platforms.
+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([no-dependencies],,
+[AC_PROVIDE_IFELSE([AC_PROG_CC],
+ [_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
+])
+])
+m4trace:/usr/share/aclocal-1.9/init.m4:102: -1- AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], [# Compute $1's index in $config_headers.
+_am_stamp_count=1
+for _am_header in $config_headers :; do
+ case $_am_header in
+ $1 | $1:* )
+ break ;;
+ * )
+ _am_stamp_count=`expr $_am_stamp_count + 1` ;;
+ esac
+done
+echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
+m4trace:/usr/share/aclocal-1.9/install-sh.m4:11: -1- AC_DEFUN([AM_PROG_INSTALL_SH], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+install_sh=${install_sh-"$am_aux_dir/install-sh"}
+AC_SUBST(install_sh)])
+m4trace:/usr/share/aclocal-1.9/lead-dot.m4:12: -1- AC_DEFUN([AM_SET_LEADING_DOT], [rm -rf .tst 2>/dev/null
+mkdir .tst 2>/dev/null
+if test -d .tst; then
+ am__leading_dot=.
+else
+ am__leading_dot=_
+fi
+rmdir .tst 2>/dev/null
+AC_SUBST([am__leading_dot])])
+m4trace:/usr/share/aclocal-1.9/maintainer.m4:13: -1- AC_DEFUN([AM_MAINTAINER_MODE], [AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
+ dnl maintainer-mode is disabled by default
+ AC_ARG_ENABLE(maintainer-mode,
+[ --enable-maintainer-mode enable make rules and dependencies not useful
+ (and sometimes confusing) to the casual installer],
+ USE_MAINTAINER_MODE=$enableval,
+ USE_MAINTAINER_MODE=no)
+ AC_MSG_RESULT([$USE_MAINTAINER_MODE])
+ AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes])
+ MAINT=$MAINTAINER_MODE_TRUE
+ AC_SUBST(MAINT)dnl
+
+])
+m4trace:/usr/share/aclocal-1.9/maintainer.m4:28: -1- AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
+m4trace:/usr/share/aclocal-1.9/maintainer.m4:28: -1- AC_DEFUN([jm_MAINTAINER_MODE], [AC_DIAGNOSE([obsolete], [The macro `jm_MAINTAINER_MODE' is obsolete.
+You should run autoupdate.])dnl
+AM_MAINTAINER_MODE])
+m4trace:/usr/share/aclocal-1.9/make.m4:14: -1- AC_DEFUN([AM_MAKE_INCLUDE], [am_make=${MAKE-make}
+cat > confinc << 'END'
+am__doit:
+ @echo done
+.PHONY: am__doit
+END
+# If we don't find an include directive, just comment out the code.
+AC_MSG_CHECKING([for style of include used by $am_make])
+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
+# 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
+fi
+AC_SUBST([am__include])
+AC_SUBST([am__quote])
+AC_MSG_RESULT([$_am_result])
+rm -f confinc confmf
+])
+m4trace:/usr/share/aclocal-1.9/missing.m4:14: -1- AC_DEFUN([AM_MISSING_PROG], [AC_REQUIRE([AM_MISSING_HAS_RUN])
+$1=${$1-"${am_missing_run}$2"}
+AC_SUBST($1)])
+m4trace:/usr/share/aclocal-1.9/missing.m4:24: -1- AC_DEFUN([AM_MISSING_HAS_RUN], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
+# Use eval to expand $SHELL
+if eval "$MISSING --run true"; then
+ am_missing_run="$MISSING --run "
+else
+ am_missing_run=
+ AC_MSG_WARN([`missing' script is too old or missing])
+fi
+])
+m4trace:/usr/share/aclocal-1.9/mkdirp.m4:30: -1- AC_DEFUN([AM_PROG_MKDIR_P], [if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
+ # We used to keeping the `.' as first argument, in order to
+ # allow $(mkdir_p) to be used without argument. As in
+ # $(mkdir_p) $(somedir)
+ # where $(somedir) is conditionally defined. However this is wrong
+ # for two reasons:
+ # 1. if the package is installed by a user who cannot write `.'
+ # make install will fail,
+ # 2. the above comment should most certainly read
+ # $(mkdir_p) $(DESTDIR)$(somedir)
+ # so it does not work when $(somedir) is undefined and
+ # $(DESTDIR) is not.
+ # To support the latter case, we have to write
+ # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
+ # so the `.' trick is pointless.
+ mkdir_p='mkdir -p --'
+else
+ # On NextStep and OpenStep, the `mkdir' command does not
+ # recognize any option. It will interpret all options as
+ # directories to create, and then abort because `.' already
+ # exists.
+ for d in ./-p ./--version;
+ do
+ test -d $d && rmdir $d
+ done
+ # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
+ if test -f "$ac_aux_dir/mkinstalldirs"; then
+ mkdir_p='$(mkinstalldirs)'
+ else
+ mkdir_p='$(install_sh) -d'
+ fi
+fi
+AC_SUBST([mkdir_p])])
+m4trace:/usr/share/aclocal-1.9/options.m4:13: -1- AC_DEFUN([_AM_MANGLE_OPTION], [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
+m4trace:/usr/share/aclocal-1.9/options.m4:19: -1- AC_DEFUN([_AM_SET_OPTION], [m4_define(_AM_MANGLE_OPTION([$1]), 1)])
+m4trace:/usr/share/aclocal-1.9/options.m4:25: -1- AC_DEFUN([_AM_SET_OPTIONS], [AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
+m4trace:/usr/share/aclocal-1.9/options.m4:31: -1- AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
+m4trace:/usr/share/aclocal-1.9/runlog.m4:12: -1- AC_DEFUN([AM_RUN_LOG], [{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD
+ ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+ (exit $ac_status); }])
+m4trace:/usr/share/aclocal-1.9/sanity.m4:14: -1- AC_DEFUN([AM_SANITY_CHECK], [AC_MSG_CHECKING([whether build environment is sane])
+# Just in case
+sleep 1
+echo timestamp > conftest.file
+# 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`
+ if test "$[*]" = "X"; then
+ # -L didn't work.
+ set X `ls -t $srcdir/configure conftest.file`
+ fi
+ rm -f conftest.file
+ if test "$[*]" != "X $srcdir/configure conftest.file" \
+ && test "$[*]" != "X conftest.file $srcdir/configure"; then
+
+ # If neither matched, then we have a broken ls. This can happen
+ # 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".
+ AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
+alias in your environment])
+ fi
+
+ test "$[2]" = conftest.file
+ )
+then
+ # Ok.
+ :
+else
+ AC_MSG_ERROR([newly created file is older than distributed files!
+Check your system clock])
+fi
+AC_MSG_RESULT(yes)])
+m4trace:/usr/share/aclocal-1.9/strip.m4:17: -1- AC_DEFUN([AM_PROG_INSTALL_STRIP], [AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
+# 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.
+dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
+if test "$cross_compiling" != no; then
+ AC_CHECK_TOOL([STRIP], [strip], :)
+fi
+INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
+AC_SUBST([INSTALL_STRIP_PROGRAM])])
+m4trace:/usr/share/aclocal-1.9/tar.m4:24: -1- AC_DEFUN([_AM_PROG_TAR], [# Always define AMTAR for backward compatibility.
+AM_MISSING_PROG([AMTAR], [tar])
+m4_if([$1], [v7],
+ [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
+ [m4_case([$1], [ustar],, [pax],,
+ [m4_fatal([Unknown tar format])])
+AC_MSG_CHECKING([how to create a $1 tar archive])
+# Loop over all known methods to create a tar archive until one works.
+_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
+_am_tools=${am_cv_prog_tar_$1-$_am_tools}
+# Do not fold the above two line into one, because Tru64 sh and
+# Solaris sh will not grok spaces in the rhs of `-'.
+for _am_tool in $_am_tools
+do
+ case $_am_tool in
+ gnutar)
+ for _am_tar in tar gnutar gtar;
+ do
+ AM_RUN_LOG([$_am_tar --version]) && break
+ done
+ am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
+ am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
+ am__untar="$_am_tar -xf -"
+ ;;
+ plaintar)
+ # Must skip GNU tar: if it does not support --format= it doesn't create
+ # ustar tarball either.
+ (tar --version) >/dev/null 2>&1 && continue
+ am__tar='tar chf - "$$tardir"'
+ am__tar_='tar chf - "$tardir"'
+ am__untar='tar xf -'
+ ;;
+ pax)
+ am__tar='pax -L -x $1 -w "$$tardir"'
+ am__tar_='pax -L -x $1 -w "$tardir"'
+ am__untar='pax -r'
+ ;;
+ cpio)
+ am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
+ am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
+ am__untar='cpio -i -H $1 -d'
+ ;;
+ none)
+ am__tar=false
+ am__tar_=false
+ am__untar=false
+ ;;
+ esac
+
+ # If the value was cached, stop now. We just wanted to have am__tar
+ # and am__untar set.
+ test -n "${am_cv_prog_tar_$1}" && break
+
+ # tar/untar a dummy directory, and stop if the command works
+ rm -rf conftest.dir
+ mkdir conftest.dir
+ echo GrepMe > conftest.dir/file
+ AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
+ rm -rf conftest.dir
+ if test -s conftest.tar; then
+ AM_RUN_LOG([$am__untar <conftest.tar])
+ grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
+ fi
+done
+rm -rf conftest.dir
+
+AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
+AC_MSG_RESULT([$am_cv_prog_tar_$1])])
+AC_SUBST([am__tar])
+AC_SUBST([am__untar])
+])
m4trace:configure.in:3: -1- m4_pattern_forbid([^_?A[CHUM]_])
m4trace:configure.in:3: -1- m4_pattern_forbid([_AC_])
m4trace:configure.in:3: -1- m4_pattern_forbid([^LIBOBJS$], [do not use LIBOBJS directly, use AC_LIBOBJ (see section `AC_LIBOBJ vs LIBOBJS'])
@@ -6,320 +617,296 @@ m4trace:configure.in:3: -1- m4_pattern_allow([^AS_FLAGS$])
m4trace:configure.in:3: -1- m4_pattern_forbid([^_?m4_])
m4trace:configure.in:3: -1- m4_pattern_forbid([^dnl$])
m4trace:configure.in:3: -1- m4_pattern_forbid([^_?AS_])
-m4trace:configure.in:3: -1- AC_SUBST([SHELL], [${CONFIG_SHELL-/bin/sh}])
-m4trace:configure.in:3: -1- AC_SUBST([PATH_SEPARATOR])
-m4trace:configure.in:3: -1- AC_SUBST([PACKAGE_NAME], [m4_ifdef([AC_PACKAGE_NAME], ['AC_PACKAGE_NAME'])])
-m4trace:configure.in:3: -1- AC_SUBST([PACKAGE_TARNAME], [m4_ifdef([AC_PACKAGE_TARNAME], ['AC_PACKAGE_TARNAME'])])
-m4trace:configure.in:3: -1- AC_SUBST([PACKAGE_VERSION], [m4_ifdef([AC_PACKAGE_VERSION], ['AC_PACKAGE_VERSION'])])
-m4trace:configure.in:3: -1- AC_SUBST([PACKAGE_STRING], [m4_ifdef([AC_PACKAGE_STRING], ['AC_PACKAGE_STRING'])])
-m4trace:configure.in:3: -1- AC_SUBST([PACKAGE_BUGREPORT], [m4_ifdef([AC_PACKAGE_BUGREPORT], ['AC_PACKAGE_BUGREPORT'])])
-m4trace:configure.in:3: -1- AC_SUBST([exec_prefix], [NONE])
-m4trace:configure.in:3: -1- AC_SUBST([prefix], [NONE])
-m4trace:configure.in:3: -1- AC_SUBST([program_transform_name], [s,x,x,])
-m4trace:configure.in:3: -1- AC_SUBST([bindir], ['${exec_prefix}/bin'])
-m4trace:configure.in:3: -1- AC_SUBST([sbindir], ['${exec_prefix}/sbin'])
-m4trace:configure.in:3: -1- AC_SUBST([libexecdir], ['${exec_prefix}/libexec'])
-m4trace:configure.in:3: -1- AC_SUBST([datadir], ['${prefix}/share'])
-m4trace:configure.in:3: -1- AC_SUBST([sysconfdir], ['${prefix}/etc'])
-m4trace:configure.in:3: -1- AC_SUBST([sharedstatedir], ['${prefix}/com'])
-m4trace:configure.in:3: -1- AC_SUBST([localstatedir], ['${prefix}/var'])
-m4trace:configure.in:3: -1- AC_SUBST([libdir], ['${exec_prefix}/lib'])
-m4trace:configure.in:3: -1- AC_SUBST([includedir], ['${prefix}/include'])
-m4trace:configure.in:3: -1- AC_SUBST([oldincludedir], ['/usr/include'])
-m4trace:configure.in:3: -1- AC_SUBST([infodir], ['${prefix}/info'])
-m4trace:configure.in:3: -1- AC_SUBST([mandir], ['${prefix}/man'])
-m4trace:configure.in:3: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_NAME])
-m4trace:configure.in:3: -1- AH_OUTPUT([PACKAGE_NAME], [/* Define to the full name of this package. */
-#undef PACKAGE_NAME])
-m4trace:configure.in:3: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_TARNAME])
-m4trace:configure.in:3: -1- AH_OUTPUT([PACKAGE_TARNAME], [/* Define to the one symbol short name of this package. */
-#undef PACKAGE_TARNAME])
-m4trace:configure.in:3: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_VERSION])
-m4trace:configure.in:3: -1- AH_OUTPUT([PACKAGE_VERSION], [/* Define to the version of this package. */
-#undef PACKAGE_VERSION])
-m4trace:configure.in:3: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_STRING])
-m4trace:configure.in:3: -1- AH_OUTPUT([PACKAGE_STRING], [/* Define to the full name and version of this package. */
-#undef PACKAGE_STRING])
-m4trace:configure.in:3: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_BUGREPORT])
-m4trace:configure.in:3: -1- AH_OUTPUT([PACKAGE_BUGREPORT], [/* Define to the address where bug reports for this package should be sent. */
-#undef PACKAGE_BUGREPORT])
-m4trace:configure.in:3: -1- AC_SUBST([build_alias])
-m4trace:configure.in:3: -1- AC_SUBST([host_alias])
-m4trace:configure.in:3: -1- AC_SUBST([target_alias])
-m4trace:configure.in:3: -1- AC_SUBST([DEFS])
-m4trace:configure.in:3: -1- AC_SUBST([ECHO_C])
-m4trace:configure.in:3: -1- AC_SUBST([ECHO_N])
-m4trace:configure.in:3: -1- AC_SUBST([ECHO_T])
-m4trace:configure.in:3: -1- AC_SUBST([LIBS])
-m4trace:configure.in:4: -1- AM_INIT_AUTOMAKE([gvpndialer], [1.0])
+m4trace:configure.in:3: -1- m4_pattern_allow([^SHELL$])
+m4trace:configure.in:3: -1- m4_pattern_allow([^PATH_SEPARATOR$])
+m4trace:configure.in:3: -1- m4_pattern_allow([^PACKAGE_NAME$])
+m4trace:configure.in:3: -1- m4_pattern_allow([^PACKAGE_TARNAME$])
+m4trace:configure.in:3: -1- m4_pattern_allow([^PACKAGE_VERSION$])
+m4trace:configure.in:3: -1- m4_pattern_allow([^PACKAGE_STRING$])
+m4trace:configure.in:3: -1- m4_pattern_allow([^PACKAGE_BUGREPORT$])
+m4trace:configure.in:3: -1- m4_pattern_allow([^exec_prefix$])
+m4trace:configure.in:3: -1- m4_pattern_allow([^prefix$])
+m4trace:configure.in:3: -1- m4_pattern_allow([^program_transform_name$])
+m4trace:configure.in:3: -1- m4_pattern_allow([^bindir$])
+m4trace:configure.in:3: -1- m4_pattern_allow([^sbindir$])
+m4trace:configure.in:3: -1- m4_pattern_allow([^libexecdir$])
+m4trace:configure.in:3: -1- m4_pattern_allow([^datarootdir$])
+m4trace:configure.in:3: -1- m4_pattern_allow([^datadir$])
+m4trace:configure.in:3: -1- m4_pattern_allow([^sysconfdir$])
+m4trace:configure.in:3: -1- m4_pattern_allow([^sharedstatedir$])
+m4trace:configure.in:3: -1- m4_pattern_allow([^localstatedir$])
+m4trace:configure.in:3: -1- m4_pattern_allow([^includedir$])
+m4trace:configure.in:3: -1- m4_pattern_allow([^oldincludedir$])
+m4trace:configure.in:3: -1- m4_pattern_allow([^docdir$])
+m4trace:configure.in:3: -1- m4_pattern_allow([^infodir$])
+m4trace:configure.in:3: -1- m4_pattern_allow([^htmldir$])
+m4trace:configure.in:3: -1- m4_pattern_allow([^dvidir$])
+m4trace:configure.in:3: -1- m4_pattern_allow([^pdfdir$])
+m4trace:configure.in:3: -1- m4_pattern_allow([^psdir$])
+m4trace:configure.in:3: -1- m4_pattern_allow([^libdir$])
+m4trace:configure.in:3: -1- m4_pattern_allow([^localedir$])
+m4trace:configure.in:3: -1- m4_pattern_allow([^mandir$])
+m4trace:configure.in:3: -1- m4_pattern_allow([^PACKAGE_NAME$])
+m4trace:configure.in:3: -1- m4_pattern_allow([^PACKAGE_TARNAME$])
+m4trace:configure.in:3: -1- m4_pattern_allow([^PACKAGE_VERSION$])
+m4trace:configure.in:3: -1- m4_pattern_allow([^PACKAGE_STRING$])
+m4trace:configure.in:3: -1- m4_pattern_allow([^PACKAGE_BUGREPORT$])
+m4trace:configure.in:3: -1- m4_pattern_allow([^DEFS$])
+m4trace:configure.in:3: -1- m4_pattern_allow([^ECHO_C$])
+m4trace:configure.in:3: -1- m4_pattern_allow([^ECHO_N$])
+m4trace:configure.in:3: -1- m4_pattern_allow([^ECHO_T$])
+m4trace:configure.in:3: -1- m4_pattern_allow([^LIBS$])
+m4trace:configure.in:3: -1- m4_pattern_allow([^build_alias$])
+m4trace:configure.in:3: -1- m4_pattern_allow([^host_alias$])
+m4trace:configure.in:3: -1- m4_pattern_allow([^target_alias$])
+m4trace:configure.in:4: -1- AM_INIT_AUTOMAKE([gvpndialer], [1.1])
m4trace:configure.in:4: -1- m4_pattern_allow([^AM_[A-Z]+FLAGS$])
-m4trace:configure.in:4: -1- AM_AUTOMAKE_VERSION([1.9.2])
-m4trace:configure.in:4: -1- AC_PROG_INSTALL
-m4trace:configure.in:4: -1- AC_SUBST([INSTALL_PROGRAM])
-m4trace:configure.in:4: -1- AC_SUBST([INSTALL_SCRIPT])
-m4trace:configure.in:4: -1- AC_SUBST([INSTALL_DATA])
-m4trace:configure.in:4: -1- AC_SUBST([CYGPATH_W])
-m4trace:configure.in:4: -1- AC_SUBST([PACKAGE], [gvpndialer])
-m4trace:configure.in:4: -1- AC_SUBST([VERSION], [1.0])
-m4trace:configure.in:4: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE])
-m4trace:configure.in:4: -1- AH_OUTPUT([PACKAGE], [/* Name of package */
-#undef PACKAGE])
-m4trace:configure.in:4: -1- AC_DEFINE_TRACE_LITERAL([VERSION])
-m4trace:configure.in:4: -1- AH_OUTPUT([VERSION], [/* Version number of package */
-#undef VERSION])
-m4trace:configure.in:4: -1- AC_SUBST([ACLOCAL])
-m4trace:configure.in:4: -1- AC_SUBST([AUTOCONF])
-m4trace:configure.in:4: -1- AC_SUBST([AUTOMAKE])
-m4trace:configure.in:4: -1- AC_SUBST([AUTOHEADER])
-m4trace:configure.in:4: -1- AC_SUBST([MAKEINFO])
-m4trace:configure.in:4: -1- AC_SUBST([install_sh])
-m4trace:configure.in:4: -1- AC_SUBST([STRIP])
-m4trace:configure.in:4: -1- AC_SUBST([ac_ct_STRIP])
-m4trace:configure.in:4: -1- AC_SUBST([INSTALL_STRIP_PROGRAM])
-m4trace:configure.in:4: -1- AC_SUBST([mkdir_p])
-m4trace:configure.in:4: -1- AC_PROG_AWK
-m4trace:configure.in:4: -1- AC_SUBST([AWK])
-m4trace:configure.in:4: -1- AC_PROG_MAKE_SET
-m4trace:configure.in:4: -1- AC_SUBST([SET_MAKE])
-m4trace:configure.in:4: -1- AC_SUBST([am__leading_dot])
-m4trace:configure.in:4: -1- AC_SUBST([AMTAR])
-m4trace:configure.in:4: -1- AC_SUBST([am__tar])
-m4trace:configure.in:4: -1- AC_SUBST([am__untar])
+m4trace:configure.in:4: -1- AM_SET_CURRENT_AUTOMAKE_VERSION
+m4trace:configure.in:4: -1- AM_AUTOMAKE_VERSION([1.9.6])
+m4trace:configure.in:4: -1- m4_pattern_allow([^INSTALL_PROGRAM$])
+m4trace:configure.in:4: -1- m4_pattern_allow([^INSTALL_SCRIPT$])
+m4trace:configure.in:4: -1- m4_pattern_allow([^INSTALL_DATA$])
+m4trace:configure.in:4: -1- m4_pattern_allow([^CYGPATH_W$])
+m4trace:configure.in:4: -1- m4_pattern_allow([^PACKAGE$])
+m4trace:configure.in:4: -1- m4_pattern_allow([^VERSION$])
+m4trace:configure.in:4: -1- _AM_IF_OPTION([no-define], [], [AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
+ AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])
+m4trace:configure.in:4: -2- _AM_MANGLE_OPTION([no-define])
+m4trace:configure.in:4: -1- m4_pattern_allow([^PACKAGE$])
+m4trace:configure.in:4: -1- m4_pattern_allow([^VERSION$])
+m4trace:configure.in:4: -1- AM_SANITY_CHECK
+m4trace:configure.in:4: -1- AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}])
+m4trace:configure.in:4: -1- AM_MISSING_HAS_RUN
+m4trace:configure.in:4: -1- AM_AUX_DIR_EXPAND
+m4trace:configure.in:4: -1- m4_pattern_allow([^ACLOCAL$])
+m4trace:configure.in:4: -1- AM_MISSING_PROG([AUTOCONF], [autoconf])
+m4trace:configure.in:4: -1- m4_pattern_allow([^AUTOCONF$])
+m4trace:configure.in:4: -1- AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}])
+m4trace:configure.in:4: -1- m4_pattern_allow([^AUTOMAKE$])
+m4trace:configure.in:4: -1- AM_MISSING_PROG([AUTOHEADER], [autoheader])
+m4trace:configure.in:4: -1- m4_pattern_allow([^AUTOHEADER$])
+m4trace:configure.in:4: -1- AM_MISSING_PROG([MAKEINFO], [makeinfo])
+m4trace:configure.in:4: -1- m4_pattern_allow([^MAKEINFO$])
+m4trace:configure.in:4: -1- AM_PROG_INSTALL_SH
+m4trace:configure.in:4: -1- m4_pattern_allow([^install_sh$])
+m4trace:configure.in:4: -1- AM_PROG_INSTALL_STRIP
+m4trace:configure.in:4: -1- m4_pattern_allow([^STRIP$])
+m4trace:configure.in:4: -1- m4_pattern_allow([^INSTALL_STRIP_PROGRAM$])
+m4trace:configure.in:4: -1- AM_PROG_MKDIR_P
+m4trace:configure.in:4: -1- m4_pattern_allow([^mkdir_p$])
+m4trace:configure.in:4: -1- m4_pattern_allow([^AWK$])
+m4trace:configure.in:4: -1- m4_pattern_allow([^SET_MAKE$])
+m4trace:configure.in:4: -1- AM_SET_LEADING_DOT
+m4trace:configure.in:4: -1- m4_pattern_allow([^am__leading_dot$])
+m4trace:configure.in:4: -1- _AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
+ [_AM_PROG_TAR([v7])])])
+m4trace:configure.in:4: -2- _AM_MANGLE_OPTION([tar-ustar])
+m4trace:configure.in:4: -1- _AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], [_AM_PROG_TAR([v7])])
+m4trace:configure.in:4: -2- _AM_MANGLE_OPTION([tar-pax])
+m4trace:configure.in:4: -1- _AM_PROG_TAR([v7])
+m4trace:configure.in:4: -1- AM_MISSING_PROG([AMTAR], [tar])
+m4trace:configure.in:4: -1- m4_pattern_allow([^AMTAR$])
+m4trace:configure.in:4: -1- m4_pattern_allow([^am__tar$])
+m4trace:configure.in:4: -1- m4_pattern_allow([^am__untar$])
+m4trace:configure.in:4: -1- _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
+AC_PROVIDE_IFELSE([AC_PROG_CXX],
+ [_AM_DEPENDENCIES(CXX)],
+ [define([AC_PROG_CXX],
+ defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
+])
+m4trace:configure.in:4: -2- _AM_MANGLE_OPTION([no-dependencies])
m4trace:configure.in:5: -1- AM_MAINTAINER_MODE
m4trace:configure.in:5: -1- AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes])
-m4trace:configure.in:5: -1- AC_SUBST([MAINTAINER_MODE_TRUE])
-m4trace:configure.in:5: -1- AC_SUBST([MAINTAINER_MODE_FALSE])
-m4trace:configure.in:5: -1- AC_SUBST([MAINT])
+m4trace:configure.in:5: -1- m4_pattern_allow([^MAINTAINER_MODE_TRUE$])
+m4trace:configure.in:5: -1- m4_pattern_allow([^MAINTAINER_MODE_FALSE$])
+m4trace:configure.in:5: -1- m4_pattern_allow([^MAINT$])
+m4trace:configure.in:6: -1- AM_CONFIG_HEADER([config.h])
m4trace:configure.in:6: -1- _m4_warn([obsolete], [The macro `AM_CONFIG_HEADER' is obsolete.
-You should run autoupdate.], [aclocal.m4:912: AM_CONFIG_HEADER is expanded from...
+You should run autoupdate.], [/usr/share/aclocal-1.9/header.m4:12: AM_CONFIG_HEADER is expanded from...
configure.in:6: the top level])
-m4trace:configure.in:6: -1- AC_CONFIG_HEADERS([config.h])
-m4trace:configure.in:8: -1- AC_PROG_CC
-m4trace:configure.in:8: -1- AC_SUBST([CC])
-m4trace:configure.in:8: -1- AC_SUBST([CFLAGS])
-m4trace:configure.in:8: -1- AC_SUBST([LDFLAGS])
-m4trace:configure.in:8: -1- AC_SUBST([CPPFLAGS])
-m4trace:configure.in:8: -1- AC_SUBST([CC])
-m4trace:configure.in:8: -1- AC_SUBST([ac_ct_CC])
-m4trace:configure.in:8: -1- AC_SUBST([CC])
-m4trace:configure.in:8: -1- AC_SUBST([ac_ct_CC])
-m4trace:configure.in:8: -1- AC_SUBST([CC])
-m4trace:configure.in:8: -1- AC_SUBST([CC])
-m4trace:configure.in:8: -1- AC_SUBST([ac_ct_CC])
-m4trace:configure.in:8: -1- AC_SUBST([EXEEXT], [$ac_cv_exeext])
-m4trace:configure.in:8: -1- AC_SUBST([OBJEXT], [$ac_cv_objext])
-m4trace:configure.in:8: -1- AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])
-m4trace:configure.in:8: -1- AC_SUBST([am__include])
-m4trace:configure.in:8: -1- AC_SUBST([am__quote])
+m4trace:configure.in:8: -1- m4_pattern_allow([^CC$])
+m4trace:configure.in:8: -1- m4_pattern_allow([^CFLAGS$])
+m4trace:configure.in:8: -1- m4_pattern_allow([^LDFLAGS$])
+m4trace:configure.in:8: -1- m4_pattern_allow([^LIBS$])
+m4trace:configure.in:8: -1- m4_pattern_allow([^CPPFLAGS$])
+m4trace:configure.in:8: -1- m4_pattern_allow([^CC$])
+m4trace:configure.in:8: -1- m4_pattern_allow([^CC$])
+m4trace:configure.in:8: -1- m4_pattern_allow([^CC$])
+m4trace:configure.in:8: -1- m4_pattern_allow([^CC$])
+m4trace:configure.in:8: -1- m4_pattern_allow([^ac_ct_CC$])
+m4trace:configure.in:8: -1- m4_pattern_allow([^EXEEXT$])
+m4trace:configure.in:8: -1- m4_pattern_allow([^OBJEXT$])
+m4trace:configure.in:8: -1- _AM_DEPENDENCIES([CC])
+m4trace:configure.in:8: -1- AM_SET_DEPDIR
+m4trace:configure.in:8: -1- m4_pattern_allow([^DEPDIR$])
+m4trace:configure.in:8: -1- AM_OUTPUT_DEPENDENCY_COMMANDS
+m4trace:configure.in:8: -1- AM_MAKE_INCLUDE
+m4trace:configure.in:8: -1- m4_pattern_allow([^am__include$])
+m4trace:configure.in:8: -1- m4_pattern_allow([^am__quote$])
+m4trace:configure.in:8: -1- AM_DEP_TRACK
m4trace:configure.in:8: -1- AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
-m4trace:configure.in:8: -1- AC_SUBST([AMDEP_TRUE])
-m4trace:configure.in:8: -1- AC_SUBST([AMDEP_FALSE])
-m4trace:configure.in:8: -1- AC_SUBST([AMDEPBACKSLASH])
-m4trace:configure.in:8: -1- AC_SUBST([CCDEPMODE], [depmode=$am_cv_CC_dependencies_compiler_type])
+m4trace:configure.in:8: -1- m4_pattern_allow([^AMDEP_TRUE$])
+m4trace:configure.in:8: -1- m4_pattern_allow([^AMDEP_FALSE$])
+m4trace:configure.in:8: -1- m4_pattern_allow([^AMDEPBACKSLASH$])
+m4trace:configure.in:8: -1- m4_pattern_allow([^CCDEPMODE$])
m4trace:configure.in:8: -1- AM_CONDITIONAL([am__fastdepCC], [
test "x$enable_dependency_tracking" != xno \
&& test "$am_cv_CC_dependencies_compiler_type" = gcc3])
-m4trace:configure.in:8: -1- AC_SUBST([am__fastdepCC_TRUE])
-m4trace:configure.in:8: -1- AC_SUBST([am__fastdepCC_FALSE])
-m4trace:configure.in:9: -1- AC_PROG_CC
-m4trace:configure.in:9: -1- AC_SUBST([CC])
-m4trace:configure.in:9: -1- AC_SUBST([CFLAGS])
-m4trace:configure.in:9: -1- AC_SUBST([LDFLAGS])
-m4trace:configure.in:9: -1- AC_SUBST([CPPFLAGS])
-m4trace:configure.in:9: -1- AC_SUBST([CC])
-m4trace:configure.in:9: -1- AC_SUBST([ac_ct_CC])
-m4trace:configure.in:9: -1- AC_SUBST([CC])
-m4trace:configure.in:9: -1- AC_SUBST([ac_ct_CC])
-m4trace:configure.in:9: -1- AC_SUBST([CC])
-m4trace:configure.in:9: -1- AC_SUBST([CC])
-m4trace:configure.in:9: -1- AC_SUBST([ac_ct_CC])
-m4trace:configure.in:9: -1- AC_SUBST([CCDEPMODE], [depmode=$am_cv_CC_dependencies_compiler_type])
+m4trace:configure.in:8: -1- m4_pattern_allow([^am__fastdepCC_TRUE$])
+m4trace:configure.in:8: -1- m4_pattern_allow([^am__fastdepCC_FALSE$])
+m4trace:configure.in:9: -1- m4_pattern_allow([^CC$])
+m4trace:configure.in:9: -1- m4_pattern_allow([^CFLAGS$])
+m4trace:configure.in:9: -1- m4_pattern_allow([^LDFLAGS$])
+m4trace:configure.in:9: -1- m4_pattern_allow([^LIBS$])
+m4trace:configure.in:9: -1- m4_pattern_allow([^CPPFLAGS$])
+m4trace:configure.in:9: -1- m4_pattern_allow([^CC$])
+m4trace:configure.in:9: -1- m4_pattern_allow([^CC$])
+m4trace:configure.in:9: -1- m4_pattern_allow([^CC$])
+m4trace:configure.in:9: -1- m4_pattern_allow([^CC$])
+m4trace:configure.in:9: -1- m4_pattern_allow([^ac_ct_CC$])
+m4trace:configure.in:9: -1- _AM_DEPENDENCIES([CC])
+m4trace:configure.in:9: -1- m4_pattern_allow([^CCDEPMODE$])
m4trace:configure.in:9: -1- AM_CONDITIONAL([am__fastdepCC], [
test "x$enable_dependency_tracking" != xno \
&& test "$am_cv_CC_dependencies_compiler_type" = gcc3])
-m4trace:configure.in:9: -1- AC_SUBST([am__fastdepCC_TRUE])
-m4trace:configure.in:9: -1- AC_SUBST([am__fastdepCC_FALSE])
+m4trace:configure.in:9: -1- m4_pattern_allow([^am__fastdepCC_TRUE$])
+m4trace:configure.in:9: -1- m4_pattern_allow([^am__fastdepCC_FALSE$])
+m4trace:configure.in:10: -1- AM_PROG_CC_STDC
m4trace:configure.in:10: -1- _m4_warn([obsolete], [The macro `AM_PROG_CC_STDC' is obsolete.
-You should run autoupdate.], [aclocal.m4:597: AM_PROG_CC_STDC is expanded from...
+You should run autoupdate.], [/usr/share/aclocal-1.9/ccstdc.m4:17: AM_PROG_CC_STDC is expanded from...
configure.in:10: the top level])
-m4trace:configure.in:10: -1- AC_PROG_CC
-m4trace:configure.in:10: -1- AC_SUBST([CC])
-m4trace:configure.in:10: -1- AC_SUBST([CFLAGS])
-m4trace:configure.in:10: -1- AC_SUBST([LDFLAGS])
-m4trace:configure.in:10: -1- AC_SUBST([CPPFLAGS])
-m4trace:configure.in:10: -1- AC_SUBST([CC])
-m4trace:configure.in:10: -1- AC_SUBST([ac_ct_CC])
-m4trace:configure.in:10: -1- AC_SUBST([CC])
-m4trace:configure.in:10: -1- AC_SUBST([ac_ct_CC])
-m4trace:configure.in:10: -1- AC_SUBST([CC])
-m4trace:configure.in:10: -1- AC_SUBST([CC])
-m4trace:configure.in:10: -1- AC_SUBST([ac_ct_CC])
-m4trace:configure.in:10: -1- AC_SUBST([CCDEPMODE], [depmode=$am_cv_CC_dependencies_compiler_type])
+m4trace:configure.in:10: -1- m4_pattern_allow([^CC$])
+m4trace:configure.in:10: -1- m4_pattern_allow([^CFLAGS$])
+m4trace:configure.in:10: -1- m4_pattern_allow([^LDFLAGS$])
+m4trace:configure.in:10: -1- m4_pattern_allow([^LIBS$])
+m4trace:configure.in:10: -1- m4_pattern_allow([^CPPFLAGS$])
+m4trace:configure.in:10: -1- m4_pattern_allow([^CC$])
+m4trace:configure.in:10: -1- m4_pattern_allow([^CC$])
+m4trace:configure.in:10: -1- m4_pattern_allow([^CC$])
+m4trace:configure.in:10: -1- m4_pattern_allow([^CC$])
+m4trace:configure.in:10: -1- m4_pattern_allow([^ac_ct_CC$])
+m4trace:configure.in:10: -1- _AM_DEPENDENCIES([CC])
+m4trace:configure.in:10: -1- m4_pattern_allow([^CCDEPMODE$])
m4trace:configure.in:10: -1- AM_CONDITIONAL([am__fastdepCC], [
test "x$enable_dependency_tracking" != xno \
&& test "$am_cv_CC_dependencies_compiler_type" = gcc3])
-m4trace:configure.in:10: -1- AC_SUBST([am__fastdepCC_TRUE])
-m4trace:configure.in:10: -1- AC_SUBST([am__fastdepCC_FALSE])
+m4trace:configure.in:10: -1- m4_pattern_allow([^am__fastdepCC_TRUE$])
+m4trace:configure.in:10: -1- m4_pattern_allow([^am__fastdepCC_FALSE$])
m4trace:configure.in:10: -1- _m4_warn([obsolete], [AM_PROG_CC_STDC:
your code should no longer depend upon `am_cv_prog_cc_stdc', but upon
`ac_cv_prog_cc_stdc'. Remove this warning and the assignment when
you adjust the code. You can also remove the above call to
- AC_PROG_CC if you already called it elsewhere.], [aclocal.m4:597: AM_PROG_CC_STDC is expanded from...
+ AC_PROG_CC if you already called it elsewhere.], [/usr/share/aclocal-1.9/ccstdc.m4:17: AM_PROG_CC_STDC is expanded from...
configure.in:10: the top level])
-m4trace:configure.in:11: -1- AC_HEADER_STDC
-m4trace:configure.in:11: -1- AC_PROG_CPP
-m4trace:configure.in:11: -1- AC_SUBST([CPP])
-m4trace:configure.in:11: -1- AC_SUBST([CPPFLAGS])
-m4trace:configure.in:11: -1- AC_SUBST([CPP])
-m4trace:configure.in:11: -1- AC_SUBST([EGREP])
-m4trace:configure.in:11: -1- AC_DEFINE_TRACE_LITERAL([STDC_HEADERS])
-m4trace:configure.in:11: -1- AH_OUTPUT([STDC_HEADERS], [/* Define to 1 if you have the ANSI C header files. */
-#undef STDC_HEADERS])
+m4trace:configure.in:11: -1- m4_pattern_allow([^CPP$])
+m4trace:configure.in:11: -1- m4_pattern_allow([^CPPFLAGS$])
+m4trace:configure.in:11: -1- m4_pattern_allow([^CPP$])
+m4trace:configure.in:11: -1- m4_pattern_allow([^GREP$])
+m4trace:configure.in:11: -1- m4_pattern_allow([^GREP$])
+m4trace:configure.in:11: -1- m4_pattern_allow([^EGREP$])
+m4trace:configure.in:11: -1- m4_pattern_allow([^EGREP$])
+m4trace:configure.in:11: -1- m4_pattern_allow([^STDC_HEADERS$])
m4trace:configure.in:13: -1- _m4_warn([obsolete], [The macro `AC_HAVE_HEADERS' is obsolete.
-You should run autoupdate.], [autoconf/oldnames.m4:56: AC_HAVE_HEADERS is expanded from...
+You should run autoupdate.], [../../lib/autoconf/oldnames.m4:56: AC_HAVE_HEADERS is expanded from...
configure.in:13: the top level])
-m4trace:configure.in:13: -1- AC_CHECK_HEADERS([pcre/pcre.h], [], [{ { echo "$as_me:$LINENO: error: Cannot find pcre.h. Please install libpcre" >&5
-echo "$as_me: error: Cannot find pcre.h. Please install libpcre" >&2;}
- { (exit 1); exit 1; }; }])
-m4trace:configure.in:13: -1- AH_OUTPUT([HAVE_PCRE_PCRE_H], [/* Define to 1 if you have the <pcre/pcre.h> header file. */
-#undef HAVE_PCRE_PCRE_H])
-m4trace:configure.in:13: -1- AC_CHECK_HEADERS([sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
- inttypes.h stdint.h unistd.h], [], [], [$ac_includes_default])
-m4trace:configure.in:13: -1- AH_OUTPUT([HAVE_SYS_TYPES_H], [/* Define to 1 if you have the <sys/types.h> header file. */
-#undef HAVE_SYS_TYPES_H])
-m4trace:configure.in:13: -1- AH_OUTPUT([HAVE_SYS_STAT_H], [/* Define to 1 if you have the <sys/stat.h> header file. */
-#undef HAVE_SYS_STAT_H])
-m4trace:configure.in:13: -1- AH_OUTPUT([HAVE_STDLIB_H], [/* Define to 1 if you have the <stdlib.h> header file. */
-#undef HAVE_STDLIB_H])
-m4trace:configure.in:13: -1- AH_OUTPUT([HAVE_STRING_H], [/* Define to 1 if you have the <string.h> header file. */
-#undef HAVE_STRING_H])
-m4trace:configure.in:13: -1- AH_OUTPUT([HAVE_MEMORY_H], [/* Define to 1 if you have the <memory.h> header file. */
-#undef HAVE_MEMORY_H])
-m4trace:configure.in:13: -1- AH_OUTPUT([HAVE_STRINGS_H], [/* Define to 1 if you have the <strings.h> header file. */
-#undef HAVE_STRINGS_H])
-m4trace:configure.in:13: -1- AH_OUTPUT([HAVE_INTTYPES_H], [/* Define to 1 if you have the <inttypes.h> header file. */
-#undef HAVE_INTTYPES_H])
-m4trace:configure.in:13: -1- AH_OUTPUT([HAVE_STDINT_H], [/* Define to 1 if you have the <stdint.h> header file. */
-#undef HAVE_STDINT_H])
-m4trace:configure.in:13: -1- AH_OUTPUT([HAVE_UNISTD_H], [/* Define to 1 if you have the <unistd.h> header file. */
-#undef HAVE_UNISTD_H])
m4trace:configure.in:14: -1- _m4_warn([obsolete], [The macro `AC_HAVE_HEADERS' is obsolete.
-You should run autoupdate.], [autoconf/oldnames.m4:56: AC_HAVE_HEADERS is expanded from...
+You should run autoupdate.], [../../lib/autoconf/oldnames.m4:56: AC_HAVE_HEADERS is expanded from...
configure.in:14: the top level])
-m4trace:configure.in:14: -1- AC_CHECK_HEADERS([pty.h], [], [{ { echo "$as_me:$LINENO: error: Cannot find pty.h" >&5
-echo "$as_me: error: Cannot find pty.h" >&2;}
- { (exit 1); exit 1; }; }])
-m4trace:configure.in:14: -1- AH_OUTPUT([HAVE_PTY_H], [/* Define to 1 if you have the <pty.h> header file. */
-#undef HAVE_PTY_H])
-m4trace:configure.in:15: -1- _m4_warn([cross], [cannot check for file existence when cross compiling], [autoconf/general.m4:2315: AC_CHECK_FILE is expanded from...
+m4trace:configure.in:15: -1- _m4_warn([cross], [cannot check for file existence when cross compiling], [../../lib/autoconf/general.m4:2505: AC_CHECK_FILE is expanded from...
configure.in:15: the top level])
-m4trace:configure.in:18: -1- AC_SUBST([PKG_CONFIG], [$ac_cv_path_PKG_CONFIG])
-m4trace:configure.in:18: -1- AC_SUBST([PACKAGE_CFLAGS])
-m4trace:configure.in:18: -1- AC_SUBST([PACKAGE_LIBS])
-m4trace:configure.in:20: -1- AC_SUBST([PACKAGE_CFLAGS])
-m4trace:configure.in:21: -1- AC_SUBST([PACKAGE_LIBS])
-m4trace:configure.in:24: -1- AC_SUBST([GETTEXT_PACKAGE])
-m4trace:configure.in:25: -1- AC_DEFINE_TRACE_LITERAL([GETTEXT_PACKAGE])
-m4trace:configure.in:29: -1- AC_CHECK_HEADERS([locale.h])
-m4trace:configure.in:29: -1- AH_OUTPUT([HAVE_LOCALE_H], [/* Define to 1 if you have the <locale.h> header file. */
-#undef HAVE_LOCALE_H])
+m4trace:configure.in:18: -1- PKG_CHECK_MODULES([PACKAGE], [$pkg_modules])
+m4trace:configure.in:18: -1- PKG_PROG_PKG_CONFIG
+m4trace:configure.in:18: -1- m4_pattern_forbid([^_?PKG_[A-Z_]+$])
+m4trace:configure.in:18: -1- m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
+m4trace:configure.in:18: -1- m4_pattern_allow([^PKG_CONFIG$])
+m4trace:configure.in:18: -1- m4_pattern_allow([^PKG_CONFIG$])
+m4trace:configure.in:18: -1- m4_pattern_allow([^PACKAGE_CFLAGS$])
+m4trace:configure.in:18: -1- m4_pattern_allow([^PACKAGE_LIBS$])
+m4trace:configure.in:18: -1- PKG_CHECK_EXISTS([$pkg_modules], [pkg_cv_[]PACKAGE_CFLAGS=`$PKG_CONFIG --[]cflags "$pkg_modules" 2>/dev/null`], [pkg_failed=yes])
+m4trace:configure.in:18: -1- PKG_CHECK_EXISTS([$pkg_modules], [pkg_cv_[]PACKAGE_LIBS=`$PKG_CONFIG --[]libs "$pkg_modules" 2>/dev/null`], [pkg_failed=yes])
+m4trace:configure.in:18: -1- _PKG_SHORT_ERRORS_SUPPORTED
+m4trace:configure.in:20: -1- m4_pattern_allow([^PACKAGE_CFLAGS$])
+m4trace:configure.in:21: -1- m4_pattern_allow([^PACKAGE_LIBS$])
+m4trace:configure.in:24: -1- m4_pattern_allow([^GETTEXT_PACKAGE$])
+m4trace:configure.in:25: -1- m4_pattern_allow([^GETTEXT_PACKAGE$])
+m4trace:configure.in:29: -1- AM_GLIB_GNU_GETTEXT
m4trace:configure.in:29: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
-You should run autoupdate.], [autoconf/general.m4:2223: AC_TRY_LINK is expanded from...
-autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
-autoconf/general.m4:1808: AC_CACHE_CHECK is expanded from...
-aclocal.m4:71: GLIB_LC_MESSAGES is expanded from...
-aclocal.m4:382: GLIB_GNU_GETTEXT is expanded from...
-aclocal.m4:411: AM_GLIB_GNU_GETTEXT is expanded from...
+You should run autoupdate.], [../../lib/autoconf/general.m4:2415: AC_TRY_LINK is expanded from...
+../../lib/m4sugar/m4sh.m4:523: AS_IF is expanded from...
+../../lib/autoconf/general.m4:1905: AC_CACHE_VAL is expanded from...
+../../lib/autoconf/general.m4:1918: AC_CACHE_CHECK is expanded from...
+/usr/share/aclocal/glib-gettext.m4:48: GLIB_LC_MESSAGES is expanded from...
+/usr/share/aclocal/glib-gettext.m4:299: GLIB_GNU_GETTEXT is expanded from...
+/usr/share/aclocal/glib-gettext.m4:399: AM_GLIB_GNU_GETTEXT is expanded from...
configure.in:29: the top level])
-m4trace:configure.in:29: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LC_MESSAGES])
-m4trace:configure.in:29: -1- AH_OUTPUT([HAVE_LC_MESSAGES], [/* Define if your <locale.h> file defines LC_MESSAGES. */
-#undef HAVE_LC_MESSAGES])
-m4trace:configure.in:29: -1- AC_SUBST([USE_NLS])
+m4trace:configure.in:29: -1- m4_pattern_allow([^HAVE_LC_MESSAGES$])
+m4trace:configure.in:29: -1- m4_pattern_allow([^build$])
+m4trace:configure.in:29: -1- m4_pattern_allow([^build_cpu$])
+m4trace:configure.in:29: -1- m4_pattern_allow([^build_vendor$])
+m4trace:configure.in:29: -1- m4_pattern_allow([^build_os$])
+m4trace:configure.in:29: -1- m4_pattern_allow([^host$])
+m4trace:configure.in:29: -1- m4_pattern_allow([^host_cpu$])
+m4trace:configure.in:29: -1- m4_pattern_allow([^host_vendor$])
+m4trace:configure.in:29: -1- m4_pattern_allow([^host_os$])
+m4trace:configure.in:29: -1- m4_pattern_allow([^USE_NLS$])
m4trace:configure.in:29: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
-You should run autoupdate.], [autoconf/general.m4:2223: AC_TRY_LINK is expanded from...
-autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
-autoconf/general.m4:1808: AC_CACHE_CHECK is expanded from...
-autoconf/headers.m4:91: AC_CHECK_HEADER is expanded from...
-aclocal.m4:299: GLIB_WITH_NLS is expanded from...
-aclocal.m4:382: GLIB_GNU_GETTEXT is expanded from...
-aclocal.m4:411: AM_GLIB_GNU_GETTEXT is expanded from...
+You should run autoupdate.], [../../lib/autoconf/general.m4:2415: AC_TRY_LINK is expanded from...
+../../lib/m4sugar/m4sh.m4:523: AS_IF is expanded from...
+../../lib/autoconf/general.m4:1905: AC_CACHE_VAL is expanded from...
+../../lib/autoconf/general.m4:1918: AC_CACHE_CHECK is expanded from...
+../../lib/m4sugar/m4sh.m4:523: AS_IF is expanded from...
+../../lib/autoconf/headers.m4:92: AC_CHECK_HEADER is expanded from...
+/usr/share/aclocal/glib-gettext.m4:102: GLIB_WITH_NLS is expanded from...
+/usr/share/aclocal/glib-gettext.m4:299: GLIB_GNU_GETTEXT is expanded from...
+/usr/share/aclocal/glib-gettext.m4:399: AM_GLIB_GNU_GETTEXT is expanded from...
configure.in:29: the top level])
m4trace:configure.in:29: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
-You should run autoupdate.], [autoconf/general.m4:2223: AC_TRY_LINK is expanded from...
-autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
-autoconf/general.m4:1808: AC_CACHE_CHECK is expanded from...
-autoconf/headers.m4:91: AC_CHECK_HEADER is expanded from...
-aclocal.m4:299: GLIB_WITH_NLS is expanded from...
-aclocal.m4:382: GLIB_GNU_GETTEXT is expanded from...
-aclocal.m4:411: AM_GLIB_GNU_GETTEXT is expanded from...
+You should run autoupdate.], [../../lib/autoconf/general.m4:2415: AC_TRY_LINK is expanded from...
+../../lib/m4sugar/m4sh.m4:523: AS_IF is expanded from...
+../../lib/autoconf/general.m4:1905: AC_CACHE_VAL is expanded from...
+../../lib/autoconf/general.m4:1918: AC_CACHE_CHECK is expanded from...
+../../lib/m4sugar/m4sh.m4:523: AS_IF is expanded from...
+../../lib/autoconf/headers.m4:92: AC_CHECK_HEADER is expanded from...
+/usr/share/aclocal/glib-gettext.m4:102: GLIB_WITH_NLS is expanded from...
+/usr/share/aclocal/glib-gettext.m4:299: GLIB_GNU_GETTEXT is expanded from...
+/usr/share/aclocal/glib-gettext.m4:399: AM_GLIB_GNU_GETTEXT is expanded from...
configure.in:29: the top level])
-m4trace:configure.in:29: -1- AC_CHECK_FUNCS([bind_textdomain_codeset])
-m4trace:configure.in:29: -1- AH_OUTPUT([HAVE_BIND_TEXTDOMAIN_CODESET], [/* Define to 1 if you have the `bind_textdomain_codeset\' function. */
-#undef HAVE_BIND_TEXTDOMAIN_CODESET])
-m4trace:configure.in:29: -1- AC_CHECK_LIB([intl], [bindtextdomain], [AC_CHECK_LIB(intl, ngettext,
- [AC_CHECK_LIB(intl, dgettext,
- gt_cv_func_dgettext_libintl=yes)])])
-m4trace:configure.in:29: -1- AC_CHECK_LIB([intl], [ngettext], [AC_CHECK_LIB(intl, dgettext,
- gt_cv_func_dgettext_libintl=yes)])
-m4trace:configure.in:29: -1- AC_CHECK_LIB([intl], [dgettext], [gt_cv_func_dgettext_libintl=yes])
-m4trace:configure.in:29: -1- AC_CHECK_LIB([intl], [ngettext], [AC_CHECK_LIB(intl, dcgettext,
- [gt_cv_func_dgettext_libintl=yes
- libintl_extra_libs=-liconv],
- :,-liconv)], [:], [-liconv])
-m4trace:configure.in:29: -1- AC_CHECK_LIB([intl], [dcgettext], [gt_cv_func_dgettext_libintl=yes
- libintl_extra_libs=-liconv], [:], [-liconv])
-m4trace:configure.in:29: -1- AC_CHECK_FUNCS([bind_textdomain_codeset])
-m4trace:configure.in:29: -1- AH_OUTPUT([HAVE_BIND_TEXTDOMAIN_CODESET], [/* Define to 1 if you have the `bind_textdomain_codeset\' function. */
-#undef HAVE_BIND_TEXTDOMAIN_CODESET])
-m4trace:configure.in:29: -1- AC_DEFINE_TRACE_LITERAL([HAVE_GETTEXT])
-m4trace:configure.in:29: -1- AH_OUTPUT([HAVE_GETTEXT], [/* Define if the GNU gettext() function is already present or preinstalled. */
-#undef HAVE_GETTEXT])
-m4trace:configure.in:29: -1- AC_SUBST([MSGFMT])
-m4trace:configure.in:29: -1- AC_CHECK_FUNCS([dcgettext])
-m4trace:configure.in:29: -1- AH_OUTPUT([HAVE_DCGETTEXT], [/* Define to 1 if you have the `dcgettext\' function. */
-#undef HAVE_DCGETTEXT])
-m4trace:configure.in:29: -1- AC_SUBST([GMSGFMT], [$ac_cv_path_GMSGFMT])
-m4trace:configure.in:29: -1- AC_SUBST([XGETTEXT])
+m4trace:configure.in:29: -1- m4_pattern_allow([^HAVE_GETTEXT$])
+m4trace:configure.in:29: -1- m4_pattern_allow([^MSGFMT$])
+m4trace:configure.in:29: -1- m4_pattern_allow([^GMSGFMT$])
+m4trace:configure.in:29: -1- m4_pattern_allow([^XGETTEXT$])
m4trace:configure.in:29: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
-You should run autoupdate.], [autoconf/general.m4:2223: AC_TRY_LINK is expanded from...
-autoconf/headers.m4:91: AC_CHECK_HEADER is expanded from...
-aclocal.m4:299: GLIB_WITH_NLS is expanded from...
-aclocal.m4:382: GLIB_GNU_GETTEXT is expanded from...
-aclocal.m4:411: AM_GLIB_GNU_GETTEXT is expanded from...
+You should run autoupdate.], [../../lib/autoconf/general.m4:2415: AC_TRY_LINK is expanded from...
+../../lib/m4sugar/m4sh.m4:523: AS_IF is expanded from...
+../../lib/autoconf/headers.m4:92: AC_CHECK_HEADER is expanded from...
+/usr/share/aclocal/glib-gettext.m4:102: GLIB_WITH_NLS is expanded from...
+/usr/share/aclocal/glib-gettext.m4:299: GLIB_GNU_GETTEXT is expanded from...
+/usr/share/aclocal/glib-gettext.m4:399: AM_GLIB_GNU_GETTEXT is expanded from...
configure.in:29: the top level])
-m4trace:configure.in:29: -1- AC_DEFINE_TRACE_LITERAL([ENABLE_NLS])
-m4trace:configure.in:29: -1- AH_OUTPUT([ENABLE_NLS], [/* always defined to indicate that i18n is enabled */
-#undef ENABLE_NLS])
+m4trace:configure.in:29: -1- m4_pattern_allow([^ENABLE_NLS$])
m4trace:configure.in:29: -1- _m4_warn([obsolete], [The macro `AC_OUTPUT_COMMANDS' is obsolete.
-You should run autoupdate.], [autoconf/status.m4:318: AC_OUTPUT_COMMANDS is expanded from...
-aclocal.m4:299: GLIB_WITH_NLS is expanded from...
-aclocal.m4:382: GLIB_GNU_GETTEXT is expanded from...
-aclocal.m4:411: AM_GLIB_GNU_GETTEXT is expanded from...
-configure.in:29: the top level])
-m4trace:configure.in:29: -3- _m4_warn([obsolete], [The macro `_AC_OUTPUT_COMMANDS_CNT' is obsolete.
-You should run autoupdate.], [autoconf/status.m4:321: _AC_OUTPUT_COMMANDS_CNT is expanded from...
-autoconf/status.m4:318: AC_OUTPUT_COMMANDS is expanded from...
-aclocal.m4:299: GLIB_WITH_NLS is expanded from...
-aclocal.m4:382: GLIB_GNU_GETTEXT is expanded from...
-aclocal.m4:411: AM_GLIB_GNU_GETTEXT is expanded from...
+You should run autoupdate.], [../../lib/autoconf/status.m4:853: AC_OUTPUT_COMMANDS is expanded from...
+/usr/share/aclocal/glib-gettext.m4:102: GLIB_WITH_NLS is expanded from...
+/usr/share/aclocal/glib-gettext.m4:299: GLIB_GNU_GETTEXT is expanded from...
+/usr/share/aclocal/glib-gettext.m4:399: AM_GLIB_GNU_GETTEXT is expanded from...
configure.in:29: the top level])
-m4trace:configure.in:29: -1- AC_SUBST([CATALOGS])
-m4trace:configure.in:29: -1- AC_SUBST([CATOBJEXT])
-m4trace:configure.in:29: -1- AC_SUBST([DATADIRNAME])
-m4trace:configure.in:29: -1- AC_SUBST([GMOFILES])
-m4trace:configure.in:29: -1- AC_SUBST([INSTOBJEXT])
-m4trace:configure.in:29: -1- AC_SUBST([INTLLIBS])
-m4trace:configure.in:29: -1- AC_SUBST([PO_IN_DATADIR_TRUE])
-m4trace:configure.in:29: -1- AC_SUBST([PO_IN_DATADIR_FALSE])
-m4trace:configure.in:29: -1- AC_SUBST([POFILES])
-m4trace:configure.in:29: -1- AC_SUBST([POSUB])
-m4trace:configure.in:29: -1- AC_SUBST([MKINSTALLDIRS])
-m4trace:configure.in:35: -1- AC_CONFIG_FILES([
-Makefile
-src/Makefile
-po/Makefile.in
-])
-m4trace:configure.in:35: -1- _m4_warn([obsolete], [AC_OUTPUT should be used without arguments.
+m4trace:configure.in:29: -1- m4_pattern_allow([^CATALOGS$])
+m4trace:configure.in:29: -1- m4_pattern_allow([^CATOBJEXT$])
+m4trace:configure.in:29: -1- m4_pattern_allow([^DATADIRNAME$])
+m4trace:configure.in:29: -1- m4_pattern_allow([^GMOFILES$])
+m4trace:configure.in:29: -1- m4_pattern_allow([^INSTOBJEXT$])
+m4trace:configure.in:29: -1- m4_pattern_allow([^INTLLIBS$])
+m4trace:configure.in:29: -1- m4_pattern_allow([^PO_IN_DATADIR_TRUE$])
+m4trace:configure.in:29: -1- m4_pattern_allow([^PO_IN_DATADIR_FALSE$])
+m4trace:configure.in:29: -1- m4_pattern_allow([^POFILES$])
+m4trace:configure.in:29: -1- m4_pattern_allow([^POSUB$])
+m4trace:configure.in:29: -1- m4_pattern_allow([^MKINSTALLDIRS$])
+m4trace:configure.in:31: -1- _m4_warn([obsolete], [AC_OUTPUT should be used without arguments.
You should run autoupdate.], [])
-m4trace:configure.in:35: -1- AC_SUBST([LIB@&t@OBJS], [$ac_libobjs])
-m4trace:configure.in:35: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs])
+m4trace:configure.in:31: -1- m4_pattern_allow([^LIB@&t@OBJS$])
+m4trace:configure.in:31: -1- m4_pattern_allow([^LTLIBOBJS$])
+m4trace:configure.in:31: -1- _AC_AM_CONFIG_HEADER_HOOK([$ac_file])
+m4trace:configure.in:31: -1- _AM_OUTPUT_DEPENDENCY_COMMANDS
diff --git a/projects/gvpndialer/trunk/config.h b/projects/gvpndialer/trunk/config.h
index b24eb56..5714983 100644
--- a/projects/gvpndialer/trunk/config.h
+++ b/projects/gvpndialer/trunk/config.h
@@ -1,4 +1,4 @@
-/* config.h. Generated by configure. */
+/* config.h. Generated from config.h.in by configure. */
/* config.h.in. Generated from configure.in by autoheader. */
#define ENABLE_NLS 1
/* #undef HAVE_CATGETS */
@@ -32,8 +32,8 @@
/* Define to 1 if you have the <memory.h> header file. */
#define HAVE_MEMORY_H 1
-/* Define to 1 if you have the <pcre/pcre.h> header file. */
-#define HAVE_PCRE_PCRE_H 1
+/* Define to 1 if you have the <pcre.h> header file. */
+#define HAVE_PCRE_H 1
/* Define to 1 if you have the <pty.h> header file. */
#define HAVE_PTY_H 1
diff --git a/projects/gvpndialer/trunk/gvpn_dialer.glade b/projects/gvpndialer/trunk/gvpn_dialer.glade
index 677ce64..2e7c610 100644
--- a/projects/gvpndialer/trunk/gvpn_dialer.glade
+++ b/projects/gvpndialer/trunk/gvpn_dialer.glade
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
-<!-- Generated with glade3
+<!--Generated with glade3 3.0.2 on Sun Feb 4 22:09:53 2007 by jnichols@francisco-repilado
Version: 3.0.1
Date: Mon Oct 30 23:28:25 2006
User: jnichols
@@ -38,30 +38,18 @@
<property name="column_spacing">19</property>
<property name="row_spacing">8</property>
<child>
- <widget class="GtkLabel" id="label10">
+ <widget class="GtkLabel" id="label11">
<property name="visible">True</property>
- <property name="xalign">0.000000</property>
- <property name="label" translatable="yes">VPN Connection Profile</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Hostname</property>
<property name="justify">GTK_JUSTIFY_CENTER</property>
</widget>
<packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkEntry" id="hostname_entry">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="editable">False</property>
- <property name="max_length">30</property>
- </widget>
- <packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
+ <property name="x_padding">89</property>
</packing>
</child>
<child>
@@ -91,18 +79,30 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label11">
+ <widget class="GtkEntry" id="hostname_entry">
<property name="visible">True</property>
- <property name="xalign">0.000000</property>
- <property name="label" translatable="yes">Hostname</property>
- <property name="justify">GTK_JUSTIFY_CENTER</property>
+ <property name="can_focus">True</property>
+ <property name="editable">False</property>
+ <property name="max_length">30</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label10">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">VPN Connection Profile</property>
+ <property name="justify">GTK_JUSTIFY_CENTER</property>
+ </widget>
+ <packing>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
- <property name="x_padding">89</property>
</packing>
</child>
</widget>
@@ -215,6 +215,7 @@
<widget class="GtkImage" id="image3">
<property name="visible">True</property>
<property name="pixbuf">Status-Dock.png</property>
+ <property name="stock">gtk-missing-image</property>
</widget>
</child>
</widget>
@@ -300,20 +301,6 @@
<signal name="clicked" handler="on_status_button_clicked"/>
</widget>
</child>
- <child>
- <widget class="GtkSeparatorToolItem" id="separatortoolitem2">
- <property name="visible">True</property>
- </widget>
- </child>
- <child>
- <widget class="GtkToolButton" id="quit_button">
- <property name="visible">True</property>
- <property name="border_width">7</property>
- <property name="stock_id">gtk-quit</property>
- <property name="tooltip">Quit GVPN Dialer</property>
- <signal name="clicked" handler="on_quit_button_clicked"/>
- </widget>
- </child>
</widget>
</child>
</widget>
@@ -362,26 +349,18 @@
<property name="column_spacing">2</property>
<property name="row_spacing">15</property>
<child>
- <widget class="GtkLabel" id="label4">
- <property name="visible">True</property>
- <property name="xalign">0.000000</property>
- <property name="label" translatable="yes">Enter Username:</property>
- </widget>
- <packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label5">
+ <widget class="GtkEntry" id="enter_password">
<property name="visible">True</property>
- <property name="xalign">0.000000</property>
- <property name="label" translatable="yes">Enter Password:</property>
+ <property name="can_focus">True</property>
+ <property name="max_length">30</property>
+ <property name="visibility">False</property>
+ <signal name="activate" handler="on_enter_password_activate"/>
</widget>
<packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
@@ -399,18 +378,26 @@
</packing>
</child>
<child>
- <widget class="GtkEntry" id="enter_password">
+ <widget class="GtkLabel" id="label5">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="max_length">30</property>
- <property name="visibility">False</property>
- <signal name="activate" handler="on_enter_password_activate"/>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Enter Password:</property>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label4">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Enter Username:</property>
+ </widget>
+ <packing>
+ <property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
@@ -483,7 +470,7 @@
<property name="width_request">300</property>
<property name="height_request">48</property>
<property name="visible">True</property>
- <property name="label_xalign">0.000000</property>
+ <property name="label_xalign">0</property>
<child>
<widget class="GtkTable" id="table2">
<property name="visible">True</property>
@@ -493,38 +480,43 @@
<property name="column_spacing">5</property>
<property name="row_spacing">8</property>
<child>
- <widget class="GtkLabel" id="label8">
+ <widget class="GtkCheckButton" id="vpnclient_start_hidden_cb">
<property name="visible">True</property>
- <property name="xalign">0.000000</property>
- <property name="label" translatable="yes">Path to vpnclient:</property>
- <property name="justify">GTK_JUSTIFY_RIGHT</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">Start Hidden</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
</widget>
<packing>
+ <property name="right_attach">2</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkEntry" id="vpnclient_path_entry">
+ <widget class="GtkEntry" id="vpnclient_default_user_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label9">
+ <widget class="GtkLabel" id="label16">
<property name="visible">True</property>
- <property name="xalign">0.000000</property>
- <property name="label" translatable="yes">VPN Profile Path:</property>
- <property name="justify">GTK_JUSTIFY_RIGHT</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Default User:</property>
</widget>
<packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
@@ -543,43 +535,38 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label16">
+ <widget class="GtkLabel" id="label9">
<property name="visible">True</property>
- <property name="xalign">0.000000</property>
- <property name="label" translatable="yes">Default User:</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">VPN Profile Path:</property>
+ <property name="justify">GTK_JUSTIFY_RIGHT</property>
</widget>
<packing>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkEntry" id="vpnclient_default_user_entry">
+ <widget class="GtkEntry" id="vpnclient_path_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkCheckButton" id="vpnclient_start_hidden_cb">
+ <widget class="GtkLabel" id="label8">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">Start Hidden</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Path to vpnclient:</property>
+ <property name="justify">GTK_JUSTIFY_RIGHT</property>
</widget>
<packing>
- <property name="right_attach">2</property>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
@@ -682,7 +669,7 @@
<property name="width_request">172</property>
<property name="height_request">126</property>
<property name="visible">True</property>
- <property name="label_xalign">0.000000</property>
+ <property name="label_xalign">0</property>
<child>
<widget class="GtkTextView" id="trafficstats_text">
<property name="width_request">168</property>
@@ -716,7 +703,7 @@ Packets discarded: 1
<widget class="GtkFrame" id="frame5">
<property name="width_request">204</property>
<property name="visible">True</property>
- <property name="label_xalign">0.000000</property>
+ <property name="label_xalign">0</property>
<child>
<widget class="GtkTextView" id="tunnelstats_text">
<property name="width_request">200</property>
@@ -757,7 +744,7 @@ Local LAN Access is disabled
<property name="width_request">204</property>
<property name="height_request">105</property>
<property name="visible">True</property>
- <property name="label_xalign">0.000000</property>
+ <property name="label_xalign">0</property>
<child>
<widget class="GtkTextView" id="routestats_text">
<property name="width_request">200</property>
@@ -838,6 +825,7 @@ For the Cisco Linux
VPN Client</property>
<property name="authors">Stanley Kamithi, Raleigh, North Carolina
+
</property>
<property name="translator_credits" translatable="yes">translator_credits</property>
</widget>
@@ -862,17 +850,6 @@ VPN Client</property>
<property name="column_spacing">2</property>
<property name="row_spacing">15</property>
<child>
- <widget class="GtkLabel" id="label18">
- <property name="visible">True</property>
- <property name="xalign">0.000000</property>
- <property name="label" translatable="yes">Enter Group Password:</property>
- </widget>
- <packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
<widget class="GtkEntry" id="group_pw_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -886,6 +863,17 @@ VPN Client</property>
<property name="y_options"></property>
</packing>
</child>
+ <child>
+ <widget class="GtkLabel" id="label18">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Enter Group Password:</property>
+ </widget>
+ <packing>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
diff --git a/projects/gvpndialer/trunk/po/Makefile.in b/projects/gvpndialer/trunk/po/Makefile.in
index 16af6f6..119e999 100644
--- a/projects/gvpndialer/trunk/po/Makefile.in
+++ b/projects/gvpndialer/trunk/po/Makefile.in
@@ -25,7 +25,8 @@ top_srcdir = ..
prefix = /usr/local
exec_prefix = ${prefix}
-datadir = ${prefix}/share
+datarootdir = ${prefix}/share
+datadir = ${datarootdir}
libdir = ${exec_prefix}/lib
localedir = $(libdir)/locale
gnulocaledir = $(datadir)/locale
@@ -78,7 +79,7 @@ INSTOBJEXT = .mo
.po.gmo:
file=$(srcdir)/`echo $* | sed 's,.*/,,'`.gmo \
- && rm -f $$file && $(GMSGFMT) -o $$file $<
+ && rm -f $$file && $(GMSGFMT) -c -o $$file $<
.po.cat:
sed -f ../intl/po2msg.sed < $< > $*.msg \
@@ -93,6 +94,21 @@ all-no:
$(srcdir)/$(GETTEXT_PACKAGE).pot: $(POTFILES)
$(XGETTEXT) --default-domain=$(GETTEXT_PACKAGE) --directory=$(top_srcdir) \
--add-comments --keyword=_ --keyword=N_ \
+ --flag=g_strdup_printf:1:c-format \
+ --flag=g_string_printf:2:c-format \
+ --flag=g_string_append_printf:2:c-format \
+ --flag=g_error_new:3:c-format \
+ --flag=g_set_error:4:c-format \
+ --flag=g_markup_printf_escaped:1:c-format \
+ --flag=g_log:3:c-format \
+ --flag=g_print:1:c-format \
+ --flag=g_printerr:1:c-format \
+ --flag=g_printf:1:c-format \
+ --flag=g_fprintf:2:c-format \
+ --flag=g_sprintf:2:c-format \
+ --flag=g_snprintf:3:c-format \
+ --flag=g_scanner_error:2:c-format \
+ --flag=g_scanner_warn:2:c-format \
--files-from=$(srcdir)/POTFILES.in \
&& test ! -f $(GETTEXT_PACKAGE).po \
|| ( rm -f $(srcdir)/$(GETTEXT_PACKAGE).pot \
diff --git a/projects/gvpndialer/trunk/po/Makefile.in.in b/projects/gvpndialer/trunk/po/Makefile.in.in
index 092b4e0..d806e51 100644
--- a/projects/gvpndialer/trunk/po/Makefile.in.in
+++ b/projects/gvpndialer/trunk/po/Makefile.in.in
@@ -25,6 +25,7 @@ VPATH = @srcdir@
prefix = @prefix@
exec_prefix = @exec_prefix@
+datarootdir = @datarootdir@
datadir = @datadir@
libdir = @libdir@
localedir = $(libdir)/locale
@@ -78,7 +79,7 @@ INSTOBJEXT = @INSTOBJEXT@
.po.gmo:
file=$(srcdir)/`echo $* | sed 's,.*/,,'`.gmo \
- && rm -f $$file && $(GMSGFMT) -o $$file $<
+ && rm -f $$file && $(GMSGFMT) -c -o $$file $<
.po.cat:
sed -f ../intl/po2msg.sed < $< > $*.msg \
@@ -93,6 +94,21 @@ all-no:
$(srcdir)/$(GETTEXT_PACKAGE).pot: $(POTFILES)
$(XGETTEXT) --default-domain=$(GETTEXT_PACKAGE) --directory=$(top_srcdir) \
--add-comments --keyword=_ --keyword=N_ \
+ --flag=g_strdup_printf:1:c-format \
+ --flag=g_string_printf:2:c-format \
+ --flag=g_string_append_printf:2:c-format \
+ --flag=g_error_new:3:c-format \
+ --flag=g_set_error:4:c-format \
+ --flag=g_markup_printf_escaped:1:c-format \
+ --flag=g_log:3:c-format \
+ --flag=g_print:1:c-format \
+ --flag=g_printerr:1:c-format \
+ --flag=g_printf:1:c-format \
+ --flag=g_fprintf:2:c-format \
+ --flag=g_sprintf:2:c-format \
+ --flag=g_snprintf:3:c-format \
+ --flag=g_scanner_error:2:c-format \
+ --flag=g_scanner_warn:2:c-format \
--files-from=$(srcdir)/POTFILES.in \
&& test ! -f $(GETTEXT_PACKAGE).po \
|| ( rm -f $(srcdir)/$(GETTEXT_PACKAGE).pot \
diff --git a/projects/gvpndialer/trunk/src/.deps/callbacks.Po b/projects/gvpndialer/trunk/src/.deps/callbacks.Po
index dd97237..e719472 100644
--- a/projects/gvpndialer/trunk/src/.deps/callbacks.Po
+++ b/projects/gvpndialer/trunk/src/.deps/callbacks.Po
@@ -1,27 +1,33 @@
callbacks.o callbacks.o: callbacks.c ../config.h callbacks.h \
/usr/include/libgnomeui-2.0/gnome.h /usr/include/gtk-2.0/gtk/gtk.h \
- /usr/include/gtk-2.0/gdk/gdk.h /usr/include/gtk-2.0/gdk/gdkcolor.h \
- /usr/include/gtk-2.0/gdk/gdktypes.h /usr/include/glib-2.0/glib.h \
- /usr/include/glib-2.0/glib/galloca.h \
+ /usr/include/gtk-2.0/gdk/gdk.h /usr/include/gtk-2.0/gdk/gdkcairo.h \
+ /usr/include/gtk-2.0/gdk/gdkcolor.h /usr/include/cairo/cairo.h \
+ /usr/include/cairo/cairo-features.h /usr/include/gtk-2.0/gdk/gdktypes.h \
+ /usr/include/glib-2.0/glib.h /usr/include/glib-2.0/glib/galloca.h \
/usr/include/glib-2.0/glib/gtypes.h \
/usr/lib/glib-2.0/include/glibconfig.h \
/usr/include/glib-2.0/glib/gmacros.h \
- /usr/lib/gcc/i586-mandrake-linux-gnu/3.4.3/include/stddef.h \
- /usr/lib/gcc/i586-mandrake-linux-gnu/3.4.3/include/limits.h \
- /usr/lib/gcc/i586-mandrake-linux-gnu/3.4.3/include/syslimits.h \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.1.1/include/stddef.h \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.1.1/include/limits.h \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.1.1/include/syslimits.h \
/usr/include/limits.h /usr/include/features.h /usr/include/sys/cdefs.h \
- /usr/include/gnu/stubs.h /usr/include/bits/posix1_lim.h \
+ /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h \
+ /usr/include/gnu/stubs-32.h /usr/include/bits/posix1_lim.h \
/usr/include/bits/local_lim.h /usr/include/linux/limits.h \
/usr/include/bits/posix2_lim.h \
- /usr/lib/gcc/i586-mandrake-linux-gnu/3.4.3/include/float.h \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.1.1/include/float.h \
/usr/include/glib-2.0/glib/garray.h \
/usr/include/glib-2.0/glib/gasyncqueue.h \
/usr/include/glib-2.0/glib/gthread.h \
/usr/include/glib-2.0/glib/gerror.h /usr/include/glib-2.0/glib/gquark.h \
/usr/include/glib-2.0/glib/gatomic.h \
/usr/include/glib-2.0/glib/gbacktrace.h \
- /usr/include/glib-2.0/glib/gcache.h /usr/include/glib-2.0/glib/glist.h \
- /usr/include/glib-2.0/glib/gmem.h \
+ /usr/include/glib-2.0/glib/gbase64.h \
+ /usr/include/glib-2.0/glib/gbookmarkfile.h /usr/include/time.h \
+ /usr/include/bits/time.h /usr/include/bits/types.h \
+ /usr/include/bits/typesizes.h /usr/include/glib-2.0/glib/gcache.h \
+ /usr/include/glib-2.0/glib/glist.h /usr/include/glib-2.0/glib/gmem.h \
+ /usr/include/glib-2.0/glib/gslice.h \
/usr/include/glib-2.0/glib/gcompletion.h \
/usr/include/glib-2.0/glib/gconvert.h \
/usr/include/glib-2.0/glib/gdataset.h \
@@ -33,8 +39,9 @@ callbacks.o callbacks.o: callbacks.c ../config.h callbacks.h \
/usr/include/glib-2.0/glib/gstring.h \
/usr/include/glib-2.0/glib/gunicode.h \
/usr/include/glib-2.0/glib/gutils.h \
- /usr/lib/gcc/i586-mandrake-linux-gnu/3.4.3/include/stdarg.h \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.1.1/include/stdarg.h \
/usr/include/glib-2.0/glib/gkeyfile.h \
+ /usr/include/glib-2.0/glib/gmappedfile.h \
/usr/include/glib-2.0/glib/gmarkup.h \
/usr/include/glib-2.0/glib/gmessages.h \
/usr/include/glib-2.0/glib/gnode.h /usr/include/glib-2.0/glib/goption.h \
@@ -82,32 +89,31 @@ callbacks.o callbacks.o: callbacks.c ../config.h callbacks.h \
/usr/include/pango-1.0/pango/pango-tabs.h \
/usr/include/pango-1.0/pango/pango-renderer.h \
/usr/lib/gtk-2.0/include/gdkconfig.h \
- /usr/include/gtk-2.0/gdk/gdkcursor.h \
+ /usr/include/gtk-2.0/gdk/gdkpixbuf.h /usr/include/gtk-2.0/gdk/gdkrgb.h \
/usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf.h \
/usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-features.h \
/usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-core.h \
/usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-transform.h \
/usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-animation.h \
+ /usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-simple-anim.h \
/usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-io.h /usr/include/stdio.h \
- /usr/include/bits/types.h /usr/include/bits/wordsize.h \
- /usr/include/bits/typesizes.h /usr/include/libio.h \
- /usr/include/_G_config.h /usr/include/wchar.h /usr/include/bits/wchar.h \
- /usr/include/gconv.h /usr/include/bits/stdio_lim.h \
- /usr/include/bits/sys_errlist.h /usr/include/bits/stdio.h \
- /usr/include/glib-2.0/gmodule.h \
+ /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \
+ /usr/include/bits/wchar.h /usr/include/gconv.h \
+ /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \
+ /usr/include/bits/stdio.h /usr/include/glib-2.0/gmodule.h \
/usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-loader.h \
/usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-enum-types.h \
+ /usr/include/pango-1.0/pango/pangocairo.h \
+ /usr/include/gtk-2.0/gdk/gdkcursor.h \
/usr/include/gtk-2.0/gdk/gdkdisplay.h \
/usr/include/gtk-2.0/gdk/gdkevents.h /usr/include/gtk-2.0/gdk/gdkdnd.h \
/usr/include/gtk-2.0/gdk/gdkinput.h \
/usr/include/gtk-2.0/gdk/gdkdrawable.h /usr/include/gtk-2.0/gdk/gdkgc.h \
- /usr/include/gtk-2.0/gdk/gdkrgb.h \
/usr/include/gtk-2.0/gdk/gdkenumtypes.h \
/usr/include/gtk-2.0/gdk/gdkfont.h /usr/include/gtk-2.0/gdk/gdkimage.h \
/usr/include/gtk-2.0/gdk/gdkkeys.h \
/usr/include/gtk-2.0/gdk/gdkdisplaymanager.h \
/usr/include/gtk-2.0/gdk/gdkpango.h \
- /usr/include/gtk-2.0/gdk/gdkpixbuf.h \
/usr/include/gtk-2.0/gdk/gdkpixmap.h \
/usr/include/gtk-2.0/gdk/gdkproperty.h \
/usr/include/gtk-2.0/gdk/gdkregion.h \
@@ -147,6 +153,7 @@ callbacks.o callbacks.o: callbacks.c ../config.h callbacks.h \
/usr/include/atk-1.0/atk/atktext.h \
/usr/include/atk-1.0/atk/atkgobjectaccessible.h \
/usr/include/atk-1.0/atk/atkhyperlink.h \
+ /usr/include/atk-1.0/atk/atkhyperlinkimpl.h \
/usr/include/atk-1.0/atk/atkhypertext.h \
/usr/include/atk-1.0/atk/atkimage.h \
/usr/include/atk-1.0/atk/atknoopobject.h \
@@ -166,8 +173,9 @@ callbacks.o callbacks.o: callbacks.c ../config.h callbacks.h \
/usr/include/gtk-2.0/gtk/gtkalignment.h \
/usr/include/gtk-2.0/gtk/gtkarrow.h \
/usr/include/gtk-2.0/gtk/gtkaspectframe.h \
- /usr/include/gtk-2.0/gtk/gtkframe.h /usr/include/gtk-2.0/gtk/gtkbbox.h \
- /usr/include/gtk-2.0/gtk/gtkbox.h \
+ /usr/include/gtk-2.0/gtk/gtkframe.h \
+ /usr/include/gtk-2.0/gtk/gtkassistant.h \
+ /usr/include/gtk-2.0/gtk/gtkbbox.h /usr/include/gtk-2.0/gtk/gtkbox.h \
/usr/include/gtk-2.0/gtk/gtkbindings.h \
/usr/include/gtk-2.0/gtk/gtkbutton.h \
/usr/include/gtk-2.0/gtk/gtkimage.h \
@@ -180,10 +188,13 @@ callbacks.o callbacks.o: callbacks.c ../config.h callbacks.h \
/usr/include/gtk-2.0/gtk/gtktreeviewcolumn.h \
/usr/include/gtk-2.0/gtk/gtktreemodel.h \
/usr/include/gtk-2.0/gtk/gtktreesortable.h \
+ /usr/include/gtk-2.0/gtk/gtkcellrendereraccel.h \
+ /usr/include/gtk-2.0/gtk/gtkcellrenderertext.h \
/usr/include/gtk-2.0/gtk/gtkcellrenderercombo.h \
/usr/include/gtk-2.0/gtk/gtkcellrenderertext.h \
/usr/include/gtk-2.0/gtk/gtkcellrendererpixbuf.h \
/usr/include/gtk-2.0/gtk/gtkcellrendererprogress.h \
+ /usr/include/gtk-2.0/gtk/gtkcellrendererspin.h \
/usr/include/gtk-2.0/gtk/gtkcellrenderertoggle.h \
/usr/include/gtk-2.0/gtk/gtkcellview.h \
/usr/include/gtk-2.0/gtk/gtkcheckbutton.h \
@@ -193,6 +204,9 @@ callbacks.o callbacks.o: callbacks.c ../config.h callbacks.h \
/usr/include/gtk-2.0/gtk/gtkitem.h \
/usr/include/gtk-2.0/gtk/gtkclipboard.h \
/usr/include/gtk-2.0/gtk/gtkselection.h \
+ /usr/include/gtk-2.0/gtk/gtktextiter.h \
+ /usr/include/gtk-2.0/gtk/gtktexttag.h \
+ /usr/include/gtk-2.0/gtk/gtktextchild.h \
/usr/include/gtk-2.0/gtk/gtkclist.h \
/usr/include/gtk-2.0/gtk/gtkhscrollbar.h \
/usr/include/gtk-2.0/gtk/gtkscrollbar.h \
@@ -205,16 +219,15 @@ callbacks.o callbacks.o: callbacks.c ../config.h callbacks.h \
/usr/include/gtk-2.0/gtk/gtkcombo.h /usr/include/gtk-2.0/gtk/gtkhbox.h \
/usr/include/gtk-2.0/gtk/gtkcombobox.h \
/usr/include/gtk-2.0/gtk/gtktreeview.h \
- /usr/include/gtk-2.0/gtk/gtkdnd.h \
- /usr/include/gtk-2.0/gtk/gtkcomboboxentry.h \
- /usr/include/gtk-2.0/gtk/gtkctree.h /usr/include/gtk-2.0/gtk/gtkcurve.h \
- /usr/include/gtk-2.0/gtk/gtkdrawingarea.h \
+ /usr/include/gtk-2.0/gtk/gtkdnd.h /usr/include/gtk-2.0/gtk/gtkentry.h \
/usr/include/gtk-2.0/gtk/gtkeditable.h \
- /usr/include/gtk-2.0/gtk/gtkentry.h \
/usr/include/gtk-2.0/gtk/gtkimcontext.h \
/usr/include/gtk-2.0/gtk/gtkentrycompletion.h \
/usr/include/gtk-2.0/gtk/gtkliststore.h \
/usr/include/gtk-2.0/gtk/gtktreemodelfilter.h \
+ /usr/include/gtk-2.0/gtk/gtkcomboboxentry.h \
+ /usr/include/gtk-2.0/gtk/gtkctree.h /usr/include/gtk-2.0/gtk/gtkcurve.h \
+ /usr/include/gtk-2.0/gtk/gtkdrawingarea.h \
/usr/include/gtk-2.0/gtk/gtkeventbox.h \
/usr/include/gtk-2.0/gtk/gtkexpander.h \
/usr/include/gtk-2.0/gtk/gtkfilesel.h \
@@ -246,7 +259,9 @@ callbacks.o callbacks.o: callbacks.c ../config.h callbacks.h \
/usr/include/gtk-2.0/gtk/gtkimmulticontext.h \
/usr/include/gtk-2.0/gtk/gtkinputdialog.h \
/usr/include/gtk-2.0/gtk/gtkinvisible.h \
- /usr/include/gtk-2.0/gtk/gtklayout.h /usr/include/gtk-2.0/gtk/gtklist.h \
+ /usr/include/gtk-2.0/gtk/gtklayout.h \
+ /usr/include/gtk-2.0/gtk/gtklinkbutton.h \
+ /usr/include/gtk-2.0/gtk/gtklist.h \
/usr/include/gtk-2.0/gtk/gtklistitem.h \
/usr/include/gtk-2.0/gtk/gtkmain.h \
/usr/include/gtk-2.0/gtk/gtkmenubar.h \
@@ -263,6 +278,14 @@ callbacks.o callbacks.o: callbacks.c ../config.h callbacks.h \
/usr/include/gtk-2.0/gtk/gtkpixmap.h /usr/include/gtk-2.0/gtk/gtkplug.h \
/usr/include/gtk-2.0/gtk/gtksocket.h \
/usr/include/gtk-2.0/gtk/gtkpreview.h \
+ /usr/include/gtk-2.0/gtk/gtkprintoperation.h \
+ /usr/include/gtk-2.0/gtk/gtkmain.h /usr/include/gtk-2.0/gtk/gtkenums.h \
+ /usr/include/gtk-2.0/gtk/gtkwindow.h \
+ /usr/include/gtk-2.0/gtk/gtkpagesetup.h \
+ /usr/include/gtk-2.0/gtk/gtkpapersize.h \
+ /usr/include/gtk-2.0/gtk/gtkprintsettings.h \
+ /usr/include/gtk-2.0/gtk/gtkprintcontext.h \
+ /usr/include/gtk-2.0/gtk/gtkprintoperationpreview.h \
/usr/include/gtk-2.0/gtk/gtkprogress.h \
/usr/include/gtk-2.0/gtk/gtkprogressbar.h \
/usr/include/gtk-2.0/gtk/gtkradioaction.h \
@@ -272,6 +295,15 @@ callbacks.o callbacks.o: callbacks.c ../config.h callbacks.h \
/usr/include/gtk-2.0/gtk/gtkradiotoolbutton.h \
/usr/include/gtk-2.0/gtk/gtktoggletoolbutton.h \
/usr/include/gtk-2.0/gtk/gtktoolbutton.h \
+ /usr/include/gtk-2.0/gtk/gtkrecentchooser.h \
+ /usr/include/gtk-2.0/gtk/gtkrecentmanager.h \
+ /usr/include/gtk-2.0/gtk/gtkrecentfilter.h \
+ /usr/include/gtk-2.0/gtk/gtkrecentchooserdialog.h \
+ /usr/include/gtk-2.0/gtk/gtkrecentchooser.h \
+ /usr/include/gtk-2.0/gtk/gtkrecentchoosermenu.h \
+ /usr/include/gtk-2.0/gtk/gtkrecentchooserwidget.h \
+ /usr/include/gtk-2.0/gtk/gtkrecentfilter.h \
+ /usr/include/gtk-2.0/gtk/gtkrecentmanager.h \
/usr/include/gtk-2.0/gtk/gtkscrolledwindow.h \
/usr/include/gtk-2.0/gtk/gtkviewport.h \
/usr/include/gtk-2.0/gtk/gtkseparatormenuitem.h \
@@ -279,15 +311,14 @@ callbacks.o callbacks.o: callbacks.c ../config.h callbacks.h \
/usr/include/gtk-2.0/gtk/gtksizegroup.h \
/usr/include/gtk-2.0/gtk/gtkspinbutton.h \
/usr/include/gtk-2.0/gtk/gtkstatusbar.h \
+ /usr/include/gtk-2.0/gtk/gtkstatusicon.h \
/usr/include/gtk-2.0/gtk/gtkstock.h /usr/include/gtk-2.0/gtk/gtktable.h \
/usr/include/gtk-2.0/gtk/gtktearoffmenuitem.h \
/usr/include/gtk-2.0/gtk/gtktext.h \
/usr/include/gtk-2.0/gtk/gtktextbuffer.h \
/usr/include/gtk-2.0/gtk/gtktexttagtable.h \
- /usr/include/gtk-2.0/gtk/gtktexttag.h \
- /usr/include/gtk-2.0/gtk/gtktextiter.h \
- /usr/include/gtk-2.0/gtk/gtktextchild.h \
/usr/include/gtk-2.0/gtk/gtktextmark.h \
+ /usr/include/gtk-2.0/gtk/gtktextbufferrichtext.h \
/usr/include/gtk-2.0/gtk/gtktextview.h \
/usr/include/gtk-2.0/gtk/gtktipsquery.h \
/usr/include/gtk-2.0/gtk/gtktoggletoolbutton.h \
@@ -308,10 +339,10 @@ callbacks.o callbacks.o: callbacks.c ../config.h callbacks.h \
/usr/include/gtk-2.0/gtk/gtkvscale.h \
/usr/include/gtk-2.0/gtk/gtkvseparator.h \
/usr/include/libgnome-2.0/libgnome/libgnome.h \
- /usr/include/libgnome-2.0/libgnome/gnome-program.h /usr/include/popt.h \
- /usr/include/errno.h /usr/include/bits/errno.h \
- /usr/include/linux/errno.h /usr/include/asm/errno.h \
- /usr/include/asm-generic/errno.h /usr/include/asm-generic/errno-base.h \
+ /usr/include/libgnome-2.0/libgnome/gnome-program.h /usr/include/errno.h \
+ /usr/include/bits/errno.h /usr/include/linux/errno.h \
+ /usr/include/asm/errno.h /usr/include/asm-generic/errno.h \
+ /usr/include/asm-generic/errno-base.h /usr/include/popt.h \
/usr/include/libgnome-2.0/libgnome/gnome-i18n.h \
/usr/include/libbonobo-2.0/bonobo/bonobo-i18n.h /usr/include/libintl.h \
/usr/include/locale.h /usr/include/bits/locale.h \
@@ -323,22 +354,18 @@ callbacks.o callbacks.o: callbacks.c ../config.h callbacks.h \
/usr/include/libbonobo-2.0/bonobo/bonobo-macros.h \
/usr/include/libgnome-2.0/libgnome/gnome-triggers.h \
/usr/include/libgnome-2.0/libgnome/gnome-sound.h \
- /usr/include/libgnome-2.0/libgnome/gnome-score.h /usr/include/time.h \
- /usr/include/bits/time.h \
+ /usr/include/libgnome-2.0/libgnome/gnome-score.h \
/usr/include/libgnome-2.0/libgnome/gnome-exec.h \
/usr/include/libgnome-2.0/libgnome/gnome-util.h /usr/include/stdlib.h \
/usr/include/sys/types.h /usr/include/endian.h \
/usr/include/bits/endian.h /usr/include/sys/select.h \
/usr/include/bits/select.h /usr/include/bits/sigset.h \
/usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h \
- /usr/include/bits/sched.h /usr/include/alloca.h \
- /usr/include/libgnome-2.0/libgnome/gnome-url.h \
+ /usr/include/alloca.h /usr/include/libgnome-2.0/libgnome/gnome-url.h \
/usr/include/libgnomecanvas-2.0/libgnomecanvas/libgnomecanvas.h \
/usr/include/libgnomecanvas-2.0/libgnomecanvas/gnome-canvas.h \
/usr/include/libart-2.0/libart_lgpl/art_misc.h \
/usr/include/libart-2.0/libart_lgpl/art_config.h \
- /usr/include/multiarch-dispatch.h \
- /usr/include/multiarch-i386-linux/libart-2.0/libart_lgpl/art_config.h \
/usr/include/libart-2.0/libart_lgpl/art_rect.h \
/usr/include/libart-2.0/libart_lgpl/art_svp.h \
/usr/include/libart-2.0/libart_lgpl/art_point.h \
@@ -359,6 +386,9 @@ callbacks.o callbacks.o: callbacks.c ../config.h callbacks.h \
/usr/include/libgnomecanvas-2.0/libgnomecanvas/gnome-canvas-util.h \
/usr/include/libart-2.0/libart_lgpl/art_vpath.h \
/usr/include/libart-2.0/libart_lgpl/art_svp_vpath_stroke.h \
+ /usr/include/libgnomecanvas-2.0/libgnomecanvas/gnome-canvas-clipgroup.h \
+ /usr/include/libart-2.0/libart_lgpl/art_svp_wind.h \
+ /usr/include/libart-2.0/libart_lgpl/art_vpath_dash.h \
/usr/include/libgnomeui-2.0/libgnomeui/libgnomeui.h \
/usr/include/libgnomeui-2.0/libgnomeui/gnome-uidefs.h \
/usr/include/gtk-2.0/gdk/gdkkeysyms.h \
@@ -389,9 +419,10 @@ callbacks.o callbacks.o: callbacks.c ../config.h callbacks.h \
/usr/include/libgnomeui-2.0/libgnomeui/gnome-icon-lookup.h \
/usr/include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-file-info.h \
/usr/include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-file-size.h \
- /usr/include/multiarch-i386-linux/gnome-vfs-2.0/libgnomevfs/gnome-vfs-file-size.h \
/usr/include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-result.h \
/usr/include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-uri.h \
+ /usr/include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-acl.h \
+ /usr/include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-ace.h \
/usr/include/sys/stat.h /usr/include/bits/stat.h \
/usr/include/libgnomeui-2.0/libgnomeui/gnome-stock-icons.h \
/usr/include/libgnomeui-2.0/libgnomeui/gnome-scores.h \
@@ -441,15 +472,15 @@ callbacks.o callbacks.o: callbacks.c ../config.h callbacks.h \
/usr/include/bits/fcntl.h /usr/include/sys/wait.h /usr/include/signal.h \
/usr/include/bits/signum.h /usr/include/bits/siginfo.h \
/usr/include/bits/sigaction.h /usr/include/bits/sigcontext.h \
- /usr/include/asm/sigcontext.h /usr/include/linux/compiler.h \
- /usr/include/bits/sigstack.h /usr/include/bits/sigthread.h \
- /usr/include/sys/resource.h /usr/include/bits/resource.h \
- /usr/include/bits/waitflags.h /usr/include/bits/waitstatus.h \
- /usr/include/pcre/pcre.h eggtrayicon.h /usr/include/gtk-2.0/gdk/gdkx.h \
- /usr/include/gtk-2.0/gdk/gdkprivate.h /usr/X11R6/include/X11/Xlib.h \
- /usr/X11R6/include/X11/X.h /usr/X11R6/include/X11/Xfuncproto.h \
- /usr/X11R6/include/X11/Xosdefs.h /usr/X11R6/include/X11/Xutil.h \
- interface.h support.h
+ /usr/include/asm/sigcontext.h /usr/include/bits/sigstack.h \
+ /usr/include/bits/sigthread.h /usr/include/sys/resource.h \
+ /usr/include/bits/resource.h /usr/include/bits/waitflags.h \
+ /usr/include/bits/waitstatus.h /usr/include/pcre.h eggtrayicon.h \
+ /usr/include/gtk-2.0/gdk/gdkx.h /usr/include/gtk-2.0/gdk/gdkprivate.h \
+ /usr/include/X11/Xlib.h /usr/include/X11/X.h \
+ /usr/include/X11/Xfuncproto.h /usr/include/X11/Xosdefs.h \
+ /usr/include/X11/Xutil.h /usr/include/X11/keysym.h \
+ /usr/include/X11/keysymdef.h interface.h support.h
../config.h:
@@ -461,8 +492,14 @@ callbacks.h:
/usr/include/gtk-2.0/gdk/gdk.h:
+/usr/include/gtk-2.0/gdk/gdkcairo.h:
+
/usr/include/gtk-2.0/gdk/gdkcolor.h:
+/usr/include/cairo/cairo.h:
+
+/usr/include/cairo/cairo-features.h:
+
/usr/include/gtk-2.0/gdk/gdktypes.h:
/usr/include/glib-2.0/glib.h:
@@ -475,11 +512,11 @@ callbacks.h:
/usr/include/glib-2.0/glib/gmacros.h:
-/usr/lib/gcc/i586-mandrake-linux-gnu/3.4.3/include/stddef.h:
+/usr/lib/gcc/i686-pc-linux-gnu/4.1.1/include/stddef.h:
-/usr/lib/gcc/i586-mandrake-linux-gnu/3.4.3/include/limits.h:
+/usr/lib/gcc/i686-pc-linux-gnu/4.1.1/include/limits.h:
-/usr/lib/gcc/i586-mandrake-linux-gnu/3.4.3/include/syslimits.h:
+/usr/lib/gcc/i686-pc-linux-gnu/4.1.1/include/syslimits.h:
/usr/include/limits.h:
@@ -487,8 +524,12 @@ callbacks.h:
/usr/include/sys/cdefs.h:
+/usr/include/bits/wordsize.h:
+
/usr/include/gnu/stubs.h:
+/usr/include/gnu/stubs-32.h:
+
/usr/include/bits/posix1_lim.h:
/usr/include/bits/local_lim.h:
@@ -497,7 +538,7 @@ callbacks.h:
/usr/include/bits/posix2_lim.h:
-/usr/lib/gcc/i586-mandrake-linux-gnu/3.4.3/include/float.h:
+/usr/lib/gcc/i686-pc-linux-gnu/4.1.1/include/float.h:
/usr/include/glib-2.0/glib/garray.h:
@@ -513,12 +554,26 @@ callbacks.h:
/usr/include/glib-2.0/glib/gbacktrace.h:
+/usr/include/glib-2.0/glib/gbase64.h:
+
+/usr/include/glib-2.0/glib/gbookmarkfile.h:
+
+/usr/include/time.h:
+
+/usr/include/bits/time.h:
+
+/usr/include/bits/types.h:
+
+/usr/include/bits/typesizes.h:
+
/usr/include/glib-2.0/glib/gcache.h:
/usr/include/glib-2.0/glib/glist.h:
/usr/include/glib-2.0/glib/gmem.h:
+/usr/include/glib-2.0/glib/gslice.h:
+
/usr/include/glib-2.0/glib/gcompletion.h:
/usr/include/glib-2.0/glib/gconvert.h:
@@ -547,10 +602,12 @@ callbacks.h:
/usr/include/glib-2.0/glib/gutils.h:
-/usr/lib/gcc/i586-mandrake-linux-gnu/3.4.3/include/stdarg.h:
+/usr/lib/gcc/i686-pc-linux-gnu/4.1.1/include/stdarg.h:
/usr/include/glib-2.0/glib/gkeyfile.h:
+/usr/include/glib-2.0/glib/gmappedfile.h:
+
/usr/include/glib-2.0/glib/gmarkup.h:
/usr/include/glib-2.0/glib/gmessages.h:
@@ -655,7 +712,9 @@ callbacks.h:
/usr/lib/gtk-2.0/include/gdkconfig.h:
-/usr/include/gtk-2.0/gdk/gdkcursor.h:
+/usr/include/gtk-2.0/gdk/gdkpixbuf.h:
+
+/usr/include/gtk-2.0/gdk/gdkrgb.h:
/usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf.h:
@@ -667,16 +726,12 @@ callbacks.h:
/usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-animation.h:
+/usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-simple-anim.h:
+
/usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-io.h:
/usr/include/stdio.h:
-/usr/include/bits/types.h:
-
-/usr/include/bits/wordsize.h:
-
-/usr/include/bits/typesizes.h:
-
/usr/include/libio.h:
/usr/include/_G_config.h:
@@ -699,6 +754,10 @@ callbacks.h:
/usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-enum-types.h:
+/usr/include/pango-1.0/pango/pangocairo.h:
+
+/usr/include/gtk-2.0/gdk/gdkcursor.h:
+
/usr/include/gtk-2.0/gdk/gdkdisplay.h:
/usr/include/gtk-2.0/gdk/gdkevents.h:
@@ -711,8 +770,6 @@ callbacks.h:
/usr/include/gtk-2.0/gdk/gdkgc.h:
-/usr/include/gtk-2.0/gdk/gdkrgb.h:
-
/usr/include/gtk-2.0/gdk/gdkenumtypes.h:
/usr/include/gtk-2.0/gdk/gdkfont.h:
@@ -725,8 +782,6 @@ callbacks.h:
/usr/include/gtk-2.0/gdk/gdkpango.h:
-/usr/include/gtk-2.0/gdk/gdkpixbuf.h:
-
/usr/include/gtk-2.0/gdk/gdkpixmap.h:
/usr/include/gtk-2.0/gdk/gdkproperty.h:
@@ -813,6 +868,8 @@ callbacks.h:
/usr/include/atk-1.0/atk/atkhyperlink.h:
+/usr/include/atk-1.0/atk/atkhyperlinkimpl.h:
+
/usr/include/atk-1.0/atk/atkhypertext.h:
/usr/include/atk-1.0/atk/atkimage.h:
@@ -855,6 +912,8 @@ callbacks.h:
/usr/include/gtk-2.0/gtk/gtkframe.h:
+/usr/include/gtk-2.0/gtk/gtkassistant.h:
+
/usr/include/gtk-2.0/gtk/gtkbbox.h:
/usr/include/gtk-2.0/gtk/gtkbox.h:
@@ -883,6 +942,10 @@ callbacks.h:
/usr/include/gtk-2.0/gtk/gtktreesortable.h:
+/usr/include/gtk-2.0/gtk/gtkcellrendereraccel.h:
+
+/usr/include/gtk-2.0/gtk/gtkcellrenderertext.h:
+
/usr/include/gtk-2.0/gtk/gtkcellrenderercombo.h:
/usr/include/gtk-2.0/gtk/gtkcellrenderertext.h:
@@ -891,6 +954,8 @@ callbacks.h:
/usr/include/gtk-2.0/gtk/gtkcellrendererprogress.h:
+/usr/include/gtk-2.0/gtk/gtkcellrendererspin.h:
+
/usr/include/gtk-2.0/gtk/gtkcellrenderertoggle.h:
/usr/include/gtk-2.0/gtk/gtkcellview.h:
@@ -909,6 +974,12 @@ callbacks.h:
/usr/include/gtk-2.0/gtk/gtkselection.h:
+/usr/include/gtk-2.0/gtk/gtktextiter.h:
+
+/usr/include/gtk-2.0/gtk/gtktexttag.h:
+
+/usr/include/gtk-2.0/gtk/gtktextchild.h:
+
/usr/include/gtk-2.0/gtk/gtkclist.h:
/usr/include/gtk-2.0/gtk/gtkhscrollbar.h:
@@ -937,18 +1008,10 @@ callbacks.h:
/usr/include/gtk-2.0/gtk/gtkdnd.h:
-/usr/include/gtk-2.0/gtk/gtkcomboboxentry.h:
-
-/usr/include/gtk-2.0/gtk/gtkctree.h:
-
-/usr/include/gtk-2.0/gtk/gtkcurve.h:
-
-/usr/include/gtk-2.0/gtk/gtkdrawingarea.h:
+/usr/include/gtk-2.0/gtk/gtkentry.h:
/usr/include/gtk-2.0/gtk/gtkeditable.h:
-/usr/include/gtk-2.0/gtk/gtkentry.h:
-
/usr/include/gtk-2.0/gtk/gtkimcontext.h:
/usr/include/gtk-2.0/gtk/gtkentrycompletion.h:
@@ -957,6 +1020,14 @@ callbacks.h:
/usr/include/gtk-2.0/gtk/gtktreemodelfilter.h:
+/usr/include/gtk-2.0/gtk/gtkcomboboxentry.h:
+
+/usr/include/gtk-2.0/gtk/gtkctree.h:
+
+/usr/include/gtk-2.0/gtk/gtkcurve.h:
+
+/usr/include/gtk-2.0/gtk/gtkdrawingarea.h:
+
/usr/include/gtk-2.0/gtk/gtkeventbox.h:
/usr/include/gtk-2.0/gtk/gtkexpander.h:
@@ -1023,6 +1094,8 @@ callbacks.h:
/usr/include/gtk-2.0/gtk/gtklayout.h:
+/usr/include/gtk-2.0/gtk/gtklinkbutton.h:
+
/usr/include/gtk-2.0/gtk/gtklist.h:
/usr/include/gtk-2.0/gtk/gtklistitem.h:
@@ -1059,6 +1132,24 @@ callbacks.h:
/usr/include/gtk-2.0/gtk/gtkpreview.h:
+/usr/include/gtk-2.0/gtk/gtkprintoperation.h:
+
+/usr/include/gtk-2.0/gtk/gtkmain.h:
+
+/usr/include/gtk-2.0/gtk/gtkenums.h:
+
+/usr/include/gtk-2.0/gtk/gtkwindow.h:
+
+/usr/include/gtk-2.0/gtk/gtkpagesetup.h:
+
+/usr/include/gtk-2.0/gtk/gtkpapersize.h:
+
+/usr/include/gtk-2.0/gtk/gtkprintsettings.h:
+
+/usr/include/gtk-2.0/gtk/gtkprintcontext.h:
+
+/usr/include/gtk-2.0/gtk/gtkprintoperationpreview.h:
+
/usr/include/gtk-2.0/gtk/gtkprogress.h:
/usr/include/gtk-2.0/gtk/gtkprogressbar.h:
@@ -1077,6 +1168,24 @@ callbacks.h:
/usr/include/gtk-2.0/gtk/gtktoolbutton.h:
+/usr/include/gtk-2.0/gtk/gtkrecentchooser.h:
+
+/usr/include/gtk-2.0/gtk/gtkrecentmanager.h:
+
+/usr/include/gtk-2.0/gtk/gtkrecentfilter.h:
+
+/usr/include/gtk-2.0/gtk/gtkrecentchooserdialog.h:
+
+/usr/include/gtk-2.0/gtk/gtkrecentchooser.h:
+
+/usr/include/gtk-2.0/gtk/gtkrecentchoosermenu.h:
+
+/usr/include/gtk-2.0/gtk/gtkrecentchooserwidget.h:
+
+/usr/include/gtk-2.0/gtk/gtkrecentfilter.h:
+
+/usr/include/gtk-2.0/gtk/gtkrecentmanager.h:
+
/usr/include/gtk-2.0/gtk/gtkscrolledwindow.h:
/usr/include/gtk-2.0/gtk/gtkviewport.h:
@@ -1091,6 +1200,8 @@ callbacks.h:
/usr/include/gtk-2.0/gtk/gtkstatusbar.h:
+/usr/include/gtk-2.0/gtk/gtkstatusicon.h:
+
/usr/include/gtk-2.0/gtk/gtkstock.h:
/usr/include/gtk-2.0/gtk/gtktable.h:
@@ -1103,14 +1214,10 @@ callbacks.h:
/usr/include/gtk-2.0/gtk/gtktexttagtable.h:
-/usr/include/gtk-2.0/gtk/gtktexttag.h:
-
-/usr/include/gtk-2.0/gtk/gtktextiter.h:
-
-/usr/include/gtk-2.0/gtk/gtktextchild.h:
-
/usr/include/gtk-2.0/gtk/gtktextmark.h:
+/usr/include/gtk-2.0/gtk/gtktextbufferrichtext.h:
+
/usr/include/gtk-2.0/gtk/gtktextview.h:
/usr/include/gtk-2.0/gtk/gtktipsquery.h:
@@ -1153,8 +1260,6 @@ callbacks.h:
/usr/include/libgnome-2.0/libgnome/gnome-program.h:
-/usr/include/popt.h:
-
/usr/include/errno.h:
/usr/include/bits/errno.h:
@@ -1167,6 +1272,8 @@ callbacks.h:
/usr/include/asm-generic/errno-base.h:
+/usr/include/popt.h:
+
/usr/include/libgnome-2.0/libgnome/gnome-i18n.h:
/usr/include/libbonobo-2.0/bonobo/bonobo-i18n.h:
@@ -1195,10 +1302,6 @@ callbacks.h:
/usr/include/libgnome-2.0/libgnome/gnome-score.h:
-/usr/include/time.h:
-
-/usr/include/bits/time.h:
-
/usr/include/libgnome-2.0/libgnome/gnome-exec.h:
/usr/include/libgnome-2.0/libgnome/gnome-util.h:
@@ -1221,8 +1324,6 @@ callbacks.h:
/usr/include/bits/pthreadtypes.h:
-/usr/include/bits/sched.h:
-
/usr/include/alloca.h:
/usr/include/libgnome-2.0/libgnome/gnome-url.h:
@@ -1235,10 +1336,6 @@ callbacks.h:
/usr/include/libart-2.0/libart_lgpl/art_config.h:
-/usr/include/multiarch-dispatch.h:
-
-/usr/include/multiarch-i386-linux/libart-2.0/libart_lgpl/art_config.h:
-
/usr/include/libart-2.0/libart_lgpl/art_rect.h:
/usr/include/libart-2.0/libart_lgpl/art_svp.h:
@@ -1279,6 +1376,12 @@ callbacks.h:
/usr/include/libart-2.0/libart_lgpl/art_svp_vpath_stroke.h:
+/usr/include/libgnomecanvas-2.0/libgnomecanvas/gnome-canvas-clipgroup.h:
+
+/usr/include/libart-2.0/libart_lgpl/art_svp_wind.h:
+
+/usr/include/libart-2.0/libart_lgpl/art_vpath_dash.h:
+
/usr/include/libgnomeui-2.0/libgnomeui/libgnomeui.h:
/usr/include/libgnomeui-2.0/libgnomeui/gnome-uidefs.h:
@@ -1339,12 +1442,14 @@ callbacks.h:
/usr/include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-file-size.h:
-/usr/include/multiarch-i386-linux/gnome-vfs-2.0/libgnomevfs/gnome-vfs-file-size.h:
-
/usr/include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-result.h:
/usr/include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-uri.h:
+/usr/include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-acl.h:
+
+/usr/include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-ace.h:
+
/usr/include/sys/stat.h:
/usr/include/bits/stat.h:
@@ -1463,8 +1568,6 @@ callbacks.h:
/usr/include/asm/sigcontext.h:
-/usr/include/linux/compiler.h:
-
/usr/include/bits/sigstack.h:
/usr/include/bits/sigthread.h:
@@ -1477,7 +1580,7 @@ callbacks.h:
/usr/include/bits/waitstatus.h:
-/usr/include/pcre/pcre.h:
+/usr/include/pcre.h:
eggtrayicon.h:
@@ -1485,15 +1588,19 @@ eggtrayicon.h:
/usr/include/gtk-2.0/gdk/gdkprivate.h:
-/usr/X11R6/include/X11/Xlib.h:
+/usr/include/X11/Xlib.h:
+
+/usr/include/X11/X.h:
+
+/usr/include/X11/Xfuncproto.h:
-/usr/X11R6/include/X11/X.h:
+/usr/include/X11/Xosdefs.h:
-/usr/X11R6/include/X11/Xfuncproto.h:
+/usr/include/X11/Xutil.h:
-/usr/X11R6/include/X11/Xosdefs.h:
+/usr/include/X11/keysym.h:
-/usr/X11R6/include/X11/Xutil.h:
+/usr/include/X11/keysymdef.h:
interface.h:
diff --git a/projects/gvpndialer/trunk/src/.deps/interface.Po b/projects/gvpndialer/trunk/src/.deps/interface.Po
index 1845bb4..d96ff90 100644
--- a/projects/gvpndialer/trunk/src/.deps/interface.Po
+++ b/projects/gvpndialer/trunk/src/.deps/interface.Po
@@ -1,20 +1,20 @@
interface.o interface.o: interface.c ../config.h /usr/include/sys/types.h \
/usr/include/features.h /usr/include/sys/cdefs.h \
- /usr/include/gnu/stubs.h /usr/include/bits/types.h \
- /usr/include/bits/wordsize.h \
- /usr/lib/gcc/i586-mandrake-linux-gnu/3.4.3/include/stddef.h \
+ /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h \
+ /usr/include/gnu/stubs-32.h /usr/include/bits/types.h \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.1.1/include/stddef.h \
/usr/include/bits/typesizes.h /usr/include/time.h /usr/include/endian.h \
/usr/include/bits/endian.h /usr/include/sys/select.h \
/usr/include/bits/select.h /usr/include/bits/sigset.h \
/usr/include/bits/time.h /usr/include/sys/sysmacros.h \
- /usr/include/bits/pthreadtypes.h /usr/include/bits/sched.h \
- /usr/include/sys/stat.h /usr/include/bits/stat.h /usr/include/unistd.h \
+ /usr/include/bits/pthreadtypes.h /usr/include/sys/stat.h \
+ /usr/include/bits/stat.h /usr/include/unistd.h \
/usr/include/bits/posix_opt.h /usr/include/bits/confname.h \
/usr/include/getopt.h /usr/include/string.h /usr/include/bits/string.h \
/usr/include/bits/string2.h /usr/include/stdlib.h /usr/include/stdio.h \
/usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \
/usr/include/bits/wchar.h /usr/include/gconv.h \
- /usr/lib/gcc/i586-mandrake-linux-gnu/3.4.3/include/stdarg.h \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.1.1/include/stdarg.h \
/usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \
/usr/include/bits/stdio.h /usr/include/libbonoboui-2.0/bonobo.h \
/usr/include/libbonoboui-2.0/libbonoboui.h \
@@ -28,20 +28,22 @@ interface.o interface.o: interface.c ../config.h /usr/include/sys/types.h \
/usr/include/glib-2.0/glib/galloca.h \
/usr/include/glib-2.0/glib/gtypes.h \
/usr/lib/glib-2.0/include/glibconfig.h \
- /usr/lib/gcc/i586-mandrake-linux-gnu/3.4.3/include/limits.h \
- /usr/lib/gcc/i586-mandrake-linux-gnu/3.4.3/include/syslimits.h \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.1.1/include/limits.h \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.1.1/include/syslimits.h \
/usr/include/limits.h /usr/include/bits/posix1_lim.h \
/usr/include/bits/local_lim.h /usr/include/linux/limits.h \
/usr/include/bits/posix2_lim.h \
- /usr/lib/gcc/i586-mandrake-linux-gnu/3.4.3/include/float.h \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.1.1/include/float.h \
/usr/include/glib-2.0/glib/garray.h \
/usr/include/glib-2.0/glib/gasyncqueue.h \
/usr/include/glib-2.0/glib/gthread.h \
/usr/include/glib-2.0/glib/gerror.h /usr/include/glib-2.0/glib/gquark.h \
/usr/include/glib-2.0/glib/gatomic.h \
/usr/include/glib-2.0/glib/gbacktrace.h \
+ /usr/include/glib-2.0/glib/gbase64.h \
+ /usr/include/glib-2.0/glib/gbookmarkfile.h \
/usr/include/glib-2.0/glib/gcache.h /usr/include/glib-2.0/glib/glist.h \
- /usr/include/glib-2.0/glib/gmem.h \
+ /usr/include/glib-2.0/glib/gmem.h /usr/include/glib-2.0/glib/gslice.h \
/usr/include/glib-2.0/glib/gcompletion.h \
/usr/include/glib-2.0/glib/gconvert.h \
/usr/include/glib-2.0/glib/gdataset.h \
@@ -54,6 +56,7 @@ interface.o interface.o: interface.c ../config.h /usr/include/sys/types.h \
/usr/include/glib-2.0/glib/gunicode.h \
/usr/include/glib-2.0/glib/gutils.h \
/usr/include/glib-2.0/glib/gkeyfile.h \
+ /usr/include/glib-2.0/glib/gmappedfile.h \
/usr/include/glib-2.0/glib/gmarkup.h \
/usr/include/glib-2.0/glib/gmessages.h \
/usr/include/glib-2.0/glib/gnode.h /usr/include/glib-2.0/glib/goption.h \
@@ -85,8 +88,6 @@ interface.o interface.o: interface.c ../config.h /usr/include/sys/types.h \
/usr/include/orbit-2.0/orbit/orbit-types.h \
/usr/include/orbit-2.0/orbit/util/orbit-util.h \
/usr/include/orbit-2.0/orbit/orbit-config.h \
- /usr/include/multiarch-dispatch.h \
- /usr/include/multiarch-i386-linux/orbit-2.0/orbit/orbit-config.h \
/usr/include/orbit-2.0/orbit/util/basic_types.h \
/usr/include/orbit-2.0/orbit/util/orbit-genrand.h \
/usr/include/orbit-2.0/orbit/orb-core/orb-core-types.h \
@@ -140,7 +141,9 @@ interface.o interface.o: interface.c ../config.h /usr/include/sys/types.h \
/usr/include/libbonobo-2.0/bonobo/bonobo-context.h \
/usr/include/libbonobo-2.0/bonobo/bonobo-exception.h \
/usr/include/libbonobo-2.0/bonobo/bonobo-item-container.h \
+ /usr/include/libbonobo-2.0/bonobo/bonobo-item-handler.h \
/usr/include/libbonobo-2.0/bonobo/bonobo-moniker-util.h \
+ /usr/include/libbonobo-2.0/bonobo/bonobo-moniker-extender.h \
/usr/include/libbonobo-2.0/bonobo/bonobo-property-bag.h \
/usr/include/libbonobo-2.0/bonobo/bonobo-event-source.h \
/usr/include/libbonobo-2.0/bonobo/bonobo-listener.h \
@@ -148,6 +151,7 @@ interface.o interface.o: interface.c ../config.h /usr/include/sys/types.h \
/usr/include/libbonobo-2.0/bonobo/bonobo-generic-factory.h \
/usr/include/libbonobo-2.0/bonobo/bonobo-i18n.h /usr/include/libintl.h \
/usr/include/locale.h /usr/include/bits/locale.h \
+ /usr/include/libbonobo-2.0/bonobo/bonobo-shlib-factory.h \
/usr/include/libbonobo-2.0/bonobo/bonobo-main.h \
/usr/include/libbonobo-2.0/bonobo/bonobo-stream.h \
/usr/include/libbonobo-2.0/bonobo/bonobo-storage.h \
@@ -161,7 +165,9 @@ interface.o interface.o: interface.c ../config.h /usr/include/sys/types.h \
/usr/include/libbonobo-2.0/bonobo/bonobo-app-client.h \
/usr/include/libbonoboui-2.0/bonobo/bonobo-widget.h \
/usr/include/gtk-2.0/gtk/gtkbin.h /usr/include/gtk-2.0/gdk/gdk.h \
- /usr/include/gtk-2.0/gdk/gdkcolor.h /usr/include/gtk-2.0/gdk/gdktypes.h \
+ /usr/include/gtk-2.0/gdk/gdkcairo.h /usr/include/gtk-2.0/gdk/gdkcolor.h \
+ /usr/include/cairo/cairo.h /usr/include/cairo/cairo-features.h \
+ /usr/include/gtk-2.0/gdk/gdktypes.h \
/usr/include/pango-1.0/pango/pango.h \
/usr/include/pango-1.0/pango/pango-attributes.h \
/usr/include/pango-1.0/pango/pango-font.h \
@@ -181,27 +187,28 @@ interface.o interface.o: interface.c ../config.h /usr/include/sys/types.h \
/usr/include/pango-1.0/pango/pango-tabs.h \
/usr/include/pango-1.0/pango/pango-renderer.h \
/usr/lib/gtk-2.0/include/gdkconfig.h \
- /usr/include/gtk-2.0/gdk/gdkcursor.h \
+ /usr/include/gtk-2.0/gdk/gdkpixbuf.h /usr/include/gtk-2.0/gdk/gdkrgb.h \
/usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf.h \
/usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-features.h \
/usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-core.h \
/usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-transform.h \
/usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-animation.h \
+ /usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-simple-anim.h \
/usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-io.h \
/usr/include/glib-2.0/gmodule.h \
/usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-loader.h \
/usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-enum-types.h \
+ /usr/include/pango-1.0/pango/pangocairo.h \
+ /usr/include/gtk-2.0/gdk/gdkcursor.h \
/usr/include/gtk-2.0/gdk/gdkdisplay.h \
/usr/include/gtk-2.0/gdk/gdkevents.h /usr/include/gtk-2.0/gdk/gdkdnd.h \
/usr/include/gtk-2.0/gdk/gdkinput.h \
/usr/include/gtk-2.0/gdk/gdkdrawable.h /usr/include/gtk-2.0/gdk/gdkgc.h \
- /usr/include/gtk-2.0/gdk/gdkrgb.h \
/usr/include/gtk-2.0/gdk/gdkenumtypes.h \
/usr/include/gtk-2.0/gdk/gdkfont.h /usr/include/gtk-2.0/gdk/gdkimage.h \
/usr/include/gtk-2.0/gdk/gdkkeys.h \
/usr/include/gtk-2.0/gdk/gdkdisplaymanager.h \
/usr/include/gtk-2.0/gdk/gdkpango.h \
- /usr/include/gtk-2.0/gdk/gdkpixbuf.h \
/usr/include/gtk-2.0/gdk/gdkpixmap.h \
/usr/include/gtk-2.0/gdk/gdkproperty.h \
/usr/include/gtk-2.0/gdk/gdkregion.h \
@@ -261,6 +268,7 @@ interface.o interface.o: interface.c ../config.h /usr/include/sys/types.h \
/usr/include/atk-1.0/atk/atktext.h \
/usr/include/atk-1.0/atk/atkgobjectaccessible.h \
/usr/include/atk-1.0/atk/atkhyperlink.h \
+ /usr/include/atk-1.0/atk/atkhyperlinkimpl.h \
/usr/include/atk-1.0/atk/atkhypertext.h \
/usr/include/atk-1.0/atk/atkimage.h \
/usr/include/atk-1.0/atk/atknoopobject.h \
@@ -280,8 +288,9 @@ interface.o interface.o: interface.c ../config.h /usr/include/sys/types.h \
/usr/include/gtk-2.0/gtk/gtkalignment.h \
/usr/include/gtk-2.0/gtk/gtkarrow.h \
/usr/include/gtk-2.0/gtk/gtkaspectframe.h \
- /usr/include/gtk-2.0/gtk/gtkframe.h /usr/include/gtk-2.0/gtk/gtkbbox.h \
- /usr/include/gtk-2.0/gtk/gtkbox.h \
+ /usr/include/gtk-2.0/gtk/gtkframe.h \
+ /usr/include/gtk-2.0/gtk/gtkassistant.h \
+ /usr/include/gtk-2.0/gtk/gtkbbox.h /usr/include/gtk-2.0/gtk/gtkbox.h \
/usr/include/gtk-2.0/gtk/gtkbindings.h \
/usr/include/gtk-2.0/gtk/gtkbutton.h \
/usr/include/gtk-2.0/gtk/gtkimage.h \
@@ -294,10 +303,13 @@ interface.o interface.o: interface.c ../config.h /usr/include/sys/types.h \
/usr/include/gtk-2.0/gtk/gtktreeviewcolumn.h \
/usr/include/gtk-2.0/gtk/gtktreemodel.h \
/usr/include/gtk-2.0/gtk/gtktreesortable.h \
+ /usr/include/gtk-2.0/gtk/gtkcellrendereraccel.h \
+ /usr/include/gtk-2.0/gtk/gtkcellrenderertext.h \
/usr/include/gtk-2.0/gtk/gtkcellrenderercombo.h \
/usr/include/gtk-2.0/gtk/gtkcellrenderertext.h \
/usr/include/gtk-2.0/gtk/gtkcellrendererpixbuf.h \
/usr/include/gtk-2.0/gtk/gtkcellrendererprogress.h \
+ /usr/include/gtk-2.0/gtk/gtkcellrendererspin.h \
/usr/include/gtk-2.0/gtk/gtkcellrenderertoggle.h \
/usr/include/gtk-2.0/gtk/gtkcellview.h \
/usr/include/gtk-2.0/gtk/gtkcheckbutton.h \
@@ -307,6 +319,9 @@ interface.o interface.o: interface.c ../config.h /usr/include/sys/types.h \
/usr/include/gtk-2.0/gtk/gtkitem.h \
/usr/include/gtk-2.0/gtk/gtkclipboard.h \
/usr/include/gtk-2.0/gtk/gtkselection.h \
+ /usr/include/gtk-2.0/gtk/gtktextiter.h \
+ /usr/include/gtk-2.0/gtk/gtktexttag.h \
+ /usr/include/gtk-2.0/gtk/gtktextchild.h \
/usr/include/gtk-2.0/gtk/gtkclist.h \
/usr/include/gtk-2.0/gtk/gtkhscrollbar.h \
/usr/include/gtk-2.0/gtk/gtkscrollbar.h \
@@ -319,16 +334,15 @@ interface.o interface.o: interface.c ../config.h /usr/include/sys/types.h \
/usr/include/gtk-2.0/gtk/gtkcombo.h /usr/include/gtk-2.0/gtk/gtkhbox.h \
/usr/include/gtk-2.0/gtk/gtkcombobox.h \
/usr/include/gtk-2.0/gtk/gtktreeview.h \
- /usr/include/gtk-2.0/gtk/gtkdnd.h \
- /usr/include/gtk-2.0/gtk/gtkcomboboxentry.h \
- /usr/include/gtk-2.0/gtk/gtkctree.h /usr/include/gtk-2.0/gtk/gtkcurve.h \
- /usr/include/gtk-2.0/gtk/gtkdrawingarea.h \
+ /usr/include/gtk-2.0/gtk/gtkdnd.h /usr/include/gtk-2.0/gtk/gtkentry.h \
/usr/include/gtk-2.0/gtk/gtkeditable.h \
- /usr/include/gtk-2.0/gtk/gtkentry.h \
/usr/include/gtk-2.0/gtk/gtkimcontext.h \
/usr/include/gtk-2.0/gtk/gtkentrycompletion.h \
/usr/include/gtk-2.0/gtk/gtkliststore.h \
/usr/include/gtk-2.0/gtk/gtktreemodelfilter.h \
+ /usr/include/gtk-2.0/gtk/gtkcomboboxentry.h \
+ /usr/include/gtk-2.0/gtk/gtkctree.h /usr/include/gtk-2.0/gtk/gtkcurve.h \
+ /usr/include/gtk-2.0/gtk/gtkdrawingarea.h \
/usr/include/gtk-2.0/gtk/gtkeventbox.h \
/usr/include/gtk-2.0/gtk/gtkexpander.h \
/usr/include/gtk-2.0/gtk/gtkfilesel.h \
@@ -360,7 +374,9 @@ interface.o interface.o: interface.c ../config.h /usr/include/sys/types.h \
/usr/include/gtk-2.0/gtk/gtkimmulticontext.h \
/usr/include/gtk-2.0/gtk/gtkinputdialog.h \
/usr/include/gtk-2.0/gtk/gtkinvisible.h \
- /usr/include/gtk-2.0/gtk/gtklayout.h /usr/include/gtk-2.0/gtk/gtklist.h \
+ /usr/include/gtk-2.0/gtk/gtklayout.h \
+ /usr/include/gtk-2.0/gtk/gtklinkbutton.h \
+ /usr/include/gtk-2.0/gtk/gtklist.h \
/usr/include/gtk-2.0/gtk/gtklistitem.h \
/usr/include/gtk-2.0/gtk/gtkmain.h \
/usr/include/gtk-2.0/gtk/gtkmenubar.h \
@@ -376,6 +392,14 @@ interface.o interface.o: interface.c ../config.h /usr/include/sys/types.h \
/usr/include/gtk-2.0/gtk/gtkoptionmenu.h \
/usr/include/gtk-2.0/gtk/gtkpixmap.h \
/usr/include/gtk-2.0/gtk/gtkpreview.h \
+ /usr/include/gtk-2.0/gtk/gtkprintoperation.h \
+ /usr/include/gtk-2.0/gtk/gtkmain.h /usr/include/gtk-2.0/gtk/gtkenums.h \
+ /usr/include/gtk-2.0/gtk/gtkwindow.h \
+ /usr/include/gtk-2.0/gtk/gtkpagesetup.h \
+ /usr/include/gtk-2.0/gtk/gtkpapersize.h \
+ /usr/include/gtk-2.0/gtk/gtkprintsettings.h \
+ /usr/include/gtk-2.0/gtk/gtkprintcontext.h \
+ /usr/include/gtk-2.0/gtk/gtkprintoperationpreview.h \
/usr/include/gtk-2.0/gtk/gtkprogress.h \
/usr/include/gtk-2.0/gtk/gtkprogressbar.h \
/usr/include/gtk-2.0/gtk/gtkradioaction.h \
@@ -385,6 +409,15 @@ interface.o interface.o: interface.c ../config.h /usr/include/sys/types.h \
/usr/include/gtk-2.0/gtk/gtkradiotoolbutton.h \
/usr/include/gtk-2.0/gtk/gtktoggletoolbutton.h \
/usr/include/gtk-2.0/gtk/gtktoolbutton.h \
+ /usr/include/gtk-2.0/gtk/gtkrecentchooser.h \
+ /usr/include/gtk-2.0/gtk/gtkrecentmanager.h \
+ /usr/include/gtk-2.0/gtk/gtkrecentfilter.h \
+ /usr/include/gtk-2.0/gtk/gtkrecentchooserdialog.h \
+ /usr/include/gtk-2.0/gtk/gtkrecentchooser.h \
+ /usr/include/gtk-2.0/gtk/gtkrecentchoosermenu.h \
+ /usr/include/gtk-2.0/gtk/gtkrecentchooserwidget.h \
+ /usr/include/gtk-2.0/gtk/gtkrecentfilter.h \
+ /usr/include/gtk-2.0/gtk/gtkrecentmanager.h \
/usr/include/gtk-2.0/gtk/gtkscrolledwindow.h \
/usr/include/gtk-2.0/gtk/gtkviewport.h \
/usr/include/gtk-2.0/gtk/gtkseparatormenuitem.h \
@@ -392,15 +425,14 @@ interface.o interface.o: interface.c ../config.h /usr/include/sys/types.h \
/usr/include/gtk-2.0/gtk/gtksizegroup.h \
/usr/include/gtk-2.0/gtk/gtkspinbutton.h \
/usr/include/gtk-2.0/gtk/gtkstatusbar.h \
+ /usr/include/gtk-2.0/gtk/gtkstatusicon.h \
/usr/include/gtk-2.0/gtk/gtkstock.h /usr/include/gtk-2.0/gtk/gtktable.h \
/usr/include/gtk-2.0/gtk/gtktearoffmenuitem.h \
/usr/include/gtk-2.0/gtk/gtktext.h \
/usr/include/gtk-2.0/gtk/gtktextbuffer.h \
/usr/include/gtk-2.0/gtk/gtktexttagtable.h \
- /usr/include/gtk-2.0/gtk/gtktexttag.h \
- /usr/include/gtk-2.0/gtk/gtktextiter.h \
- /usr/include/gtk-2.0/gtk/gtktextchild.h \
/usr/include/gtk-2.0/gtk/gtktextmark.h \
+ /usr/include/gtk-2.0/gtk/gtktextbufferrichtext.h \
/usr/include/gtk-2.0/gtk/gtktextview.h \
/usr/include/gtk-2.0/gtk/gtktipsquery.h \
/usr/include/gtk-2.0/gtk/gtktoggletoolbutton.h \
@@ -425,7 +457,6 @@ interface.o interface.o: interface.c ../config.h /usr/include/sys/types.h \
/usr/include/libgnomecanvas-2.0/libgnomecanvas/gnome-canvas.h \
/usr/include/libart-2.0/libart_lgpl/art_misc.h /usr/include/alloca.h \
/usr/include/libart-2.0/libart_lgpl/art_config.h \
- /usr/include/multiarch-i386-linux/libart-2.0/libart_lgpl/art_config.h \
/usr/include/libart-2.0/libart_lgpl/art_rect.h \
/usr/include/libart-2.0/libart_lgpl/art_svp.h \
/usr/include/libart-2.0/libart_lgpl/art_point.h \
@@ -472,6 +503,9 @@ interface.o interface.o: interface.c ../config.h /usr/include/sys/types.h \
/usr/include/libgnomecanvas-2.0/libgnomecanvas/gnome-canvas-util.h \
/usr/include/libart-2.0/libart_lgpl/art_vpath.h \
/usr/include/libart-2.0/libart_lgpl/art_svp_vpath_stroke.h \
+ /usr/include/libgnomecanvas-2.0/libgnomecanvas/gnome-canvas-clipgroup.h \
+ /usr/include/libart-2.0/libart_lgpl/art_svp_wind.h \
+ /usr/include/libart-2.0/libart_lgpl/art_vpath_dash.h \
/usr/include/libgnomeui-2.0/libgnomeui/libgnomeui.h \
/usr/include/libgnomeui-2.0/libgnomeui/gnome-uidefs.h \
/usr/include/gtk-2.0/gdk/gdkkeysyms.h \
@@ -498,9 +532,10 @@ interface.o interface.o: interface.c ../config.h /usr/include/sys/types.h \
/usr/include/libgnomeui-2.0/libgnomeui/gnome-icon-lookup.h \
/usr/include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-file-info.h \
/usr/include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-file-size.h \
- /usr/include/multiarch-i386-linux/gnome-vfs-2.0/libgnomevfs/gnome-vfs-file-size.h \
/usr/include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-result.h \
/usr/include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-uri.h \
+ /usr/include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-acl.h \
+ /usr/include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-ace.h \
/usr/include/libgnomeui-2.0/libgnomeui/gnome-stock-icons.h \
/usr/include/libgnomeui-2.0/libgnomeui/gnome-scores.h \
/usr/include/libgnomeui-2.0/libgnomeui/gnome-client.h \
@@ -545,15 +580,15 @@ interface.o interface.o: interface.c ../config.h /usr/include/sys/types.h \
/usr/include/bits/fcntl.h /usr/include/sys/wait.h /usr/include/signal.h \
/usr/include/bits/signum.h /usr/include/bits/siginfo.h \
/usr/include/bits/sigaction.h /usr/include/bits/sigcontext.h \
- /usr/include/asm/sigcontext.h /usr/include/linux/compiler.h \
- /usr/include/bits/sigstack.h /usr/include/bits/sigthread.h \
- /usr/include/sys/resource.h /usr/include/bits/resource.h \
- /usr/include/bits/waitflags.h /usr/include/bits/waitstatus.h \
- /usr/include/pcre/pcre.h eggtrayicon.h /usr/include/gtk-2.0/gdk/gdkx.h \
- /usr/include/gtk-2.0/gdk/gdkprivate.h /usr/X11R6/include/X11/Xlib.h \
- /usr/X11R6/include/X11/X.h /usr/X11R6/include/X11/Xfuncproto.h \
- /usr/X11R6/include/X11/Xosdefs.h /usr/X11R6/include/X11/Xutil.h \
- interface.h support.h
+ /usr/include/asm/sigcontext.h /usr/include/bits/sigstack.h \
+ /usr/include/bits/sigthread.h /usr/include/sys/resource.h \
+ /usr/include/bits/resource.h /usr/include/bits/waitflags.h \
+ /usr/include/bits/waitstatus.h /usr/include/pcre.h eggtrayicon.h \
+ /usr/include/gtk-2.0/gdk/gdkx.h /usr/include/gtk-2.0/gdk/gdkprivate.h \
+ /usr/include/X11/Xlib.h /usr/include/X11/X.h \
+ /usr/include/X11/Xfuncproto.h /usr/include/X11/Xosdefs.h \
+ /usr/include/X11/Xutil.h /usr/include/X11/keysym.h \
+ /usr/include/X11/keysymdef.h interface.h support.h
../config.h:
@@ -563,13 +598,15 @@ interface.o interface.o: interface.c ../config.h /usr/include/sys/types.h \
/usr/include/sys/cdefs.h:
+/usr/include/bits/wordsize.h:
+
/usr/include/gnu/stubs.h:
-/usr/include/bits/types.h:
+/usr/include/gnu/stubs-32.h:
-/usr/include/bits/wordsize.h:
+/usr/include/bits/types.h:
-/usr/lib/gcc/i586-mandrake-linux-gnu/3.4.3/include/stddef.h:
+/usr/lib/gcc/i686-pc-linux-gnu/4.1.1/include/stddef.h:
/usr/include/bits/typesizes.h:
@@ -591,8 +628,6 @@ interface.o interface.o: interface.c ../config.h /usr/include/sys/types.h \
/usr/include/bits/pthreadtypes.h:
-/usr/include/bits/sched.h:
-
/usr/include/sys/stat.h:
/usr/include/bits/stat.h:
@@ -625,7 +660,7 @@ interface.o interface.o: interface.c ../config.h /usr/include/sys/types.h \
/usr/include/gconv.h:
-/usr/lib/gcc/i586-mandrake-linux-gnu/3.4.3/include/stdarg.h:
+/usr/lib/gcc/i686-pc-linux-gnu/4.1.1/include/stdarg.h:
/usr/include/bits/stdio_lim.h:
@@ -659,9 +694,9 @@ interface.o interface.o: interface.c ../config.h /usr/include/sys/types.h \
/usr/lib/glib-2.0/include/glibconfig.h:
-/usr/lib/gcc/i586-mandrake-linux-gnu/3.4.3/include/limits.h:
+/usr/lib/gcc/i686-pc-linux-gnu/4.1.1/include/limits.h:
-/usr/lib/gcc/i586-mandrake-linux-gnu/3.4.3/include/syslimits.h:
+/usr/lib/gcc/i686-pc-linux-gnu/4.1.1/include/syslimits.h:
/usr/include/limits.h:
@@ -673,7 +708,7 @@ interface.o interface.o: interface.c ../config.h /usr/include/sys/types.h \
/usr/include/bits/posix2_lim.h:
-/usr/lib/gcc/i586-mandrake-linux-gnu/3.4.3/include/float.h:
+/usr/lib/gcc/i686-pc-linux-gnu/4.1.1/include/float.h:
/usr/include/glib-2.0/glib/garray.h:
@@ -689,12 +724,18 @@ interface.o interface.o: interface.c ../config.h /usr/include/sys/types.h \
/usr/include/glib-2.0/glib/gbacktrace.h:
+/usr/include/glib-2.0/glib/gbase64.h:
+
+/usr/include/glib-2.0/glib/gbookmarkfile.h:
+
/usr/include/glib-2.0/glib/gcache.h:
/usr/include/glib-2.0/glib/glist.h:
/usr/include/glib-2.0/glib/gmem.h:
+/usr/include/glib-2.0/glib/gslice.h:
+
/usr/include/glib-2.0/glib/gcompletion.h:
/usr/include/glib-2.0/glib/gconvert.h:
@@ -725,6 +766,8 @@ interface.o interface.o: interface.c ../config.h /usr/include/sys/types.h \
/usr/include/glib-2.0/glib/gkeyfile.h:
+/usr/include/glib-2.0/glib/gmappedfile.h:
+
/usr/include/glib-2.0/glib/gmarkup.h:
/usr/include/glib-2.0/glib/gmessages.h:
@@ -797,10 +840,6 @@ interface.o interface.o: interface.c ../config.h /usr/include/sys/types.h \
/usr/include/orbit-2.0/orbit/orbit-config.h:
-/usr/include/multiarch-dispatch.h:
-
-/usr/include/multiarch-i386-linux/orbit-2.0/orbit/orbit-config.h:
-
/usr/include/orbit-2.0/orbit/util/basic_types.h:
/usr/include/orbit-2.0/orbit/util/orbit-genrand.h:
@@ -907,8 +946,12 @@ interface.o interface.o: interface.c ../config.h /usr/include/sys/types.h \
/usr/include/libbonobo-2.0/bonobo/bonobo-item-container.h:
+/usr/include/libbonobo-2.0/bonobo/bonobo-item-handler.h:
+
/usr/include/libbonobo-2.0/bonobo/bonobo-moniker-util.h:
+/usr/include/libbonobo-2.0/bonobo/bonobo-moniker-extender.h:
+
/usr/include/libbonobo-2.0/bonobo/bonobo-property-bag.h:
/usr/include/libbonobo-2.0/bonobo/bonobo-event-source.h:
@@ -927,6 +970,8 @@ interface.o interface.o: interface.c ../config.h /usr/include/sys/types.h \
/usr/include/bits/locale.h:
+/usr/include/libbonobo-2.0/bonobo/bonobo-shlib-factory.h:
+
/usr/include/libbonobo-2.0/bonobo/bonobo-main.h:
/usr/include/libbonobo-2.0/bonobo/bonobo-stream.h:
@@ -955,8 +1000,14 @@ interface.o interface.o: interface.c ../config.h /usr/include/sys/types.h \
/usr/include/gtk-2.0/gdk/gdk.h:
+/usr/include/gtk-2.0/gdk/gdkcairo.h:
+
/usr/include/gtk-2.0/gdk/gdkcolor.h:
+/usr/include/cairo/cairo.h:
+
+/usr/include/cairo/cairo-features.h:
+
/usr/include/gtk-2.0/gdk/gdktypes.h:
/usr/include/pango-1.0/pango/pango.h:
@@ -997,7 +1048,9 @@ interface.o interface.o: interface.c ../config.h /usr/include/sys/types.h \
/usr/lib/gtk-2.0/include/gdkconfig.h:
-/usr/include/gtk-2.0/gdk/gdkcursor.h:
+/usr/include/gtk-2.0/gdk/gdkpixbuf.h:
+
+/usr/include/gtk-2.0/gdk/gdkrgb.h:
/usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf.h:
@@ -1009,6 +1062,8 @@ interface.o interface.o: interface.c ../config.h /usr/include/sys/types.h \
/usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-animation.h:
+/usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-simple-anim.h:
+
/usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-io.h:
/usr/include/glib-2.0/gmodule.h:
@@ -1017,6 +1072,10 @@ interface.o interface.o: interface.c ../config.h /usr/include/sys/types.h \
/usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-enum-types.h:
+/usr/include/pango-1.0/pango/pangocairo.h:
+
+/usr/include/gtk-2.0/gdk/gdkcursor.h:
+
/usr/include/gtk-2.0/gdk/gdkdisplay.h:
/usr/include/gtk-2.0/gdk/gdkevents.h:
@@ -1029,8 +1088,6 @@ interface.o interface.o: interface.c ../config.h /usr/include/sys/types.h \
/usr/include/gtk-2.0/gdk/gdkgc.h:
-/usr/include/gtk-2.0/gdk/gdkrgb.h:
-
/usr/include/gtk-2.0/gdk/gdkenumtypes.h:
/usr/include/gtk-2.0/gdk/gdkfont.h:
@@ -1043,8 +1100,6 @@ interface.o interface.o: interface.c ../config.h /usr/include/sys/types.h \
/usr/include/gtk-2.0/gdk/gdkpango.h:
-/usr/include/gtk-2.0/gdk/gdkpixbuf.h:
-
/usr/include/gtk-2.0/gdk/gdkpixmap.h:
/usr/include/gtk-2.0/gdk/gdkproperty.h:
@@ -1177,6 +1232,8 @@ interface.o interface.o: interface.c ../config.h /usr/include/sys/types.h \
/usr/include/atk-1.0/atk/atkhyperlink.h:
+/usr/include/atk-1.0/atk/atkhyperlinkimpl.h:
+
/usr/include/atk-1.0/atk/atkhypertext.h:
/usr/include/atk-1.0/atk/atkimage.h:
@@ -1219,6 +1276,8 @@ interface.o interface.o: interface.c ../config.h /usr/include/sys/types.h \
/usr/include/gtk-2.0/gtk/gtkframe.h:
+/usr/include/gtk-2.0/gtk/gtkassistant.h:
+
/usr/include/gtk-2.0/gtk/gtkbbox.h:
/usr/include/gtk-2.0/gtk/gtkbox.h:
@@ -1247,6 +1306,10 @@ interface.o interface.o: interface.c ../config.h /usr/include/sys/types.h \
/usr/include/gtk-2.0/gtk/gtktreesortable.h:
+/usr/include/gtk-2.0/gtk/gtkcellrendereraccel.h:
+
+/usr/include/gtk-2.0/gtk/gtkcellrenderertext.h:
+
/usr/include/gtk-2.0/gtk/gtkcellrenderercombo.h:
/usr/include/gtk-2.0/gtk/gtkcellrenderertext.h:
@@ -1255,6 +1318,8 @@ interface.o interface.o: interface.c ../config.h /usr/include/sys/types.h \
/usr/include/gtk-2.0/gtk/gtkcellrendererprogress.h:
+/usr/include/gtk-2.0/gtk/gtkcellrendererspin.h:
+
/usr/include/gtk-2.0/gtk/gtkcellrenderertoggle.h:
/usr/include/gtk-2.0/gtk/gtkcellview.h:
@@ -1273,6 +1338,12 @@ interface.o interface.o: interface.c ../config.h /usr/include/sys/types.h \
/usr/include/gtk-2.0/gtk/gtkselection.h:
+/usr/include/gtk-2.0/gtk/gtktextiter.h:
+
+/usr/include/gtk-2.0/gtk/gtktexttag.h:
+
+/usr/include/gtk-2.0/gtk/gtktextchild.h:
+
/usr/include/gtk-2.0/gtk/gtkclist.h:
/usr/include/gtk-2.0/gtk/gtkhscrollbar.h:
@@ -1301,18 +1372,10 @@ interface.o interface.o: interface.c ../config.h /usr/include/sys/types.h \
/usr/include/gtk-2.0/gtk/gtkdnd.h:
-/usr/include/gtk-2.0/gtk/gtkcomboboxentry.h:
-
-/usr/include/gtk-2.0/gtk/gtkctree.h:
-
-/usr/include/gtk-2.0/gtk/gtkcurve.h:
-
-/usr/include/gtk-2.0/gtk/gtkdrawingarea.h:
+/usr/include/gtk-2.0/gtk/gtkentry.h:
/usr/include/gtk-2.0/gtk/gtkeditable.h:
-/usr/include/gtk-2.0/gtk/gtkentry.h:
-
/usr/include/gtk-2.0/gtk/gtkimcontext.h:
/usr/include/gtk-2.0/gtk/gtkentrycompletion.h:
@@ -1321,6 +1384,14 @@ interface.o interface.o: interface.c ../config.h /usr/include/sys/types.h \
/usr/include/gtk-2.0/gtk/gtktreemodelfilter.h:
+/usr/include/gtk-2.0/gtk/gtkcomboboxentry.h:
+
+/usr/include/gtk-2.0/gtk/gtkctree.h:
+
+/usr/include/gtk-2.0/gtk/gtkcurve.h:
+
+/usr/include/gtk-2.0/gtk/gtkdrawingarea.h:
+
/usr/include/gtk-2.0/gtk/gtkeventbox.h:
/usr/include/gtk-2.0/gtk/gtkexpander.h:
@@ -1387,6 +1458,8 @@ interface.o interface.o: interface.c ../config.h /usr/include/sys/types.h \
/usr/include/gtk-2.0/gtk/gtklayout.h:
+/usr/include/gtk-2.0/gtk/gtklinkbutton.h:
+
/usr/include/gtk-2.0/gtk/gtklist.h:
/usr/include/gtk-2.0/gtk/gtklistitem.h:
@@ -1419,6 +1492,24 @@ interface.o interface.o: interface.c ../config.h /usr/include/sys/types.h \
/usr/include/gtk-2.0/gtk/gtkpreview.h:
+/usr/include/gtk-2.0/gtk/gtkprintoperation.h:
+
+/usr/include/gtk-2.0/gtk/gtkmain.h:
+
+/usr/include/gtk-2.0/gtk/gtkenums.h:
+
+/usr/include/gtk-2.0/gtk/gtkwindow.h:
+
+/usr/include/gtk-2.0/gtk/gtkpagesetup.h:
+
+/usr/include/gtk-2.0/gtk/gtkpapersize.h:
+
+/usr/include/gtk-2.0/gtk/gtkprintsettings.h:
+
+/usr/include/gtk-2.0/gtk/gtkprintcontext.h:
+
+/usr/include/gtk-2.0/gtk/gtkprintoperationpreview.h:
+
/usr/include/gtk-2.0/gtk/gtkprogress.h:
/usr/include/gtk-2.0/gtk/gtkprogressbar.h:
@@ -1437,6 +1528,24 @@ interface.o interface.o: interface.c ../config.h /usr/include/sys/types.h \
/usr/include/gtk-2.0/gtk/gtktoolbutton.h:
+/usr/include/gtk-2.0/gtk/gtkrecentchooser.h:
+
+/usr/include/gtk-2.0/gtk/gtkrecentmanager.h:
+
+/usr/include/gtk-2.0/gtk/gtkrecentfilter.h:
+
+/usr/include/gtk-2.0/gtk/gtkrecentchooserdialog.h:
+
+/usr/include/gtk-2.0/gtk/gtkrecentchooser.h:
+
+/usr/include/gtk-2.0/gtk/gtkrecentchoosermenu.h:
+
+/usr/include/gtk-2.0/gtk/gtkrecentchooserwidget.h:
+
+/usr/include/gtk-2.0/gtk/gtkrecentfilter.h:
+
+/usr/include/gtk-2.0/gtk/gtkrecentmanager.h:
+
/usr/include/gtk-2.0/gtk/gtkscrolledwindow.h:
/usr/include/gtk-2.0/gtk/gtkviewport.h:
@@ -1451,6 +1560,8 @@ interface.o interface.o: interface.c ../config.h /usr/include/sys/types.h \
/usr/include/gtk-2.0/gtk/gtkstatusbar.h:
+/usr/include/gtk-2.0/gtk/gtkstatusicon.h:
+
/usr/include/gtk-2.0/gtk/gtkstock.h:
/usr/include/gtk-2.0/gtk/gtktable.h:
@@ -1463,14 +1574,10 @@ interface.o interface.o: interface.c ../config.h /usr/include/sys/types.h \
/usr/include/gtk-2.0/gtk/gtktexttagtable.h:
-/usr/include/gtk-2.0/gtk/gtktexttag.h:
-
-/usr/include/gtk-2.0/gtk/gtktextiter.h:
-
-/usr/include/gtk-2.0/gtk/gtktextchild.h:
-
/usr/include/gtk-2.0/gtk/gtktextmark.h:
+/usr/include/gtk-2.0/gtk/gtktextbufferrichtext.h:
+
/usr/include/gtk-2.0/gtk/gtktextview.h:
/usr/include/gtk-2.0/gtk/gtktipsquery.h:
@@ -1521,8 +1628,6 @@ interface.o interface.o: interface.c ../config.h /usr/include/sys/types.h \
/usr/include/libart-2.0/libart_lgpl/art_config.h:
-/usr/include/multiarch-i386-linux/libart-2.0/libart_lgpl/art_config.h:
-
/usr/include/libart-2.0/libart_lgpl/art_rect.h:
/usr/include/libart-2.0/libart_lgpl/art_svp.h:
@@ -1615,6 +1720,12 @@ interface.o interface.o: interface.c ../config.h /usr/include/sys/types.h \
/usr/include/libart-2.0/libart_lgpl/art_svp_vpath_stroke.h:
+/usr/include/libgnomecanvas-2.0/libgnomecanvas/gnome-canvas-clipgroup.h:
+
+/usr/include/libart-2.0/libart_lgpl/art_svp_wind.h:
+
+/usr/include/libart-2.0/libart_lgpl/art_vpath_dash.h:
+
/usr/include/libgnomeui-2.0/libgnomeui/libgnomeui.h:
/usr/include/libgnomeui-2.0/libgnomeui/gnome-uidefs.h:
@@ -1667,12 +1778,14 @@ interface.o interface.o: interface.c ../config.h /usr/include/sys/types.h \
/usr/include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-file-size.h:
-/usr/include/multiarch-i386-linux/gnome-vfs-2.0/libgnomevfs/gnome-vfs-file-size.h:
-
/usr/include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-result.h:
/usr/include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-uri.h:
+/usr/include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-acl.h:
+
+/usr/include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-ace.h:
+
/usr/include/libgnomeui-2.0/libgnomeui/gnome-stock-icons.h:
/usr/include/libgnomeui-2.0/libgnomeui/gnome-scores.h:
@@ -1775,8 +1888,6 @@ callbacks.h:
/usr/include/asm/sigcontext.h:
-/usr/include/linux/compiler.h:
-
/usr/include/bits/sigstack.h:
/usr/include/bits/sigthread.h:
@@ -1789,7 +1900,7 @@ callbacks.h:
/usr/include/bits/waitstatus.h:
-/usr/include/pcre/pcre.h:
+/usr/include/pcre.h:
eggtrayicon.h:
@@ -1797,15 +1908,19 @@ eggtrayicon.h:
/usr/include/gtk-2.0/gdk/gdkprivate.h:
-/usr/X11R6/include/X11/Xlib.h:
+/usr/include/X11/Xlib.h:
+
+/usr/include/X11/X.h:
+
+/usr/include/X11/Xfuncproto.h:
-/usr/X11R6/include/X11/X.h:
+/usr/include/X11/Xosdefs.h:
-/usr/X11R6/include/X11/Xfuncproto.h:
+/usr/include/X11/Xutil.h:
-/usr/X11R6/include/X11/Xosdefs.h:
+/usr/include/X11/keysym.h:
-/usr/X11R6/include/X11/Xutil.h:
+/usr/include/X11/keysymdef.h:
interface.h:
diff --git a/projects/gvpndialer/trunk/src/.deps/main.Po b/projects/gvpndialer/trunk/src/.deps/main.Po
index 92d12c9..be43da8 100644
--- a/projects/gvpndialer/trunk/src/.deps/main.Po
+++ b/projects/gvpndialer/trunk/src/.deps/main.Po
@@ -1,26 +1,33 @@
main.o main.o: main.c ../config.h /usr/include/libgnomeui-2.0/gnome.h \
/usr/include/gtk-2.0/gtk/gtk.h /usr/include/gtk-2.0/gdk/gdk.h \
- /usr/include/gtk-2.0/gdk/gdkcolor.h /usr/include/gtk-2.0/gdk/gdktypes.h \
- /usr/include/glib-2.0/glib.h /usr/include/glib-2.0/glib/galloca.h \
+ /usr/include/gtk-2.0/gdk/gdkcairo.h /usr/include/gtk-2.0/gdk/gdkcolor.h \
+ /usr/include/cairo/cairo.h /usr/include/cairo/cairo-features.h \
+ /usr/include/gtk-2.0/gdk/gdktypes.h /usr/include/glib-2.0/glib.h \
+ /usr/include/glib-2.0/glib/galloca.h \
/usr/include/glib-2.0/glib/gtypes.h \
/usr/lib/glib-2.0/include/glibconfig.h \
/usr/include/glib-2.0/glib/gmacros.h \
- /usr/lib/gcc/i586-mandrake-linux-gnu/3.4.3/include/stddef.h \
- /usr/lib/gcc/i586-mandrake-linux-gnu/3.4.3/include/limits.h \
- /usr/lib/gcc/i586-mandrake-linux-gnu/3.4.3/include/syslimits.h \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.1.1/include/stddef.h \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.1.1/include/limits.h \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.1.1/include/syslimits.h \
/usr/include/limits.h /usr/include/features.h /usr/include/sys/cdefs.h \
- /usr/include/gnu/stubs.h /usr/include/bits/posix1_lim.h \
+ /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h \
+ /usr/include/gnu/stubs-32.h /usr/include/bits/posix1_lim.h \
/usr/include/bits/local_lim.h /usr/include/linux/limits.h \
/usr/include/bits/posix2_lim.h \
- /usr/lib/gcc/i586-mandrake-linux-gnu/3.4.3/include/float.h \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.1.1/include/float.h \
/usr/include/glib-2.0/glib/garray.h \
/usr/include/glib-2.0/glib/gasyncqueue.h \
/usr/include/glib-2.0/glib/gthread.h \
/usr/include/glib-2.0/glib/gerror.h /usr/include/glib-2.0/glib/gquark.h \
/usr/include/glib-2.0/glib/gatomic.h \
/usr/include/glib-2.0/glib/gbacktrace.h \
- /usr/include/glib-2.0/glib/gcache.h /usr/include/glib-2.0/glib/glist.h \
- /usr/include/glib-2.0/glib/gmem.h \
+ /usr/include/glib-2.0/glib/gbase64.h \
+ /usr/include/glib-2.0/glib/gbookmarkfile.h /usr/include/time.h \
+ /usr/include/bits/time.h /usr/include/bits/types.h \
+ /usr/include/bits/typesizes.h /usr/include/glib-2.0/glib/gcache.h \
+ /usr/include/glib-2.0/glib/glist.h /usr/include/glib-2.0/glib/gmem.h \
+ /usr/include/glib-2.0/glib/gslice.h \
/usr/include/glib-2.0/glib/gcompletion.h \
/usr/include/glib-2.0/glib/gconvert.h \
/usr/include/glib-2.0/glib/gdataset.h \
@@ -32,8 +39,9 @@ main.o main.o: main.c ../config.h /usr/include/libgnomeui-2.0/gnome.h \
/usr/include/glib-2.0/glib/gstring.h \
/usr/include/glib-2.0/glib/gunicode.h \
/usr/include/glib-2.0/glib/gutils.h \
- /usr/lib/gcc/i586-mandrake-linux-gnu/3.4.3/include/stdarg.h \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.1.1/include/stdarg.h \
/usr/include/glib-2.0/glib/gkeyfile.h \
+ /usr/include/glib-2.0/glib/gmappedfile.h \
/usr/include/glib-2.0/glib/gmarkup.h \
/usr/include/glib-2.0/glib/gmessages.h \
/usr/include/glib-2.0/glib/gnode.h /usr/include/glib-2.0/glib/goption.h \
@@ -81,32 +89,31 @@ main.o main.o: main.c ../config.h /usr/include/libgnomeui-2.0/gnome.h \
/usr/include/pango-1.0/pango/pango-tabs.h \
/usr/include/pango-1.0/pango/pango-renderer.h \
/usr/lib/gtk-2.0/include/gdkconfig.h \
- /usr/include/gtk-2.0/gdk/gdkcursor.h \
+ /usr/include/gtk-2.0/gdk/gdkpixbuf.h /usr/include/gtk-2.0/gdk/gdkrgb.h \
/usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf.h \
/usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-features.h \
/usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-core.h \
/usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-transform.h \
/usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-animation.h \
+ /usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-simple-anim.h \
/usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-io.h /usr/include/stdio.h \
- /usr/include/bits/types.h /usr/include/bits/wordsize.h \
- /usr/include/bits/typesizes.h /usr/include/libio.h \
- /usr/include/_G_config.h /usr/include/wchar.h /usr/include/bits/wchar.h \
- /usr/include/gconv.h /usr/include/bits/stdio_lim.h \
- /usr/include/bits/sys_errlist.h /usr/include/bits/stdio.h \
- /usr/include/glib-2.0/gmodule.h \
+ /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \
+ /usr/include/bits/wchar.h /usr/include/gconv.h \
+ /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \
+ /usr/include/bits/stdio.h /usr/include/glib-2.0/gmodule.h \
/usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-loader.h \
/usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-enum-types.h \
+ /usr/include/pango-1.0/pango/pangocairo.h \
+ /usr/include/gtk-2.0/gdk/gdkcursor.h \
/usr/include/gtk-2.0/gdk/gdkdisplay.h \
/usr/include/gtk-2.0/gdk/gdkevents.h /usr/include/gtk-2.0/gdk/gdkdnd.h \
/usr/include/gtk-2.0/gdk/gdkinput.h \
/usr/include/gtk-2.0/gdk/gdkdrawable.h /usr/include/gtk-2.0/gdk/gdkgc.h \
- /usr/include/gtk-2.0/gdk/gdkrgb.h \
/usr/include/gtk-2.0/gdk/gdkenumtypes.h \
/usr/include/gtk-2.0/gdk/gdkfont.h /usr/include/gtk-2.0/gdk/gdkimage.h \
/usr/include/gtk-2.0/gdk/gdkkeys.h \
/usr/include/gtk-2.0/gdk/gdkdisplaymanager.h \
/usr/include/gtk-2.0/gdk/gdkpango.h \
- /usr/include/gtk-2.0/gdk/gdkpixbuf.h \
/usr/include/gtk-2.0/gdk/gdkpixmap.h \
/usr/include/gtk-2.0/gdk/gdkproperty.h \
/usr/include/gtk-2.0/gdk/gdkregion.h \
@@ -146,6 +153,7 @@ main.o main.o: main.c ../config.h /usr/include/libgnomeui-2.0/gnome.h \
/usr/include/atk-1.0/atk/atktext.h \
/usr/include/atk-1.0/atk/atkgobjectaccessible.h \
/usr/include/atk-1.0/atk/atkhyperlink.h \
+ /usr/include/atk-1.0/atk/atkhyperlinkimpl.h \
/usr/include/atk-1.0/atk/atkhypertext.h \
/usr/include/atk-1.0/atk/atkimage.h \
/usr/include/atk-1.0/atk/atknoopobject.h \
@@ -165,8 +173,9 @@ main.o main.o: main.c ../config.h /usr/include/libgnomeui-2.0/gnome.h \
/usr/include/gtk-2.0/gtk/gtkalignment.h \
/usr/include/gtk-2.0/gtk/gtkarrow.h \
/usr/include/gtk-2.0/gtk/gtkaspectframe.h \
- /usr/include/gtk-2.0/gtk/gtkframe.h /usr/include/gtk-2.0/gtk/gtkbbox.h \
- /usr/include/gtk-2.0/gtk/gtkbox.h \
+ /usr/include/gtk-2.0/gtk/gtkframe.h \
+ /usr/include/gtk-2.0/gtk/gtkassistant.h \
+ /usr/include/gtk-2.0/gtk/gtkbbox.h /usr/include/gtk-2.0/gtk/gtkbox.h \
/usr/include/gtk-2.0/gtk/gtkbindings.h \
/usr/include/gtk-2.0/gtk/gtkbutton.h \
/usr/include/gtk-2.0/gtk/gtkimage.h \
@@ -179,10 +188,13 @@ main.o main.o: main.c ../config.h /usr/include/libgnomeui-2.0/gnome.h \
/usr/include/gtk-2.0/gtk/gtktreeviewcolumn.h \
/usr/include/gtk-2.0/gtk/gtktreemodel.h \
/usr/include/gtk-2.0/gtk/gtktreesortable.h \
+ /usr/include/gtk-2.0/gtk/gtkcellrendereraccel.h \
+ /usr/include/gtk-2.0/gtk/gtkcellrenderertext.h \
/usr/include/gtk-2.0/gtk/gtkcellrenderercombo.h \
/usr/include/gtk-2.0/gtk/gtkcellrenderertext.h \
/usr/include/gtk-2.0/gtk/gtkcellrendererpixbuf.h \
/usr/include/gtk-2.0/gtk/gtkcellrendererprogress.h \
+ /usr/include/gtk-2.0/gtk/gtkcellrendererspin.h \
/usr/include/gtk-2.0/gtk/gtkcellrenderertoggle.h \
/usr/include/gtk-2.0/gtk/gtkcellview.h \
/usr/include/gtk-2.0/gtk/gtkcheckbutton.h \
@@ -192,6 +204,9 @@ main.o main.o: main.c ../config.h /usr/include/libgnomeui-2.0/gnome.h \
/usr/include/gtk-2.0/gtk/gtkitem.h \
/usr/include/gtk-2.0/gtk/gtkclipboard.h \
/usr/include/gtk-2.0/gtk/gtkselection.h \
+ /usr/include/gtk-2.0/gtk/gtktextiter.h \
+ /usr/include/gtk-2.0/gtk/gtktexttag.h \
+ /usr/include/gtk-2.0/gtk/gtktextchild.h \
/usr/include/gtk-2.0/gtk/gtkclist.h \
/usr/include/gtk-2.0/gtk/gtkhscrollbar.h \
/usr/include/gtk-2.0/gtk/gtkscrollbar.h \
@@ -204,16 +219,15 @@ main.o main.o: main.c ../config.h /usr/include/libgnomeui-2.0/gnome.h \
/usr/include/gtk-2.0/gtk/gtkcombo.h /usr/include/gtk-2.0/gtk/gtkhbox.h \
/usr/include/gtk-2.0/gtk/gtkcombobox.h \
/usr/include/gtk-2.0/gtk/gtktreeview.h \
- /usr/include/gtk-2.0/gtk/gtkdnd.h \
- /usr/include/gtk-2.0/gtk/gtkcomboboxentry.h \
- /usr/include/gtk-2.0/gtk/gtkctree.h /usr/include/gtk-2.0/gtk/gtkcurve.h \
- /usr/include/gtk-2.0/gtk/gtkdrawingarea.h \
+ /usr/include/gtk-2.0/gtk/gtkdnd.h /usr/include/gtk-2.0/gtk/gtkentry.h \
/usr/include/gtk-2.0/gtk/gtkeditable.h \
- /usr/include/gtk-2.0/gtk/gtkentry.h \
/usr/include/gtk-2.0/gtk/gtkimcontext.h \
/usr/include/gtk-2.0/gtk/gtkentrycompletion.h \
/usr/include/gtk-2.0/gtk/gtkliststore.h \
/usr/include/gtk-2.0/gtk/gtktreemodelfilter.h \
+ /usr/include/gtk-2.0/gtk/gtkcomboboxentry.h \
+ /usr/include/gtk-2.0/gtk/gtkctree.h /usr/include/gtk-2.0/gtk/gtkcurve.h \
+ /usr/include/gtk-2.0/gtk/gtkdrawingarea.h \
/usr/include/gtk-2.0/gtk/gtkeventbox.h \
/usr/include/gtk-2.0/gtk/gtkexpander.h \
/usr/include/gtk-2.0/gtk/gtkfilesel.h \
@@ -245,7 +259,9 @@ main.o main.o: main.c ../config.h /usr/include/libgnomeui-2.0/gnome.h \
/usr/include/gtk-2.0/gtk/gtkimmulticontext.h \
/usr/include/gtk-2.0/gtk/gtkinputdialog.h \
/usr/include/gtk-2.0/gtk/gtkinvisible.h \
- /usr/include/gtk-2.0/gtk/gtklayout.h /usr/include/gtk-2.0/gtk/gtklist.h \
+ /usr/include/gtk-2.0/gtk/gtklayout.h \
+ /usr/include/gtk-2.0/gtk/gtklinkbutton.h \
+ /usr/include/gtk-2.0/gtk/gtklist.h \
/usr/include/gtk-2.0/gtk/gtklistitem.h \
/usr/include/gtk-2.0/gtk/gtkmain.h \
/usr/include/gtk-2.0/gtk/gtkmenubar.h \
@@ -262,6 +278,14 @@ main.o main.o: main.c ../config.h /usr/include/libgnomeui-2.0/gnome.h \
/usr/include/gtk-2.0/gtk/gtkpixmap.h /usr/include/gtk-2.0/gtk/gtkplug.h \
/usr/include/gtk-2.0/gtk/gtksocket.h \
/usr/include/gtk-2.0/gtk/gtkpreview.h \
+ /usr/include/gtk-2.0/gtk/gtkprintoperation.h \
+ /usr/include/gtk-2.0/gtk/gtkmain.h /usr/include/gtk-2.0/gtk/gtkenums.h \
+ /usr/include/gtk-2.0/gtk/gtkwindow.h \
+ /usr/include/gtk-2.0/gtk/gtkpagesetup.h \
+ /usr/include/gtk-2.0/gtk/gtkpapersize.h \
+ /usr/include/gtk-2.0/gtk/gtkprintsettings.h \
+ /usr/include/gtk-2.0/gtk/gtkprintcontext.h \
+ /usr/include/gtk-2.0/gtk/gtkprintoperationpreview.h \
/usr/include/gtk-2.0/gtk/gtkprogress.h \
/usr/include/gtk-2.0/gtk/gtkprogressbar.h \
/usr/include/gtk-2.0/gtk/gtkradioaction.h \
@@ -271,6 +295,15 @@ main.o main.o: main.c ../config.h /usr/include/libgnomeui-2.0/gnome.h \
/usr/include/gtk-2.0/gtk/gtkradiotoolbutton.h \
/usr/include/gtk-2.0/gtk/gtktoggletoolbutton.h \
/usr/include/gtk-2.0/gtk/gtktoolbutton.h \
+ /usr/include/gtk-2.0/gtk/gtkrecentchooser.h \
+ /usr/include/gtk-2.0/gtk/gtkrecentmanager.h \
+ /usr/include/gtk-2.0/gtk/gtkrecentfilter.h \
+ /usr/include/gtk-2.0/gtk/gtkrecentchooserdialog.h \
+ /usr/include/gtk-2.0/gtk/gtkrecentchooser.h \
+ /usr/include/gtk-2.0/gtk/gtkrecentchoosermenu.h \
+ /usr/include/gtk-2.0/gtk/gtkrecentchooserwidget.h \
+ /usr/include/gtk-2.0/gtk/gtkrecentfilter.h \
+ /usr/include/gtk-2.0/gtk/gtkrecentmanager.h \
/usr/include/gtk-2.0/gtk/gtkscrolledwindow.h \
/usr/include/gtk-2.0/gtk/gtkviewport.h \
/usr/include/gtk-2.0/gtk/gtkseparatormenuitem.h \
@@ -278,15 +311,14 @@ main.o main.o: main.c ../config.h /usr/include/libgnomeui-2.0/gnome.h \
/usr/include/gtk-2.0/gtk/gtksizegroup.h \
/usr/include/gtk-2.0/gtk/gtkspinbutton.h \
/usr/include/gtk-2.0/gtk/gtkstatusbar.h \
+ /usr/include/gtk-2.0/gtk/gtkstatusicon.h \
/usr/include/gtk-2.0/gtk/gtkstock.h /usr/include/gtk-2.0/gtk/gtktable.h \
/usr/include/gtk-2.0/gtk/gtktearoffmenuitem.h \
/usr/include/gtk-2.0/gtk/gtktext.h \
/usr/include/gtk-2.0/gtk/gtktextbuffer.h \
/usr/include/gtk-2.0/gtk/gtktexttagtable.h \
- /usr/include/gtk-2.0/gtk/gtktexttag.h \
- /usr/include/gtk-2.0/gtk/gtktextiter.h \
- /usr/include/gtk-2.0/gtk/gtktextchild.h \
/usr/include/gtk-2.0/gtk/gtktextmark.h \
+ /usr/include/gtk-2.0/gtk/gtktextbufferrichtext.h \
/usr/include/gtk-2.0/gtk/gtktextview.h \
/usr/include/gtk-2.0/gtk/gtktipsquery.h \
/usr/include/gtk-2.0/gtk/gtktoggletoolbutton.h \
@@ -307,10 +339,10 @@ main.o main.o: main.c ../config.h /usr/include/libgnomeui-2.0/gnome.h \
/usr/include/gtk-2.0/gtk/gtkvscale.h \
/usr/include/gtk-2.0/gtk/gtkvseparator.h \
/usr/include/libgnome-2.0/libgnome/libgnome.h \
- /usr/include/libgnome-2.0/libgnome/gnome-program.h /usr/include/popt.h \
- /usr/include/errno.h /usr/include/bits/errno.h \
- /usr/include/linux/errno.h /usr/include/asm/errno.h \
- /usr/include/asm-generic/errno.h /usr/include/asm-generic/errno-base.h \
+ /usr/include/libgnome-2.0/libgnome/gnome-program.h /usr/include/errno.h \
+ /usr/include/bits/errno.h /usr/include/linux/errno.h \
+ /usr/include/asm/errno.h /usr/include/asm-generic/errno.h \
+ /usr/include/asm-generic/errno-base.h /usr/include/popt.h \
/usr/include/libgnome-2.0/libgnome/gnome-i18n.h \
/usr/include/libbonobo-2.0/bonobo/bonobo-i18n.h /usr/include/libintl.h \
/usr/include/locale.h /usr/include/bits/locale.h \
@@ -322,22 +354,18 @@ main.o main.o: main.c ../config.h /usr/include/libgnomeui-2.0/gnome.h \
/usr/include/libbonobo-2.0/bonobo/bonobo-macros.h \
/usr/include/libgnome-2.0/libgnome/gnome-triggers.h \
/usr/include/libgnome-2.0/libgnome/gnome-sound.h \
- /usr/include/libgnome-2.0/libgnome/gnome-score.h /usr/include/time.h \
- /usr/include/bits/time.h \
+ /usr/include/libgnome-2.0/libgnome/gnome-score.h \
/usr/include/libgnome-2.0/libgnome/gnome-exec.h \
/usr/include/libgnome-2.0/libgnome/gnome-util.h /usr/include/stdlib.h \
/usr/include/sys/types.h /usr/include/endian.h \
/usr/include/bits/endian.h /usr/include/sys/select.h \
/usr/include/bits/select.h /usr/include/bits/sigset.h \
/usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h \
- /usr/include/bits/sched.h /usr/include/alloca.h \
- /usr/include/libgnome-2.0/libgnome/gnome-url.h \
+ /usr/include/alloca.h /usr/include/libgnome-2.0/libgnome/gnome-url.h \
/usr/include/libgnomecanvas-2.0/libgnomecanvas/libgnomecanvas.h \
/usr/include/libgnomecanvas-2.0/libgnomecanvas/gnome-canvas.h \
/usr/include/libart-2.0/libart_lgpl/art_misc.h \
/usr/include/libart-2.0/libart_lgpl/art_config.h \
- /usr/include/multiarch-dispatch.h \
- /usr/include/multiarch-i386-linux/libart-2.0/libart_lgpl/art_config.h \
/usr/include/libart-2.0/libart_lgpl/art_rect.h \
/usr/include/libart-2.0/libart_lgpl/art_svp.h \
/usr/include/libart-2.0/libart_lgpl/art_point.h \
@@ -358,6 +386,9 @@ main.o main.o: main.c ../config.h /usr/include/libgnomeui-2.0/gnome.h \
/usr/include/libgnomecanvas-2.0/libgnomecanvas/gnome-canvas-util.h \
/usr/include/libart-2.0/libart_lgpl/art_vpath.h \
/usr/include/libart-2.0/libart_lgpl/art_svp_vpath_stroke.h \
+ /usr/include/libgnomecanvas-2.0/libgnomecanvas/gnome-canvas-clipgroup.h \
+ /usr/include/libart-2.0/libart_lgpl/art_svp_wind.h \
+ /usr/include/libart-2.0/libart_lgpl/art_vpath_dash.h \
/usr/include/libgnomeui-2.0/libgnomeui/libgnomeui.h \
/usr/include/libgnomeui-2.0/libgnomeui/gnome-uidefs.h \
/usr/include/gtk-2.0/gdk/gdkkeysyms.h \
@@ -388,9 +419,10 @@ main.o main.o: main.c ../config.h /usr/include/libgnomeui-2.0/gnome.h \
/usr/include/libgnomeui-2.0/libgnomeui/gnome-icon-lookup.h \
/usr/include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-file-info.h \
/usr/include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-file-size.h \
- /usr/include/multiarch-i386-linux/gnome-vfs-2.0/libgnomevfs/gnome-vfs-file-size.h \
/usr/include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-result.h \
/usr/include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-uri.h \
+ /usr/include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-acl.h \
+ /usr/include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-ace.h \
/usr/include/sys/stat.h /usr/include/bits/stat.h \
/usr/include/libgnomeui-2.0/libgnomeui/gnome-stock-icons.h \
/usr/include/libgnomeui-2.0/libgnomeui/gnome-scores.h \
@@ -428,9 +460,10 @@ main.o main.o: main.c ../config.h /usr/include/libgnomeui-2.0/gnome.h \
/usr/include/libgnomeui-2.0/libgnomeui/gnome-help.h \
/usr/include/libgnomeui-2.0/libgnomeui/gnome-url.h interface.h \
support.h eggtrayicon.h /usr/include/gtk-2.0/gdk/gdkx.h \
- /usr/include/gtk-2.0/gdk/gdkprivate.h /usr/X11R6/include/X11/Xlib.h \
- /usr/X11R6/include/X11/X.h /usr/X11R6/include/X11/Xfuncproto.h \
- /usr/X11R6/include/X11/Xosdefs.h /usr/X11R6/include/X11/Xutil.h \
+ /usr/include/gtk-2.0/gdk/gdkprivate.h /usr/include/X11/Xlib.h \
+ /usr/include/X11/X.h /usr/include/X11/Xfuncproto.h \
+ /usr/include/X11/Xosdefs.h /usr/include/X11/Xutil.h \
+ /usr/include/X11/keysym.h /usr/include/X11/keysymdef.h \
/usr/include/gconf/2/gconf/gconf-client.h \
/usr/include/gconf/2/gconf/gconf.h \
/usr/include/gconf/2/gconf/gconf-schema.h \
@@ -450,8 +483,14 @@ main.o main.o: main.c ../config.h /usr/include/libgnomeui-2.0/gnome.h \
/usr/include/gtk-2.0/gdk/gdk.h:
+/usr/include/gtk-2.0/gdk/gdkcairo.h:
+
/usr/include/gtk-2.0/gdk/gdkcolor.h:
+/usr/include/cairo/cairo.h:
+
+/usr/include/cairo/cairo-features.h:
+
/usr/include/gtk-2.0/gdk/gdktypes.h:
/usr/include/glib-2.0/glib.h:
@@ -464,11 +503,11 @@ main.o main.o: main.c ../config.h /usr/include/libgnomeui-2.0/gnome.h \
/usr/include/glib-2.0/glib/gmacros.h:
-/usr/lib/gcc/i586-mandrake-linux-gnu/3.4.3/include/stddef.h:
+/usr/lib/gcc/i686-pc-linux-gnu/4.1.1/include/stddef.h:
-/usr/lib/gcc/i586-mandrake-linux-gnu/3.4.3/include/limits.h:
+/usr/lib/gcc/i686-pc-linux-gnu/4.1.1/include/limits.h:
-/usr/lib/gcc/i586-mandrake-linux-gnu/3.4.3/include/syslimits.h:
+/usr/lib/gcc/i686-pc-linux-gnu/4.1.1/include/syslimits.h:
/usr/include/limits.h:
@@ -476,8 +515,12 @@ main.o main.o: main.c ../config.h /usr/include/libgnomeui-2.0/gnome.h \
/usr/include/sys/cdefs.h:
+/usr/include/bits/wordsize.h:
+
/usr/include/gnu/stubs.h:
+/usr/include/gnu/stubs-32.h:
+
/usr/include/bits/posix1_lim.h:
/usr/include/bits/local_lim.h:
@@ -486,7 +529,7 @@ main.o main.o: main.c ../config.h /usr/include/libgnomeui-2.0/gnome.h \
/usr/include/bits/posix2_lim.h:
-/usr/lib/gcc/i586-mandrake-linux-gnu/3.4.3/include/float.h:
+/usr/lib/gcc/i686-pc-linux-gnu/4.1.1/include/float.h:
/usr/include/glib-2.0/glib/garray.h:
@@ -502,12 +545,26 @@ main.o main.o: main.c ../config.h /usr/include/libgnomeui-2.0/gnome.h \
/usr/include/glib-2.0/glib/gbacktrace.h:
+/usr/include/glib-2.0/glib/gbase64.h:
+
+/usr/include/glib-2.0/glib/gbookmarkfile.h:
+
+/usr/include/time.h:
+
+/usr/include/bits/time.h:
+
+/usr/include/bits/types.h:
+
+/usr/include/bits/typesizes.h:
+
/usr/include/glib-2.0/glib/gcache.h:
/usr/include/glib-2.0/glib/glist.h:
/usr/include/glib-2.0/glib/gmem.h:
+/usr/include/glib-2.0/glib/gslice.h:
+
/usr/include/glib-2.0/glib/gcompletion.h:
/usr/include/glib-2.0/glib/gconvert.h:
@@ -536,10 +593,12 @@ main.o main.o: main.c ../config.h /usr/include/libgnomeui-2.0/gnome.h \
/usr/include/glib-2.0/glib/gutils.h:
-/usr/lib/gcc/i586-mandrake-linux-gnu/3.4.3/include/stdarg.h:
+/usr/lib/gcc/i686-pc-linux-gnu/4.1.1/include/stdarg.h:
/usr/include/glib-2.0/glib/gkeyfile.h:
+/usr/include/glib-2.0/glib/gmappedfile.h:
+
/usr/include/glib-2.0/glib/gmarkup.h:
/usr/include/glib-2.0/glib/gmessages.h:
@@ -644,7 +703,9 @@ main.o main.o: main.c ../config.h /usr/include/libgnomeui-2.0/gnome.h \
/usr/lib/gtk-2.0/include/gdkconfig.h:
-/usr/include/gtk-2.0/gdk/gdkcursor.h:
+/usr/include/gtk-2.0/gdk/gdkpixbuf.h:
+
+/usr/include/gtk-2.0/gdk/gdkrgb.h:
/usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf.h:
@@ -656,16 +717,12 @@ main.o main.o: main.c ../config.h /usr/include/libgnomeui-2.0/gnome.h \
/usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-animation.h:
+/usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-simple-anim.h:
+
/usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-io.h:
/usr/include/stdio.h:
-/usr/include/bits/types.h:
-
-/usr/include/bits/wordsize.h:
-
-/usr/include/bits/typesizes.h:
-
/usr/include/libio.h:
/usr/include/_G_config.h:
@@ -688,6 +745,10 @@ main.o main.o: main.c ../config.h /usr/include/libgnomeui-2.0/gnome.h \
/usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-enum-types.h:
+/usr/include/pango-1.0/pango/pangocairo.h:
+
+/usr/include/gtk-2.0/gdk/gdkcursor.h:
+
/usr/include/gtk-2.0/gdk/gdkdisplay.h:
/usr/include/gtk-2.0/gdk/gdkevents.h:
@@ -700,8 +761,6 @@ main.o main.o: main.c ../config.h /usr/include/libgnomeui-2.0/gnome.h \
/usr/include/gtk-2.0/gdk/gdkgc.h:
-/usr/include/gtk-2.0/gdk/gdkrgb.h:
-
/usr/include/gtk-2.0/gdk/gdkenumtypes.h:
/usr/include/gtk-2.0/gdk/gdkfont.h:
@@ -714,8 +773,6 @@ main.o main.o: main.c ../config.h /usr/include/libgnomeui-2.0/gnome.h \
/usr/include/gtk-2.0/gdk/gdkpango.h:
-/usr/include/gtk-2.0/gdk/gdkpixbuf.h:
-
/usr/include/gtk-2.0/gdk/gdkpixmap.h:
/usr/include/gtk-2.0/gdk/gdkproperty.h:
@@ -802,6 +859,8 @@ main.o main.o: main.c ../config.h /usr/include/libgnomeui-2.0/gnome.h \
/usr/include/atk-1.0/atk/atkhyperlink.h:
+/usr/include/atk-1.0/atk/atkhyperlinkimpl.h:
+
/usr/include/atk-1.0/atk/atkhypertext.h:
/usr/include/atk-1.0/atk/atkimage.h:
@@ -844,6 +903,8 @@ main.o main.o: main.c ../config.h /usr/include/libgnomeui-2.0/gnome.h \
/usr/include/gtk-2.0/gtk/gtkframe.h:
+/usr/include/gtk-2.0/gtk/gtkassistant.h:
+
/usr/include/gtk-2.0/gtk/gtkbbox.h:
/usr/include/gtk-2.0/gtk/gtkbox.h:
@@ -872,6 +933,10 @@ main.o main.o: main.c ../config.h /usr/include/libgnomeui-2.0/gnome.h \
/usr/include/gtk-2.0/gtk/gtktreesortable.h:
+/usr/include/gtk-2.0/gtk/gtkcellrendereraccel.h:
+
+/usr/include/gtk-2.0/gtk/gtkcellrenderertext.h:
+
/usr/include/gtk-2.0/gtk/gtkcellrenderercombo.h:
/usr/include/gtk-2.0/gtk/gtkcellrenderertext.h:
@@ -880,6 +945,8 @@ main.o main.o: main.c ../config.h /usr/include/libgnomeui-2.0/gnome.h \
/usr/include/gtk-2.0/gtk/gtkcellrendererprogress.h:
+/usr/include/gtk-2.0/gtk/gtkcellrendererspin.h:
+
/usr/include/gtk-2.0/gtk/gtkcellrenderertoggle.h:
/usr/include/gtk-2.0/gtk/gtkcellview.h:
@@ -898,6 +965,12 @@ main.o main.o: main.c ../config.h /usr/include/libgnomeui-2.0/gnome.h \
/usr/include/gtk-2.0/gtk/gtkselection.h:
+/usr/include/gtk-2.0/gtk/gtktextiter.h:
+
+/usr/include/gtk-2.0/gtk/gtktexttag.h:
+
+/usr/include/gtk-2.0/gtk/gtktextchild.h:
+
/usr/include/gtk-2.0/gtk/gtkclist.h:
/usr/include/gtk-2.0/gtk/gtkhscrollbar.h:
@@ -926,18 +999,10 @@ main.o main.o: main.c ../config.h /usr/include/libgnomeui-2.0/gnome.h \
/usr/include/gtk-2.0/gtk/gtkdnd.h:
-/usr/include/gtk-2.0/gtk/gtkcomboboxentry.h:
-
-/usr/include/gtk-2.0/gtk/gtkctree.h:
-
-/usr/include/gtk-2.0/gtk/gtkcurve.h:
-
-/usr/include/gtk-2.0/gtk/gtkdrawingarea.h:
+/usr/include/gtk-2.0/gtk/gtkentry.h:
/usr/include/gtk-2.0/gtk/gtkeditable.h:
-/usr/include/gtk-2.0/gtk/gtkentry.h:
-
/usr/include/gtk-2.0/gtk/gtkimcontext.h:
/usr/include/gtk-2.0/gtk/gtkentrycompletion.h:
@@ -946,6 +1011,14 @@ main.o main.o: main.c ../config.h /usr/include/libgnomeui-2.0/gnome.h \
/usr/include/gtk-2.0/gtk/gtktreemodelfilter.h:
+/usr/include/gtk-2.0/gtk/gtkcomboboxentry.h:
+
+/usr/include/gtk-2.0/gtk/gtkctree.h:
+
+/usr/include/gtk-2.0/gtk/gtkcurve.h:
+
+/usr/include/gtk-2.0/gtk/gtkdrawingarea.h:
+
/usr/include/gtk-2.0/gtk/gtkeventbox.h:
/usr/include/gtk-2.0/gtk/gtkexpander.h:
@@ -1012,6 +1085,8 @@ main.o main.o: main.c ../config.h /usr/include/libgnomeui-2.0/gnome.h \
/usr/include/gtk-2.0/gtk/gtklayout.h:
+/usr/include/gtk-2.0/gtk/gtklinkbutton.h:
+
/usr/include/gtk-2.0/gtk/gtklist.h:
/usr/include/gtk-2.0/gtk/gtklistitem.h:
@@ -1048,6 +1123,24 @@ main.o main.o: main.c ../config.h /usr/include/libgnomeui-2.0/gnome.h \
/usr/include/gtk-2.0/gtk/gtkpreview.h:
+/usr/include/gtk-2.0/gtk/gtkprintoperation.h:
+
+/usr/include/gtk-2.0/gtk/gtkmain.h:
+
+/usr/include/gtk-2.0/gtk/gtkenums.h:
+
+/usr/include/gtk-2.0/gtk/gtkwindow.h:
+
+/usr/include/gtk-2.0/gtk/gtkpagesetup.h:
+
+/usr/include/gtk-2.0/gtk/gtkpapersize.h:
+
+/usr/include/gtk-2.0/gtk/gtkprintsettings.h:
+
+/usr/include/gtk-2.0/gtk/gtkprintcontext.h:
+
+/usr/include/gtk-2.0/gtk/gtkprintoperationpreview.h:
+
/usr/include/gtk-2.0/gtk/gtkprogress.h:
/usr/include/gtk-2.0/gtk/gtkprogressbar.h:
@@ -1066,6 +1159,24 @@ main.o main.o: main.c ../config.h /usr/include/libgnomeui-2.0/gnome.h \
/usr/include/gtk-2.0/gtk/gtktoolbutton.h:
+/usr/include/gtk-2.0/gtk/gtkrecentchooser.h:
+
+/usr/include/gtk-2.0/gtk/gtkrecentmanager.h:
+
+/usr/include/gtk-2.0/gtk/gtkrecentfilter.h:
+
+/usr/include/gtk-2.0/gtk/gtkrecentchooserdialog.h:
+
+/usr/include/gtk-2.0/gtk/gtkrecentchooser.h:
+
+/usr/include/gtk-2.0/gtk/gtkrecentchoosermenu.h:
+
+/usr/include/gtk-2.0/gtk/gtkrecentchooserwidget.h:
+
+/usr/include/gtk-2.0/gtk/gtkrecentfilter.h:
+
+/usr/include/gtk-2.0/gtk/gtkrecentmanager.h:
+
/usr/include/gtk-2.0/gtk/gtkscrolledwindow.h:
/usr/include/gtk-2.0/gtk/gtkviewport.h:
@@ -1080,6 +1191,8 @@ main.o main.o: main.c ../config.h /usr/include/libgnomeui-2.0/gnome.h \
/usr/include/gtk-2.0/gtk/gtkstatusbar.h:
+/usr/include/gtk-2.0/gtk/gtkstatusicon.h:
+
/usr/include/gtk-2.0/gtk/gtkstock.h:
/usr/include/gtk-2.0/gtk/gtktable.h:
@@ -1092,14 +1205,10 @@ main.o main.o: main.c ../config.h /usr/include/libgnomeui-2.0/gnome.h \
/usr/include/gtk-2.0/gtk/gtktexttagtable.h:
-/usr/include/gtk-2.0/gtk/gtktexttag.h:
-
-/usr/include/gtk-2.0/gtk/gtktextiter.h:
-
-/usr/include/gtk-2.0/gtk/gtktextchild.h:
-
/usr/include/gtk-2.0/gtk/gtktextmark.h:
+/usr/include/gtk-2.0/gtk/gtktextbufferrichtext.h:
+
/usr/include/gtk-2.0/gtk/gtktextview.h:
/usr/include/gtk-2.0/gtk/gtktipsquery.h:
@@ -1142,8 +1251,6 @@ main.o main.o: main.c ../config.h /usr/include/libgnomeui-2.0/gnome.h \
/usr/include/libgnome-2.0/libgnome/gnome-program.h:
-/usr/include/popt.h:
-
/usr/include/errno.h:
/usr/include/bits/errno.h:
@@ -1156,6 +1263,8 @@ main.o main.o: main.c ../config.h /usr/include/libgnomeui-2.0/gnome.h \
/usr/include/asm-generic/errno-base.h:
+/usr/include/popt.h:
+
/usr/include/libgnome-2.0/libgnome/gnome-i18n.h:
/usr/include/libbonobo-2.0/bonobo/bonobo-i18n.h:
@@ -1184,10 +1293,6 @@ main.o main.o: main.c ../config.h /usr/include/libgnomeui-2.0/gnome.h \
/usr/include/libgnome-2.0/libgnome/gnome-score.h:
-/usr/include/time.h:
-
-/usr/include/bits/time.h:
-
/usr/include/libgnome-2.0/libgnome/gnome-exec.h:
/usr/include/libgnome-2.0/libgnome/gnome-util.h:
@@ -1210,8 +1315,6 @@ main.o main.o: main.c ../config.h /usr/include/libgnomeui-2.0/gnome.h \
/usr/include/bits/pthreadtypes.h:
-/usr/include/bits/sched.h:
-
/usr/include/alloca.h:
/usr/include/libgnome-2.0/libgnome/gnome-url.h:
@@ -1224,10 +1327,6 @@ main.o main.o: main.c ../config.h /usr/include/libgnomeui-2.0/gnome.h \
/usr/include/libart-2.0/libart_lgpl/art_config.h:
-/usr/include/multiarch-dispatch.h:
-
-/usr/include/multiarch-i386-linux/libart-2.0/libart_lgpl/art_config.h:
-
/usr/include/libart-2.0/libart_lgpl/art_rect.h:
/usr/include/libart-2.0/libart_lgpl/art_svp.h:
@@ -1268,6 +1367,12 @@ main.o main.o: main.c ../config.h /usr/include/libgnomeui-2.0/gnome.h \
/usr/include/libart-2.0/libart_lgpl/art_svp_vpath_stroke.h:
+/usr/include/libgnomecanvas-2.0/libgnomecanvas/gnome-canvas-clipgroup.h:
+
+/usr/include/libart-2.0/libart_lgpl/art_svp_wind.h:
+
+/usr/include/libart-2.0/libart_lgpl/art_vpath_dash.h:
+
/usr/include/libgnomeui-2.0/libgnomeui/libgnomeui.h:
/usr/include/libgnomeui-2.0/libgnomeui/gnome-uidefs.h:
@@ -1328,12 +1433,14 @@ main.o main.o: main.c ../config.h /usr/include/libgnomeui-2.0/gnome.h \
/usr/include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-file-size.h:
-/usr/include/multiarch-i386-linux/gnome-vfs-2.0/libgnomevfs/gnome-vfs-file-size.h:
-
/usr/include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-result.h:
/usr/include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-uri.h:
+/usr/include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-acl.h:
+
+/usr/include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-ace.h:
+
/usr/include/sys/stat.h:
/usr/include/bits/stat.h:
@@ -1424,15 +1531,19 @@ eggtrayicon.h:
/usr/include/gtk-2.0/gdk/gdkprivate.h:
-/usr/X11R6/include/X11/Xlib.h:
+/usr/include/X11/Xlib.h:
+
+/usr/include/X11/X.h:
+
+/usr/include/X11/Xfuncproto.h:
-/usr/X11R6/include/X11/X.h:
+/usr/include/X11/Xosdefs.h:
-/usr/X11R6/include/X11/Xfuncproto.h:
+/usr/include/X11/Xutil.h:
-/usr/X11R6/include/X11/Xosdefs.h:
+/usr/include/X11/keysym.h:
-/usr/X11R6/include/X11/Xutil.h:
+/usr/include/X11/keysymdef.h:
/usr/include/gconf/2/gconf/gconf-client.h:
diff --git a/projects/gvpndialer/trunk/src/.deps/support.Po b/projects/gvpndialer/trunk/src/.deps/support.Po
index cc9eb10..8384299 100644
--- a/projects/gvpndialer/trunk/src/.deps/support.Po
+++ b/projects/gvpndialer/trunk/src/.deps/support.Po
@@ -1,42 +1,46 @@
support.o support.o: support.c ../config.h /usr/include/sys/types.h \
/usr/include/features.h /usr/include/sys/cdefs.h \
- /usr/include/gnu/stubs.h /usr/include/bits/types.h \
- /usr/include/bits/wordsize.h \
- /usr/lib/gcc/i586-mandrake-linux-gnu/3.4.3/include/stddef.h \
+ /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h \
+ /usr/include/gnu/stubs-32.h /usr/include/bits/types.h \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.1.1/include/stddef.h \
/usr/include/bits/typesizes.h /usr/include/time.h /usr/include/endian.h \
/usr/include/bits/endian.h /usr/include/sys/select.h \
/usr/include/bits/select.h /usr/include/bits/sigset.h \
/usr/include/bits/time.h /usr/include/sys/sysmacros.h \
- /usr/include/bits/pthreadtypes.h /usr/include/bits/sched.h \
- /usr/include/sys/stat.h /usr/include/bits/stat.h /usr/include/unistd.h \
+ /usr/include/bits/pthreadtypes.h /usr/include/sys/stat.h \
+ /usr/include/bits/stat.h /usr/include/unistd.h \
/usr/include/bits/posix_opt.h /usr/include/bits/confname.h \
/usr/include/getopt.h /usr/include/string.h /usr/include/bits/string.h \
/usr/include/bits/string2.h /usr/include/stdlib.h /usr/include/stdio.h \
/usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \
/usr/include/bits/wchar.h /usr/include/gconv.h \
- /usr/lib/gcc/i586-mandrake-linux-gnu/3.4.3/include/stdarg.h \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.1.1/include/stdarg.h \
/usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \
/usr/include/bits/stdio.h /usr/include/libgnomeui-2.0/gnome.h \
/usr/include/gtk-2.0/gtk/gtk.h /usr/include/gtk-2.0/gdk/gdk.h \
- /usr/include/gtk-2.0/gdk/gdkcolor.h /usr/include/gtk-2.0/gdk/gdktypes.h \
- /usr/include/glib-2.0/glib.h /usr/include/glib-2.0/glib/galloca.h \
+ /usr/include/gtk-2.0/gdk/gdkcairo.h /usr/include/gtk-2.0/gdk/gdkcolor.h \
+ /usr/include/cairo/cairo.h /usr/include/cairo/cairo-features.h \
+ /usr/include/gtk-2.0/gdk/gdktypes.h /usr/include/glib-2.0/glib.h \
+ /usr/include/glib-2.0/glib/galloca.h \
/usr/include/glib-2.0/glib/gtypes.h \
/usr/lib/glib-2.0/include/glibconfig.h \
/usr/include/glib-2.0/glib/gmacros.h \
- /usr/lib/gcc/i586-mandrake-linux-gnu/3.4.3/include/limits.h \
- /usr/lib/gcc/i586-mandrake-linux-gnu/3.4.3/include/syslimits.h \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.1.1/include/limits.h \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.1.1/include/syslimits.h \
/usr/include/limits.h /usr/include/bits/posix1_lim.h \
/usr/include/bits/local_lim.h /usr/include/linux/limits.h \
/usr/include/bits/posix2_lim.h \
- /usr/lib/gcc/i586-mandrake-linux-gnu/3.4.3/include/float.h \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.1.1/include/float.h \
/usr/include/glib-2.0/glib/garray.h \
/usr/include/glib-2.0/glib/gasyncqueue.h \
/usr/include/glib-2.0/glib/gthread.h \
/usr/include/glib-2.0/glib/gerror.h /usr/include/glib-2.0/glib/gquark.h \
/usr/include/glib-2.0/glib/gatomic.h \
/usr/include/glib-2.0/glib/gbacktrace.h \
+ /usr/include/glib-2.0/glib/gbase64.h \
+ /usr/include/glib-2.0/glib/gbookmarkfile.h \
/usr/include/glib-2.0/glib/gcache.h /usr/include/glib-2.0/glib/glist.h \
- /usr/include/glib-2.0/glib/gmem.h \
+ /usr/include/glib-2.0/glib/gmem.h /usr/include/glib-2.0/glib/gslice.h \
/usr/include/glib-2.0/glib/gcompletion.h \
/usr/include/glib-2.0/glib/gconvert.h \
/usr/include/glib-2.0/glib/gdataset.h \
@@ -49,6 +53,7 @@ support.o support.o: support.c ../config.h /usr/include/sys/types.h \
/usr/include/glib-2.0/glib/gunicode.h \
/usr/include/glib-2.0/glib/gutils.h \
/usr/include/glib-2.0/glib/gkeyfile.h \
+ /usr/include/glib-2.0/glib/gmappedfile.h \
/usr/include/glib-2.0/glib/gmarkup.h \
/usr/include/glib-2.0/glib/gmessages.h \
/usr/include/glib-2.0/glib/gnode.h /usr/include/glib-2.0/glib/goption.h \
@@ -96,27 +101,28 @@ support.o support.o: support.c ../config.h /usr/include/sys/types.h \
/usr/include/pango-1.0/pango/pango-tabs.h \
/usr/include/pango-1.0/pango/pango-renderer.h \
/usr/lib/gtk-2.0/include/gdkconfig.h \
- /usr/include/gtk-2.0/gdk/gdkcursor.h \
+ /usr/include/gtk-2.0/gdk/gdkpixbuf.h /usr/include/gtk-2.0/gdk/gdkrgb.h \
/usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf.h \
/usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-features.h \
/usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-core.h \
/usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-transform.h \
/usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-animation.h \
+ /usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-simple-anim.h \
/usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-io.h \
/usr/include/glib-2.0/gmodule.h \
/usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-loader.h \
/usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-enum-types.h \
+ /usr/include/pango-1.0/pango/pangocairo.h \
+ /usr/include/gtk-2.0/gdk/gdkcursor.h \
/usr/include/gtk-2.0/gdk/gdkdisplay.h \
/usr/include/gtk-2.0/gdk/gdkevents.h /usr/include/gtk-2.0/gdk/gdkdnd.h \
/usr/include/gtk-2.0/gdk/gdkinput.h \
/usr/include/gtk-2.0/gdk/gdkdrawable.h /usr/include/gtk-2.0/gdk/gdkgc.h \
- /usr/include/gtk-2.0/gdk/gdkrgb.h \
/usr/include/gtk-2.0/gdk/gdkenumtypes.h \
/usr/include/gtk-2.0/gdk/gdkfont.h /usr/include/gtk-2.0/gdk/gdkimage.h \
/usr/include/gtk-2.0/gdk/gdkkeys.h \
/usr/include/gtk-2.0/gdk/gdkdisplaymanager.h \
/usr/include/gtk-2.0/gdk/gdkpango.h \
- /usr/include/gtk-2.0/gdk/gdkpixbuf.h \
/usr/include/gtk-2.0/gdk/gdkpixmap.h \
/usr/include/gtk-2.0/gdk/gdkproperty.h \
/usr/include/gtk-2.0/gdk/gdkregion.h \
@@ -156,6 +162,7 @@ support.o support.o: support.c ../config.h /usr/include/sys/types.h \
/usr/include/atk-1.0/atk/atktext.h \
/usr/include/atk-1.0/atk/atkgobjectaccessible.h \
/usr/include/atk-1.0/atk/atkhyperlink.h \
+ /usr/include/atk-1.0/atk/atkhyperlinkimpl.h \
/usr/include/atk-1.0/atk/atkhypertext.h \
/usr/include/atk-1.0/atk/atkimage.h \
/usr/include/atk-1.0/atk/atknoopobject.h \
@@ -175,8 +182,9 @@ support.o support.o: support.c ../config.h /usr/include/sys/types.h \
/usr/include/gtk-2.0/gtk/gtkalignment.h \
/usr/include/gtk-2.0/gtk/gtkarrow.h \
/usr/include/gtk-2.0/gtk/gtkaspectframe.h \
- /usr/include/gtk-2.0/gtk/gtkframe.h /usr/include/gtk-2.0/gtk/gtkbbox.h \
- /usr/include/gtk-2.0/gtk/gtkbox.h \
+ /usr/include/gtk-2.0/gtk/gtkframe.h \
+ /usr/include/gtk-2.0/gtk/gtkassistant.h \
+ /usr/include/gtk-2.0/gtk/gtkbbox.h /usr/include/gtk-2.0/gtk/gtkbox.h \
/usr/include/gtk-2.0/gtk/gtkbindings.h \
/usr/include/gtk-2.0/gtk/gtkbutton.h \
/usr/include/gtk-2.0/gtk/gtkimage.h \
@@ -189,10 +197,13 @@ support.o support.o: support.c ../config.h /usr/include/sys/types.h \
/usr/include/gtk-2.0/gtk/gtktreeviewcolumn.h \
/usr/include/gtk-2.0/gtk/gtktreemodel.h \
/usr/include/gtk-2.0/gtk/gtktreesortable.h \
+ /usr/include/gtk-2.0/gtk/gtkcellrendereraccel.h \
+ /usr/include/gtk-2.0/gtk/gtkcellrenderertext.h \
/usr/include/gtk-2.0/gtk/gtkcellrenderercombo.h \
/usr/include/gtk-2.0/gtk/gtkcellrenderertext.h \
/usr/include/gtk-2.0/gtk/gtkcellrendererpixbuf.h \
/usr/include/gtk-2.0/gtk/gtkcellrendererprogress.h \
+ /usr/include/gtk-2.0/gtk/gtkcellrendererspin.h \
/usr/include/gtk-2.0/gtk/gtkcellrenderertoggle.h \
/usr/include/gtk-2.0/gtk/gtkcellview.h \
/usr/include/gtk-2.0/gtk/gtkcheckbutton.h \
@@ -202,6 +213,9 @@ support.o support.o: support.c ../config.h /usr/include/sys/types.h \
/usr/include/gtk-2.0/gtk/gtkitem.h \
/usr/include/gtk-2.0/gtk/gtkclipboard.h \
/usr/include/gtk-2.0/gtk/gtkselection.h \
+ /usr/include/gtk-2.0/gtk/gtktextiter.h \
+ /usr/include/gtk-2.0/gtk/gtktexttag.h \
+ /usr/include/gtk-2.0/gtk/gtktextchild.h \
/usr/include/gtk-2.0/gtk/gtkclist.h \
/usr/include/gtk-2.0/gtk/gtkhscrollbar.h \
/usr/include/gtk-2.0/gtk/gtkscrollbar.h \
@@ -214,16 +228,15 @@ support.o support.o: support.c ../config.h /usr/include/sys/types.h \
/usr/include/gtk-2.0/gtk/gtkcombo.h /usr/include/gtk-2.0/gtk/gtkhbox.h \
/usr/include/gtk-2.0/gtk/gtkcombobox.h \
/usr/include/gtk-2.0/gtk/gtktreeview.h \
- /usr/include/gtk-2.0/gtk/gtkdnd.h \
- /usr/include/gtk-2.0/gtk/gtkcomboboxentry.h \
- /usr/include/gtk-2.0/gtk/gtkctree.h /usr/include/gtk-2.0/gtk/gtkcurve.h \
- /usr/include/gtk-2.0/gtk/gtkdrawingarea.h \
+ /usr/include/gtk-2.0/gtk/gtkdnd.h /usr/include/gtk-2.0/gtk/gtkentry.h \
/usr/include/gtk-2.0/gtk/gtkeditable.h \
- /usr/include/gtk-2.0/gtk/gtkentry.h \
/usr/include/gtk-2.0/gtk/gtkimcontext.h \
/usr/include/gtk-2.0/gtk/gtkentrycompletion.h \
/usr/include/gtk-2.0/gtk/gtkliststore.h \
/usr/include/gtk-2.0/gtk/gtktreemodelfilter.h \
+ /usr/include/gtk-2.0/gtk/gtkcomboboxentry.h \
+ /usr/include/gtk-2.0/gtk/gtkctree.h /usr/include/gtk-2.0/gtk/gtkcurve.h \
+ /usr/include/gtk-2.0/gtk/gtkdrawingarea.h \
/usr/include/gtk-2.0/gtk/gtkeventbox.h \
/usr/include/gtk-2.0/gtk/gtkexpander.h \
/usr/include/gtk-2.0/gtk/gtkfilesel.h \
@@ -255,7 +268,9 @@ support.o support.o: support.c ../config.h /usr/include/sys/types.h \
/usr/include/gtk-2.0/gtk/gtkimmulticontext.h \
/usr/include/gtk-2.0/gtk/gtkinputdialog.h \
/usr/include/gtk-2.0/gtk/gtkinvisible.h \
- /usr/include/gtk-2.0/gtk/gtklayout.h /usr/include/gtk-2.0/gtk/gtklist.h \
+ /usr/include/gtk-2.0/gtk/gtklayout.h \
+ /usr/include/gtk-2.0/gtk/gtklinkbutton.h \
+ /usr/include/gtk-2.0/gtk/gtklist.h \
/usr/include/gtk-2.0/gtk/gtklistitem.h \
/usr/include/gtk-2.0/gtk/gtkmain.h \
/usr/include/gtk-2.0/gtk/gtkmenubar.h \
@@ -272,6 +287,14 @@ support.o support.o: support.c ../config.h /usr/include/sys/types.h \
/usr/include/gtk-2.0/gtk/gtkpixmap.h /usr/include/gtk-2.0/gtk/gtkplug.h \
/usr/include/gtk-2.0/gtk/gtksocket.h \
/usr/include/gtk-2.0/gtk/gtkpreview.h \
+ /usr/include/gtk-2.0/gtk/gtkprintoperation.h \
+ /usr/include/gtk-2.0/gtk/gtkmain.h /usr/include/gtk-2.0/gtk/gtkenums.h \
+ /usr/include/gtk-2.0/gtk/gtkwindow.h \
+ /usr/include/gtk-2.0/gtk/gtkpagesetup.h \
+ /usr/include/gtk-2.0/gtk/gtkpapersize.h \
+ /usr/include/gtk-2.0/gtk/gtkprintsettings.h \
+ /usr/include/gtk-2.0/gtk/gtkprintcontext.h \
+ /usr/include/gtk-2.0/gtk/gtkprintoperationpreview.h \
/usr/include/gtk-2.0/gtk/gtkprogress.h \
/usr/include/gtk-2.0/gtk/gtkprogressbar.h \
/usr/include/gtk-2.0/gtk/gtkradioaction.h \
@@ -281,6 +304,15 @@ support.o support.o: support.c ../config.h /usr/include/sys/types.h \
/usr/include/gtk-2.0/gtk/gtkradiotoolbutton.h \
/usr/include/gtk-2.0/gtk/gtktoggletoolbutton.h \
/usr/include/gtk-2.0/gtk/gtktoolbutton.h \
+ /usr/include/gtk-2.0/gtk/gtkrecentchooser.h \
+ /usr/include/gtk-2.0/gtk/gtkrecentmanager.h \
+ /usr/include/gtk-2.0/gtk/gtkrecentfilter.h \
+ /usr/include/gtk-2.0/gtk/gtkrecentchooserdialog.h \
+ /usr/include/gtk-2.0/gtk/gtkrecentchooser.h \
+ /usr/include/gtk-2.0/gtk/gtkrecentchoosermenu.h \
+ /usr/include/gtk-2.0/gtk/gtkrecentchooserwidget.h \
+ /usr/include/gtk-2.0/gtk/gtkrecentfilter.h \
+ /usr/include/gtk-2.0/gtk/gtkrecentmanager.h \
/usr/include/gtk-2.0/gtk/gtkscrolledwindow.h \
/usr/include/gtk-2.0/gtk/gtkviewport.h \
/usr/include/gtk-2.0/gtk/gtkseparatormenuitem.h \
@@ -288,15 +320,14 @@ support.o support.o: support.c ../config.h /usr/include/sys/types.h \
/usr/include/gtk-2.0/gtk/gtksizegroup.h \
/usr/include/gtk-2.0/gtk/gtkspinbutton.h \
/usr/include/gtk-2.0/gtk/gtkstatusbar.h \
+ /usr/include/gtk-2.0/gtk/gtkstatusicon.h \
/usr/include/gtk-2.0/gtk/gtkstock.h /usr/include/gtk-2.0/gtk/gtktable.h \
/usr/include/gtk-2.0/gtk/gtktearoffmenuitem.h \
/usr/include/gtk-2.0/gtk/gtktext.h \
/usr/include/gtk-2.0/gtk/gtktextbuffer.h \
/usr/include/gtk-2.0/gtk/gtktexttagtable.h \
- /usr/include/gtk-2.0/gtk/gtktexttag.h \
- /usr/include/gtk-2.0/gtk/gtktextiter.h \
- /usr/include/gtk-2.0/gtk/gtktextchild.h \
/usr/include/gtk-2.0/gtk/gtktextmark.h \
+ /usr/include/gtk-2.0/gtk/gtktextbufferrichtext.h \
/usr/include/gtk-2.0/gtk/gtktextview.h \
/usr/include/gtk-2.0/gtk/gtktipsquery.h \
/usr/include/gtk-2.0/gtk/gtktoggletoolbutton.h \
@@ -317,10 +348,10 @@ support.o support.o: support.c ../config.h /usr/include/sys/types.h \
/usr/include/gtk-2.0/gtk/gtkvscale.h \
/usr/include/gtk-2.0/gtk/gtkvseparator.h \
/usr/include/libgnome-2.0/libgnome/libgnome.h \
- /usr/include/libgnome-2.0/libgnome/gnome-program.h /usr/include/popt.h \
- /usr/include/errno.h /usr/include/bits/errno.h \
- /usr/include/linux/errno.h /usr/include/asm/errno.h \
- /usr/include/asm-generic/errno.h /usr/include/asm-generic/errno-base.h \
+ /usr/include/libgnome-2.0/libgnome/gnome-program.h /usr/include/errno.h \
+ /usr/include/bits/errno.h /usr/include/linux/errno.h \
+ /usr/include/asm/errno.h /usr/include/asm-generic/errno.h \
+ /usr/include/asm-generic/errno-base.h /usr/include/popt.h \
/usr/include/libgnome-2.0/libgnome/gnome-i18n.h \
/usr/include/libbonobo-2.0/bonobo/bonobo-i18n.h /usr/include/libintl.h \
/usr/include/locale.h /usr/include/bits/locale.h \
@@ -340,8 +371,6 @@ support.o support.o: support.c ../config.h /usr/include/sys/types.h \
/usr/include/libgnomecanvas-2.0/libgnomecanvas/gnome-canvas.h \
/usr/include/libart-2.0/libart_lgpl/art_misc.h \
/usr/include/libart-2.0/libart_lgpl/art_config.h \
- /usr/include/multiarch-dispatch.h \
- /usr/include/multiarch-i386-linux/libart-2.0/libart_lgpl/art_config.h \
/usr/include/libart-2.0/libart_lgpl/art_rect.h \
/usr/include/libart-2.0/libart_lgpl/art_svp.h \
/usr/include/libart-2.0/libart_lgpl/art_point.h \
@@ -362,6 +391,9 @@ support.o support.o: support.c ../config.h /usr/include/sys/types.h \
/usr/include/libgnomecanvas-2.0/libgnomecanvas/gnome-canvas-util.h \
/usr/include/libart-2.0/libart_lgpl/art_vpath.h \
/usr/include/libart-2.0/libart_lgpl/art_svp_vpath_stroke.h \
+ /usr/include/libgnomecanvas-2.0/libgnomecanvas/gnome-canvas-clipgroup.h \
+ /usr/include/libart-2.0/libart_lgpl/art_svp_wind.h \
+ /usr/include/libart-2.0/libart_lgpl/art_vpath_dash.h \
/usr/include/libgnomeui-2.0/libgnomeui/libgnomeui.h \
/usr/include/libgnomeui-2.0/libgnomeui/gnome-uidefs.h \
/usr/include/gtk-2.0/gdk/gdkkeysyms.h \
@@ -392,9 +424,10 @@ support.o support.o: support.c ../config.h /usr/include/sys/types.h \
/usr/include/libgnomeui-2.0/libgnomeui/gnome-icon-lookup.h \
/usr/include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-file-info.h \
/usr/include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-file-size.h \
- /usr/include/multiarch-i386-linux/gnome-vfs-2.0/libgnomevfs/gnome-vfs-file-size.h \
/usr/include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-result.h \
/usr/include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-uri.h \
+ /usr/include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-acl.h \
+ /usr/include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-ace.h \
/usr/include/libgnomeui-2.0/libgnomeui/gnome-stock-icons.h \
/usr/include/libgnomeui-2.0/libgnomeui/gnome-scores.h \
/usr/include/libgnomeui-2.0/libgnomeui/gnome-client.h \
@@ -435,13 +468,15 @@ support.o support.o: support.c ../config.h /usr/include/sys/types.h \
/usr/include/sys/cdefs.h:
+/usr/include/bits/wordsize.h:
+
/usr/include/gnu/stubs.h:
-/usr/include/bits/types.h:
+/usr/include/gnu/stubs-32.h:
-/usr/include/bits/wordsize.h:
+/usr/include/bits/types.h:
-/usr/lib/gcc/i586-mandrake-linux-gnu/3.4.3/include/stddef.h:
+/usr/lib/gcc/i686-pc-linux-gnu/4.1.1/include/stddef.h:
/usr/include/bits/typesizes.h:
@@ -463,8 +498,6 @@ support.o support.o: support.c ../config.h /usr/include/sys/types.h \
/usr/include/bits/pthreadtypes.h:
-/usr/include/bits/sched.h:
-
/usr/include/sys/stat.h:
/usr/include/bits/stat.h:
@@ -497,7 +530,7 @@ support.o support.o: support.c ../config.h /usr/include/sys/types.h \
/usr/include/gconv.h:
-/usr/lib/gcc/i586-mandrake-linux-gnu/3.4.3/include/stdarg.h:
+/usr/lib/gcc/i686-pc-linux-gnu/4.1.1/include/stdarg.h:
/usr/include/bits/stdio_lim.h:
@@ -511,8 +544,14 @@ support.o support.o: support.c ../config.h /usr/include/sys/types.h \
/usr/include/gtk-2.0/gdk/gdk.h:
+/usr/include/gtk-2.0/gdk/gdkcairo.h:
+
/usr/include/gtk-2.0/gdk/gdkcolor.h:
+/usr/include/cairo/cairo.h:
+
+/usr/include/cairo/cairo-features.h:
+
/usr/include/gtk-2.0/gdk/gdktypes.h:
/usr/include/glib-2.0/glib.h:
@@ -525,9 +564,9 @@ support.o support.o: support.c ../config.h /usr/include/sys/types.h \
/usr/include/glib-2.0/glib/gmacros.h:
-/usr/lib/gcc/i586-mandrake-linux-gnu/3.4.3/include/limits.h:
+/usr/lib/gcc/i686-pc-linux-gnu/4.1.1/include/limits.h:
-/usr/lib/gcc/i586-mandrake-linux-gnu/3.4.3/include/syslimits.h:
+/usr/lib/gcc/i686-pc-linux-gnu/4.1.1/include/syslimits.h:
/usr/include/limits.h:
@@ -539,7 +578,7 @@ support.o support.o: support.c ../config.h /usr/include/sys/types.h \
/usr/include/bits/posix2_lim.h:
-/usr/lib/gcc/i586-mandrake-linux-gnu/3.4.3/include/float.h:
+/usr/lib/gcc/i686-pc-linux-gnu/4.1.1/include/float.h:
/usr/include/glib-2.0/glib/garray.h:
@@ -555,12 +594,18 @@ support.o support.o: support.c ../config.h /usr/include/sys/types.h \
/usr/include/glib-2.0/glib/gbacktrace.h:
+/usr/include/glib-2.0/glib/gbase64.h:
+
+/usr/include/glib-2.0/glib/gbookmarkfile.h:
+
/usr/include/glib-2.0/glib/gcache.h:
/usr/include/glib-2.0/glib/glist.h:
/usr/include/glib-2.0/glib/gmem.h:
+/usr/include/glib-2.0/glib/gslice.h:
+
/usr/include/glib-2.0/glib/gcompletion.h:
/usr/include/glib-2.0/glib/gconvert.h:
@@ -591,6 +636,8 @@ support.o support.o: support.c ../config.h /usr/include/sys/types.h \
/usr/include/glib-2.0/glib/gkeyfile.h:
+/usr/include/glib-2.0/glib/gmappedfile.h:
+
/usr/include/glib-2.0/glib/gmarkup.h:
/usr/include/glib-2.0/glib/gmessages.h:
@@ -695,7 +742,9 @@ support.o support.o: support.c ../config.h /usr/include/sys/types.h \
/usr/lib/gtk-2.0/include/gdkconfig.h:
-/usr/include/gtk-2.0/gdk/gdkcursor.h:
+/usr/include/gtk-2.0/gdk/gdkpixbuf.h:
+
+/usr/include/gtk-2.0/gdk/gdkrgb.h:
/usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf.h:
@@ -707,6 +756,8 @@ support.o support.o: support.c ../config.h /usr/include/sys/types.h \
/usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-animation.h:
+/usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-simple-anim.h:
+
/usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-io.h:
/usr/include/glib-2.0/gmodule.h:
@@ -715,6 +766,10 @@ support.o support.o: support.c ../config.h /usr/include/sys/types.h \
/usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-enum-types.h:
+/usr/include/pango-1.0/pango/pangocairo.h:
+
+/usr/include/gtk-2.0/gdk/gdkcursor.h:
+
/usr/include/gtk-2.0/gdk/gdkdisplay.h:
/usr/include/gtk-2.0/gdk/gdkevents.h:
@@ -727,8 +782,6 @@ support.o support.o: support.c ../config.h /usr/include/sys/types.h \
/usr/include/gtk-2.0/gdk/gdkgc.h:
-/usr/include/gtk-2.0/gdk/gdkrgb.h:
-
/usr/include/gtk-2.0/gdk/gdkenumtypes.h:
/usr/include/gtk-2.0/gdk/gdkfont.h:
@@ -741,8 +794,6 @@ support.o support.o: support.c ../config.h /usr/include/sys/types.h \
/usr/include/gtk-2.0/gdk/gdkpango.h:
-/usr/include/gtk-2.0/gdk/gdkpixbuf.h:
-
/usr/include/gtk-2.0/gdk/gdkpixmap.h:
/usr/include/gtk-2.0/gdk/gdkproperty.h:
@@ -829,6 +880,8 @@ support.o support.o: support.c ../config.h /usr/include/sys/types.h \
/usr/include/atk-1.0/atk/atkhyperlink.h:
+/usr/include/atk-1.0/atk/atkhyperlinkimpl.h:
+
/usr/include/atk-1.0/atk/atkhypertext.h:
/usr/include/atk-1.0/atk/atkimage.h:
@@ -871,6 +924,8 @@ support.o support.o: support.c ../config.h /usr/include/sys/types.h \
/usr/include/gtk-2.0/gtk/gtkframe.h:
+/usr/include/gtk-2.0/gtk/gtkassistant.h:
+
/usr/include/gtk-2.0/gtk/gtkbbox.h:
/usr/include/gtk-2.0/gtk/gtkbox.h:
@@ -899,6 +954,10 @@ support.o support.o: support.c ../config.h /usr/include/sys/types.h \
/usr/include/gtk-2.0/gtk/gtktreesortable.h:
+/usr/include/gtk-2.0/gtk/gtkcellrendereraccel.h:
+
+/usr/include/gtk-2.0/gtk/gtkcellrenderertext.h:
+
/usr/include/gtk-2.0/gtk/gtkcellrenderercombo.h:
/usr/include/gtk-2.0/gtk/gtkcellrenderertext.h:
@@ -907,6 +966,8 @@ support.o support.o: support.c ../config.h /usr/include/sys/types.h \
/usr/include/gtk-2.0/gtk/gtkcellrendererprogress.h:
+/usr/include/gtk-2.0/gtk/gtkcellrendererspin.h:
+
/usr/include/gtk-2.0/gtk/gtkcellrenderertoggle.h:
/usr/include/gtk-2.0/gtk/gtkcellview.h:
@@ -925,6 +986,12 @@ support.o support.o: support.c ../config.h /usr/include/sys/types.h \
/usr/include/gtk-2.0/gtk/gtkselection.h:
+/usr/include/gtk-2.0/gtk/gtktextiter.h:
+
+/usr/include/gtk-2.0/gtk/gtktexttag.h:
+
+/usr/include/gtk-2.0/gtk/gtktextchild.h:
+
/usr/include/gtk-2.0/gtk/gtkclist.h:
/usr/include/gtk-2.0/gtk/gtkhscrollbar.h:
@@ -953,18 +1020,10 @@ support.o support.o: support.c ../config.h /usr/include/sys/types.h \
/usr/include/gtk-2.0/gtk/gtkdnd.h:
-/usr/include/gtk-2.0/gtk/gtkcomboboxentry.h:
-
-/usr/include/gtk-2.0/gtk/gtkctree.h:
-
-/usr/include/gtk-2.0/gtk/gtkcurve.h:
-
-/usr/include/gtk-2.0/gtk/gtkdrawingarea.h:
+/usr/include/gtk-2.0/gtk/gtkentry.h:
/usr/include/gtk-2.0/gtk/gtkeditable.h:
-/usr/include/gtk-2.0/gtk/gtkentry.h:
-
/usr/include/gtk-2.0/gtk/gtkimcontext.h:
/usr/include/gtk-2.0/gtk/gtkentrycompletion.h:
@@ -973,6 +1032,14 @@ support.o support.o: support.c ../config.h /usr/include/sys/types.h \
/usr/include/gtk-2.0/gtk/gtktreemodelfilter.h:
+/usr/include/gtk-2.0/gtk/gtkcomboboxentry.h:
+
+/usr/include/gtk-2.0/gtk/gtkctree.h:
+
+/usr/include/gtk-2.0/gtk/gtkcurve.h:
+
+/usr/include/gtk-2.0/gtk/gtkdrawingarea.h:
+
/usr/include/gtk-2.0/gtk/gtkeventbox.h:
/usr/include/gtk-2.0/gtk/gtkexpander.h:
@@ -1039,6 +1106,8 @@ support.o support.o: support.c ../config.h /usr/include/sys/types.h \
/usr/include/gtk-2.0/gtk/gtklayout.h:
+/usr/include/gtk-2.0/gtk/gtklinkbutton.h:
+
/usr/include/gtk-2.0/gtk/gtklist.h:
/usr/include/gtk-2.0/gtk/gtklistitem.h:
@@ -1075,6 +1144,24 @@ support.o support.o: support.c ../config.h /usr/include/sys/types.h \
/usr/include/gtk-2.0/gtk/gtkpreview.h:
+/usr/include/gtk-2.0/gtk/gtkprintoperation.h:
+
+/usr/include/gtk-2.0/gtk/gtkmain.h:
+
+/usr/include/gtk-2.0/gtk/gtkenums.h:
+
+/usr/include/gtk-2.0/gtk/gtkwindow.h:
+
+/usr/include/gtk-2.0/gtk/gtkpagesetup.h:
+
+/usr/include/gtk-2.0/gtk/gtkpapersize.h:
+
+/usr/include/gtk-2.0/gtk/gtkprintsettings.h:
+
+/usr/include/gtk-2.0/gtk/gtkprintcontext.h:
+
+/usr/include/gtk-2.0/gtk/gtkprintoperationpreview.h:
+
/usr/include/gtk-2.0/gtk/gtkprogress.h:
/usr/include/gtk-2.0/gtk/gtkprogressbar.h:
@@ -1093,6 +1180,24 @@ support.o support.o: support.c ../config.h /usr/include/sys/types.h \
/usr/include/gtk-2.0/gtk/gtktoolbutton.h:
+/usr/include/gtk-2.0/gtk/gtkrecentchooser.h:
+
+/usr/include/gtk-2.0/gtk/gtkrecentmanager.h:
+
+/usr/include/gtk-2.0/gtk/gtkrecentfilter.h:
+
+/usr/include/gtk-2.0/gtk/gtkrecentchooserdialog.h:
+
+/usr/include/gtk-2.0/gtk/gtkrecentchooser.h:
+
+/usr/include/gtk-2.0/gtk/gtkrecentchoosermenu.h:
+
+/usr/include/gtk-2.0/gtk/gtkrecentchooserwidget.h:
+
+/usr/include/gtk-2.0/gtk/gtkrecentfilter.h:
+
+/usr/include/gtk-2.0/gtk/gtkrecentmanager.h:
+
/usr/include/gtk-2.0/gtk/gtkscrolledwindow.h:
/usr/include/gtk-2.0/gtk/gtkviewport.h:
@@ -1107,6 +1212,8 @@ support.o support.o: support.c ../config.h /usr/include/sys/types.h \
/usr/include/gtk-2.0/gtk/gtkstatusbar.h:
+/usr/include/gtk-2.0/gtk/gtkstatusicon.h:
+
/usr/include/gtk-2.0/gtk/gtkstock.h:
/usr/include/gtk-2.0/gtk/gtktable.h:
@@ -1119,14 +1226,10 @@ support.o support.o: support.c ../config.h /usr/include/sys/types.h \
/usr/include/gtk-2.0/gtk/gtktexttagtable.h:
-/usr/include/gtk-2.0/gtk/gtktexttag.h:
-
-/usr/include/gtk-2.0/gtk/gtktextiter.h:
-
-/usr/include/gtk-2.0/gtk/gtktextchild.h:
-
/usr/include/gtk-2.0/gtk/gtktextmark.h:
+/usr/include/gtk-2.0/gtk/gtktextbufferrichtext.h:
+
/usr/include/gtk-2.0/gtk/gtktextview.h:
/usr/include/gtk-2.0/gtk/gtktipsquery.h:
@@ -1169,8 +1272,6 @@ support.o support.o: support.c ../config.h /usr/include/sys/types.h \
/usr/include/libgnome-2.0/libgnome/gnome-program.h:
-/usr/include/popt.h:
-
/usr/include/errno.h:
/usr/include/bits/errno.h:
@@ -1183,6 +1284,8 @@ support.o support.o: support.c ../config.h /usr/include/sys/types.h \
/usr/include/asm-generic/errno-base.h:
+/usr/include/popt.h:
+
/usr/include/libgnome-2.0/libgnome/gnome-i18n.h:
/usr/include/libbonobo-2.0/bonobo/bonobo-i18n.h:
@@ -1227,10 +1330,6 @@ support.o support.o: support.c ../config.h /usr/include/sys/types.h \
/usr/include/libart-2.0/libart_lgpl/art_config.h:
-/usr/include/multiarch-dispatch.h:
-
-/usr/include/multiarch-i386-linux/libart-2.0/libart_lgpl/art_config.h:
-
/usr/include/libart-2.0/libart_lgpl/art_rect.h:
/usr/include/libart-2.0/libart_lgpl/art_svp.h:
@@ -1271,6 +1370,12 @@ support.o support.o: support.c ../config.h /usr/include/sys/types.h \
/usr/include/libart-2.0/libart_lgpl/art_svp_vpath_stroke.h:
+/usr/include/libgnomecanvas-2.0/libgnomecanvas/gnome-canvas-clipgroup.h:
+
+/usr/include/libart-2.0/libart_lgpl/art_svp_wind.h:
+
+/usr/include/libart-2.0/libart_lgpl/art_vpath_dash.h:
+
/usr/include/libgnomeui-2.0/libgnomeui/libgnomeui.h:
/usr/include/libgnomeui-2.0/libgnomeui/gnome-uidefs.h:
@@ -1331,12 +1436,14 @@ support.o support.o: support.c ../config.h /usr/include/sys/types.h \
/usr/include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-file-size.h:
-/usr/include/multiarch-i386-linux/gnome-vfs-2.0/libgnomevfs/gnome-vfs-file-size.h:
-
/usr/include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-result.h:
/usr/include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-uri.h:
+/usr/include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-acl.h:
+
+/usr/include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-ace.h:
+
/usr/include/libgnomeui-2.0/libgnomeui/gnome-stock-icons.h:
/usr/include/libgnomeui-2.0/libgnomeui/gnome-scores.h:
diff --git a/projects/gvpndialer/trunk/src/callbacks.c b/projects/gvpndialer/trunk/src/callbacks.c
index 7c38631..f6a7bf4 100644
--- a/projects/gvpndialer/trunk/src/callbacks.c
+++ b/projects/gvpndialer/trunk/src/callbacks.c
@@ -6,459 +6,482 @@
#include "interface.h"
#include "support.h"
-
int authentication_attempts;
int vpn_connection_active;
pid_t vpnclient_pid;
-
void
on_vpnclient_main_window_show (GtkWidget *widget,
- gpointer user_data)
+gpointer user_data)
{
-
- /* Initialize variables */
-
- gchar *vpn_dir_path = "/etc/opt/cisco-vpnclient/Profiles/";
- gchar *vpnclient_path = "/usr/bin";
- GtkCombo *profile_entry = GTK_COMBO(lookup_widget(widget,"profile_entry"));
- GnomeAppBar *statusbar = GNOME_APPBAR(lookup_widget(widget,"statusbar"));
- gchar *vpn_default_status = "Status Message";
- gchar *configkey;
- GConfClient *client;
-
-
- /* Set default status message */
- gnome_appbar_set_default(statusbar,vpn_default_status);
- /* initialize vpndirpath config entry. If exists use it else create it */
- client = gconf_client_get_default();
- configkey = "/apps/gnome-settings/gvpndialer/profiledir";
- if (gconf_client_get_string(client,configkey,NULL) == NULL ){
- gconf_client_set_string(client,configkey,vpn_dir_path,NULL);
- }else{
- vpn_dir_path = gconf_client_get_string(client,configkey,NULL);
- }
- configkey = "/apps/gnome-settings/gvpndialer/vpnclientdir";
- if (gconf_client_get_string(client,configkey,NULL) == NULL){
- gconf_client_set_string(client,configkey,vpnclient_path,NULL);
- }else {
- vpnclient_path = gconf_client_get_string(client,configkey,NULL);
- }
-
- /* load Profiles into Glist. If it update status bar */
- if ( !(getProfiles(vpn_dir_path,profile_entry))){
- gnome_appbar_push(statusbar,"Unable to load VPN Profiles");
- }
-
- /*unreference gconfclient..always */
- g_object_unref(client);
-
+
+/* Initialize variables */
+
+ gchar *vpn_dir_path = "/etc/opt/cisco-vpnclient/Profiles/";
+ gchar *vpnclient_path = "/usr/bin";
+ GtkCombo *profile_entry = GTK_COMBO(lookup_widget(widget,"profile_entry"));
+ GnomeAppBar *statusbar = GNOME_APPBAR(lookup_widget(widget,"statusbar"));
+ gchar *vpn_default_status = "Status Message";
+ gchar *configkey;
+ GConfClient *client;
+
+/* Set default status message */
+ gnome_appbar_set_default(statusbar,vpn_default_status);
+/* initialize vpndirpath config entry. If exists use it else create it */
+ client = gconf_client_get_default();
+ configkey = "/apps/gnome-settings/gvpndialer/profiledir";
+ if (gconf_client_get_string(client,configkey,NULL) == NULL )
+ {
+ gconf_client_set_string(client,configkey,vpn_dir_path,NULL);
+ }
+ else
+ {
+ vpn_dir_path = gconf_client_get_string(client,configkey,NULL);
+ }
+ configkey = "/apps/gnome-settings/gvpndialer/vpnclientdir";
+ if (gconf_client_get_string(client,configkey,NULL) == NULL)
+ {
+ gconf_client_set_string(client,configkey,vpnclient_path,NULL);
+ }
+ else
+ {
+ vpnclient_path = gconf_client_get_string(client,configkey,NULL);
+ }
+
+/* load Profiles into Glist. If it update status bar */
+ if ( !(getProfiles(vpn_dir_path,profile_entry)))
+ {
+ gnome_appbar_push(statusbar,"Unable to load VPN Profiles");
+ }
+
+/*unreference gconfclient..always */
+ g_object_unref(client);
+
}
gboolean
on_vpnclient_main_window_delete_event (GtkWidget *widget,
- GdkEvent *event,
- gpointer user_data)
+GdkEvent *event,
+gpointer user_data)
{
-
- /* hide main window. if u want to close click quit */
- gtk_widget_hide(widget);
+
+/* hide main window. if u want to close click quit */
+ gtk_widget_hide(widget);
}
void
on_quit1_activate (GtkMenuItem *menuitem,
- gpointer user_data)
+gpointer user_data)
{
- /* kill gvpn dialer */
- gtk_main_quit();
-
+/* kill gvpn dialer */
+ gtk_main_quit();
+
}
void
on_preferences1_activate (GtkMenuItem *menuitem,
- gpointer user_data)
+gpointer user_data)
{
- GtkWidget *preference_window;
- GtkEntry *vpnclient_path_entry;
- GtkEntry *vpn_profile_path_entry; GConfClient *client;
- GtkEntry *vpnclient_default_user_entry;
- GtkCheckButton *vpnclient_start_hidden_cb;
-
- client = gconf_client_get_default();
-
- preference_window = create_preference_window();
- vpnclient_path_entry = GTK_ENTRY(lookup_widget(preference_window,
- "vpnclient_path_entry"));
- vpn_profile_path_entry = GTK_ENTRY(lookup_widget(preference_window,
- "vpn_profile_path_entry"));
- vpnclient_default_user_entry = GTK_ENTRY(lookup_widget(preference_window,
- "vpnclient_default_user_entry"));
- vpnclient_start_hidden_cb = GTK_CHECK_BUTTON(lookup_widget(preference_window,
- "vpnclient_start_hidden_cb"));
-
- gtk_entry_set_text(vpn_profile_path_entry,
- gconf_client_get_string(client,
- "/apps/gnome-settings/gvpndialer/profiledir",
- NULL));
- gtk_entry_set_text(vpnclient_path_entry,
- gconf_client_get_string(client,
- "/apps/gnome-settings/gvpndialer/vpnclientdir",
- NULL));
- gtk_entry_set_text(vpnclient_default_user_entry,
- gconf_client_get_string(client,
- "/apps/gnome-settings/gvpndialer/defaultuser",
- NULL));
-
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(vpnclient_start_hidden_cb),
- gconf_client_get_bool(client,
- "/apps/gnome-settings/gvpndialer/starthidden",
- NULL));
-
- gtk_widget_show(preference_window);
-
- g_object_unref(client);
+ GtkWidget *preference_window;
+ GtkEntry *vpnclient_path_entry;
+ GtkEntry *vpn_profile_path_entry; GConfClient *client;
+ GtkEntry *vpnclient_default_user_entry;
+ GtkCheckButton *vpnclient_start_hidden_cb;
+
+ client = gconf_client_get_default();
+
+ preference_window = create_preference_window();
+ vpnclient_path_entry = GTK_ENTRY(lookup_widget(preference_window,
+ "vpnclient_path_entry"));
+ vpn_profile_path_entry = GTK_ENTRY(lookup_widget(preference_window,
+ "vpn_profile_path_entry"));
+ vpnclient_default_user_entry = GTK_ENTRY(lookup_widget(preference_window,
+ "vpnclient_default_user_entry"));
+ vpnclient_start_hidden_cb = GTK_CHECK_BUTTON(lookup_widget(preference_window,
+ "vpnclient_start_hidden_cb"));
+
+ gtk_entry_set_text(vpn_profile_path_entry,
+ gconf_client_get_string(client,
+ "/apps/gnome-settings/gvpndialer/profiledir",
+ NULL));
+ gtk_entry_set_text(vpnclient_path_entry,
+ gconf_client_get_string(client,
+ "/apps/gnome-settings/gvpndialer/vpnclientdir",
+ NULL));
+ gtk_entry_set_text(vpnclient_default_user_entry,
+ gconf_client_get_string(client,
+ "/apps/gnome-settings/gvpndialer/defaultuser",
+ NULL));
+
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(vpnclient_start_hidden_cb),
+ gconf_client_get_bool(client,
+ "/apps/gnome-settings/gvpndialer/starthidden",
+ NULL));
+
+ gtk_widget_show(preference_window);
+
+ g_object_unref(client);
}
+
void
on_status2_activate (GtkMenuItem *menuitem,
- gpointer user_data)
+gpointer user_data)
{
- GtkWidget *status_window;
- GtkWidget *mainwindow;
- mainwindow = lookup_widget (GTK_WIDGET(menuitem),"vpnclient_main_window");
- status_window = GTK_WIDGET(g_object_get_data(G_OBJECT(mainwindow),"statuswindow"));
- if ( vpn_connection_active == 1 ){
- gtk_widget_show(status_window);
- updatestats(status_window);
- sleep(1);
- g_timeout_add_full(0,(guint)5000,updatestats,status_window,NULL);
- } else {
- if (! GTK_WIDGET_VISIBLE(mainwindow)){
- gtk_widget_show(mainwindow);
+ GtkWidget *status_window;
+ GtkWidget *mainwindow;
+ mainwindow = lookup_widget (GTK_WIDGET(menuitem),"vpnclient_main_window");
+ status_window = GTK_WIDGET(g_object_get_data(G_OBJECT(mainwindow),"statuswindow"));
+ if ( vpn_connection_active == 1 )
+ {
+ gtk_widget_show(status_window);
+ updatestats(status_window);
+ sleep(1);
+ g_timeout_add_full(0,(guint)5000,updatestats,status_window,NULL);
+ }
+ else
+ {
+ if (! GTK_WIDGET_VISIBLE(mainwindow))
+ {
+ gtk_widget_show(mainwindow);
+ }
+ update_statusbar(mainwindow,"Status is show only when a VPN connection is active");
}
- update_statusbar(mainwindow,"Status is show only when a VPN connection is active");
- }
}
-
void
on_about1_activate (GtkMenuItem *menuitem,
- gpointer user_data)
+gpointer user_data)
{
- GtkWidget *about_window;
- about_window = create_gvpn_dialer_about();
- gtk_widget_show(about_window);
+ GtkWidget *about_window;
+ about_window = create_gvpn_dialer_about();
+ gtk_widget_show(about_window);
}
+
/* What happens when you click the Connect Button */
void
on_execute_vpn_button_clicked (GtkButton *button,
- gpointer user_data)
+gpointer user_data)
{
-
- GtkWidget *login_window;
- GtkWidget *main_window;
- GtkWidget *grouppw_window;
- GtkLabel *invalid_user_pass;
- GtkLabel *grouppw_warning_label;
- GtkEntry *username_entry;
- GConfClient *client;
- const gchar* username;
- main_window = gtk_widget_get_toplevel(GTK_WIDGET(button));
-
- /* initialize authentication attempts */
- authentication_attempts = 0;
-
- /* find the selected profile */
- GtkCombo *profile_entry_combobox = GTK_COMBO(lookup_widget(main_window,"profile_entry"));
- const gchar *selected_profile =
- gtk_entry_get_text (GTK_ENTRY(profile_entry_combobox->entry));
-
-
+
+ GtkWidget *login_window;
+ GtkWidget *main_window;
+ GtkWidget *grouppw_window;
+ GtkLabel *invalid_user_pass;
+ GtkLabel *grouppw_warning_label;
+ GtkEntry *username_entry;
+ GConfClient *client;
+ const gchar* username;
+ main_window = gtk_widget_get_toplevel(GTK_WIDGET(button));
+
+/* initialize authentication attempts */
+ authentication_attempts = 0;
+
+/* find the selected profile */
+ GtkCombo *profile_entry_combobox = GTK_COMBO(lookup_widget(main_window,"profile_entry"));
+ const gchar *selected_profile =
+ gtk_entry_get_text (GTK_ENTRY(profile_entry_combobox->entry));
/* execute VPNclient. if program starts..continue */
- if (!(executeVpnClient(selected_profile,GTK_WIDGET(button)))){
- if (! GTK_WIDGET_VISIBLE(main_window)){
- gtk_widget_show(main_window);
- }
- update_statusbar(GTK_WIDGET(button),"Cannot start vpnclient.Manually run it to determine problem");
- return;
- }
-
- /* Reset all password / username / label fields */
-
- update_statusbar(GTK_WIDGET(button),"Logging in.....");
-
- login_window = GTK_WIDGET(g_object_get_data(G_OBJECT(main_window),"loginwindow_key"));
- invalid_user_pass = GTK_LABEL(lookup_widget(login_window,"invalid_user_pass"));
- gtk_label_set_text(invalid_user_pass,
- ""
- );
-
- grouppw_window = GTK_WIDGET(g_object_get_data(G_OBJECT(main_window),"group_pass_win"));
- grouppw_warning_label = GTK_LABEL(lookup_widget(grouppw_window,"grouppw_warning"));
- gtk_label_set_text(grouppw_warning_label,"");
- client = gconf_client_get_default();
- username_entry = GTK_ENTRY(lookup_widget(login_window, "enter_username"));
- gtk_entry_set_text(username_entry,
- gconf_client_get_string(client,
- "/apps/gnome-settings/gvpndialer/defaultuser",
- NULL));
- /* put focus in password entry if username was defaulted */
- username = gtk_entry_get_text(username_entry);
- if(username[0] != '\0')
- gtk_widget_grab_focus(GTK_WIDGET(lookup_widget(login_window, "enter_password")));
- /*unreference gconfclient..always */
- g_object_unref(client);
-
+ if (!(executeVpnClient(selected_profile,GTK_WIDGET(button))))
+ {
+ if (! GTK_WIDGET_VISIBLE(main_window))
+ {
+ gtk_widget_show(main_window);
+ }
+ update_statusbar(GTK_WIDGET(button),"Cannot start vpnclient.Manually run it to determine problem");
+ return;
+ }
+
+/* Reset all password / username / label fields */
+
+ update_statusbar(GTK_WIDGET(button),"Logging in.....");
+
+ login_window = GTK_WIDGET(g_object_get_data(G_OBJECT(main_window),"loginwindow_key"));
+ invalid_user_pass = GTK_LABEL(lookup_widget(login_window,"invalid_user_pass"));
+ gtk_label_set_text(invalid_user_pass,
+ ""
+ );
+
+ grouppw_window = GTK_WIDGET(g_object_get_data(G_OBJECT(main_window),"group_pass_win"));
+ grouppw_warning_label = GTK_LABEL(lookup_widget(grouppw_window,"grouppw_warning"));
+ gtk_label_set_text(grouppw_warning_label,"");
+ client = gconf_client_get_default();
+ username_entry = GTK_ENTRY(lookup_widget(login_window, "enter_username"));
+ gtk_entry_set_text(username_entry,
+ gconf_client_get_string(client,
+ "/apps/gnome-settings/gvpndialer/defaultuser",
+ NULL));
+/* put focus in password entry if username was defaulted */
+ username = gtk_entry_get_text(username_entry);
+ if(username[0] != '\0')
+ gtk_widget_grab_focus(GTK_WIDGET(lookup_widget(login_window, "enter_password")));
+/*unreference gconfclient..always */
+ g_object_unref(client);
+
}
void
on_disconnect_button_clicked (GtkButton *button,
- gpointer user_data)
+gpointer user_data)
{
- GtkWidget *icon;
- GtkWidget *mainwindow;
-
-
- update_statusbar(GTK_WIDGET(button),"VPN Connection Terminated");
- /* set vpn connection variable to 0 */
- vpn_connection_active = 0;
- mainwindow = gtk_widget_get_toplevel(GTK_WIDGET(button));
- icon = GTK_WIDGET(g_object_get_data(G_OBJECT(mainwindow),"icon"));
- tray_icon_load(icon,"gvpndialer/status_unlocked.png");
- /* kill vpn connection */
- kill_child();
+ GtkWidget *icon;
+ GtkWidget *mainwindow;
+
+ update_statusbar(GTK_WIDGET(button),"VPN Connection Terminated");
+/* set vpn connection variable to 0 */
+ vpn_connection_active = 0;
+ mainwindow = gtk_widget_get_toplevel(GTK_WIDGET(button));
+ icon = GTK_WIDGET(g_object_get_data(G_OBJECT(mainwindow),"icon"));
+ tray_icon_load(icon,"gvpndialer/status_unlocked.png");
+/* kill vpn connection */
+ kill_child();
}
+
/* activate status window */
void
on_status_button_clicked (GtkButton *button,
- gpointer user_data)
+gpointer user_data)
{
- GtkWidget *status_window;
- GtkWidget *mainwindow;
- mainwindow = gtk_widget_get_toplevel(GTK_WIDGET(button));
- status_window = GTK_WIDGET(g_object_get_data(G_OBJECT(mainwindow),"statuswindow"));
- if ( vpn_connection_active == 1 && is_network_connection_active()){
-
- gtk_widget_show (status_window);
- updatestats(status_window);
- sleep(1);
- g_timeout_add_full(0,(guint)5000,updatestats,status_window,NULL);
- }else {
- if (! GTK_WIDGET_VISIBLE(mainwindow)){
- gtk_widget_show(mainwindow);
- }
- update_statusbar(mainwindow,"Status is shown only when an active VPN Connection");
- }
-}
+ GtkWidget *status_window;
+ GtkWidget *mainwindow;
+ mainwindow = gtk_widget_get_toplevel(GTK_WIDGET(button));
+ status_window = GTK_WIDGET(g_object_get_data(G_OBJECT(mainwindow),"statuswindow"));
+ if ( vpn_connection_active == 1 && is_network_connection_active())
+ {
+ gtk_widget_show (status_window);
+ updatestats(status_window);
+ sleep(1);
+ g_timeout_add_full(0,(guint)5000,updatestats,status_window,NULL);
+ }
+ else
+ {
+ if (! GTK_WIDGET_VISIBLE(mainwindow))
+ {
+ gtk_widget_show(mainwindow);
+ }
+ update_statusbar(mainwindow,"Status is shown only when an active VPN Connection");
+ }
+}
void
on_quit_button_clicked (GtkButton *button,
- gpointer user_data)
+gpointer user_data)
{
- /* kill gvpn dialer */
- gtk_main_quit();
+/* kill gvpn dialer */
+ gtk_main_quit();
}
void
on_vpn_profile_entry_box_changed (GtkEditable *editable,
- gpointer user_data)
+gpointer user_data)
{
- GtkWidget *mainwindow;
- mainwindow = lookup_widget(GTK_WIDGET(editable),"vpnclient_main_window");
- if ( ! (getHostnamefromProfile(GTK_WIDGET(editable)))){
- if (! GTK_WIDGET_VISIBLE(mainwindow)){
- gtk_widget_show(mainwindow);
- }
- update_statusbar(GTK_WIDGET(editable),"Cannot Read Hostname from Profile");
- } else {
- update_statusbar(GTK_WIDGET(editable),"Profile Selected");
- }
+ GtkWidget *mainwindow;
+ mainwindow = lookup_widget(GTK_WIDGET(editable),"vpnclient_main_window");
+ if ( ! (getHostnamefromProfile(GTK_WIDGET(editable))))
+ {
+ if (! GTK_WIDGET_VISIBLE(mainwindow))
+ {
+ gtk_widget_show(mainwindow);
+ }
+ update_statusbar(GTK_WIDGET(editable),"Cannot Read Hostname from Profile");
+ }
+ else
+ {
+ update_statusbar(GTK_WIDGET(editable),"Profile Selected");
+ }
}
gboolean
on_login_window_delete_event (GtkWidget *widget,
- GdkEvent *event,
- gpointer user_data)
+GdkEvent *event,
+gpointer user_data)
{
- return FALSE;
+ return FALSE;
}
+
/* cancel button on the login window */
void
on_cancel_button_clicked (GtkButton *button,
- gpointer user_data)
+gpointer user_data)
{
-GtkWidget *main_window;
- GtkWidget *toplevel;
- GtkEntry *enter_password = NULL;
- toplevel = gtk_widget_get_toplevel(GTK_WIDGET(button));
- main_window = GTK_WIDGET(
- g_object_get_data(
- G_OBJECT(toplevel),
- "mainwindow_key"));
+ GtkWidget *main_window;
+ GtkWidget *toplevel;
+ GtkEntry *enter_password = NULL;
+ toplevel = gtk_widget_get_toplevel(GTK_WIDGET(button));
+ main_window = GTK_WIDGET(
+ g_object_get_data(
+ G_OBJECT(toplevel),
+ "mainwindow_key"));
/* clear the password field of the login window */
-enter_password = GTK_ENTRY(lookup_widget(GTK_WIDGET(button),
- "enter_password"));
+ enter_password = GTK_ENTRY(lookup_widget(GTK_WIDGET(button),
+ "enter_password"));
gtk_entry_set_text(enter_password,"");
- /* Close login window and kill vpnclient */
- gtk_widget_hide(toplevel);
- update_statusbar(main_window,"Status Message");
- /* for some reason sleep causes the app not to crash if u hit cancel too many times */
- sleep(1);
- close_all_io_channels(main_window);
- kill_child();
+/* Close login window and kill vpnclient */
+ gtk_widget_hide(toplevel);
+ update_statusbar(main_window,"Status Message");
+/* for some reason sleep causes the app not to crash if u hit cancel too many times */
+ sleep(1);
+ close_all_io_channels(main_window);
+ kill_child();
}
+
/* when someone clicks submit on the login window
-*/
+ */
void
on_submit_button_clicked (GtkButton *button,
- gpointer user_data)
+gpointer user_data)
{
- GtkEntry *enter_password;
- GtkEntry *enter_username;
- GtkWidget *main_window;
- GIOChannel *ptychannel;
- GIOChannel *stdoutchannel;
- GtkWidget *login_window;
- GtkLabel *invalid_user_pass;
- const gchar *entry;
- const gchar *entry2;
- login_window = gtk_widget_get_toplevel(GTK_WIDGET(button));
- invalid_user_pass = GTK_LABEL(lookup_widget(login_window,"invalid_user_pass"));
-
- main_window = GTK_WIDGET(g_object_get_data(G_OBJECT(login_window),"mainwindow_key"));
- enter_password = GTK_ENTRY(lookup_widget(login_window,"enter_password"));
- enter_username = GTK_ENTRY(lookup_widget(login_window,"enter_username"));
- ptychannel = (GIOChannel *)g_object_get_data(G_OBJECT(main_window),"pty");
- stdoutchannel = (GIOChannel *)g_object_get_data(G_OBJECT(main_window),"stdout");
- /* check to see if someone forgot to type a username/password
- add spaces if username/password is forgotten . client will reauthenticate */
- if ( strlen(gtk_entry_get_text(enter_username)) == 0 ){
- entry = "username";
- }else {
- entry = gtk_entry_get_text(enter_username);
- }
- if ( strlen(gtk_entry_get_text(enter_password)) == 0){
- entry2 = "password";
- }else {
- entry2 = gtk_entry_get_text(enter_password);
- }
- write_text_into_fd (entry,ptychannel);
- sleep(1);
- write_text_into_fd (entry2,ptychannel);
- g_io_add_watch(stdoutchannel,G_IO_IN | G_IO_HUP, (GIOFunc)iofunc_stdout, (gpointer)main_window);
+ GtkEntry *enter_password;
+ GtkEntry *enter_username;
+ GtkWidget *main_window;
+ GIOChannel *ptychannel;
+ GIOChannel *stdoutchannel;
+ GtkWidget *login_window;
+ GtkLabel *invalid_user_pass;
+ const gchar *entry;
+ const gchar *entry2;
+ login_window = gtk_widget_get_toplevel(GTK_WIDGET(button));
+ invalid_user_pass = GTK_LABEL(lookup_widget(login_window,"invalid_user_pass"));
+
+ main_window = GTK_WIDGET(g_object_get_data(G_OBJECT(login_window),"mainwindow_key"));
+ enter_password = GTK_ENTRY(lookup_widget(login_window,"enter_password"));
+ enter_username = GTK_ENTRY(lookup_widget(login_window,"enter_username"));
+ ptychannel = (GIOChannel *)g_object_get_data(G_OBJECT(main_window),"pty");
+ stdoutchannel = (GIOChannel *)g_object_get_data(G_OBJECT(main_window),"stdout");
+/* check to see if someone forgot to type a username/password
+add spaces if username/password is forgotten . client will reauthenticate */
+ if ( strlen(gtk_entry_get_text(enter_username)) == 0 )
+ {
+ entry = "username";
+ }
+ else
+ {
+ entry = gtk_entry_get_text(enter_username);
+ }
+ if ( strlen(gtk_entry_get_text(enter_password)) == 0)
+ {
+ entry2 = "password";
+ }
+ else
+ {
+ entry2 = gtk_entry_get_text(enter_password);
+ }
+ write_text_into_fd (entry,ptychannel);
+ sleep(1);
+ write_text_into_fd (entry2,ptychannel);
+ g_io_add_watch(stdoutchannel,G_IO_IN | G_IO_HUP, (GIOFunc)iofunc_stdout, (gpointer)main_window);
gtk_widget_hide(login_window);
}
-
gboolean
on_preference_window_delete_event (GtkWidget *widget,
- GdkEvent *event,
- gpointer user_data)
+GdkEvent *event,
+gpointer user_data)
{
- return FALSE;
+ return FALSE;
}
void
on_preference_cancel_button_clicked (GtkButton *button,
- gpointer user_data)
+gpointer user_data)
{
- /* kill window with no changes done */
- gtk_widget_destroy(gtk_widget_get_toplevel(GTK_WIDGET(button)));
+/* kill window with no changes done */
+ gtk_widget_destroy(gtk_widget_get_toplevel(GTK_WIDGET(button)));
}
void
on_preference_apply_button_clicked (GtkButton *button,
- gpointer user_data)
+gpointer user_data)
{
- GtkEntry *vpnclient_path_entry;
- GtkEntry *vpn_profile_path_entry;
- GtkEntry *vpnclient_default_user_entry;
- GtkCheckButton *vpnclient_start_hidden_cb;
- const gchar *gtkentry_text;
- GtkWidget *main_window;
- GConfClient *client;
-
- client = gconf_client_get_default();
- main_window = gtk_widget_get_toplevel(GTK_WIDGET(button));
- vpnclient_path_entry = GTK_ENTRY(lookup_widget(GTK_WIDGET(button),
- "vpnclient_path_entry"));
- vpn_profile_path_entry = GTK_ENTRY(lookup_widget(GTK_WIDGET(button),
- "vpn_profile_path_entry"));
- vpnclient_default_user_entry = GTK_ENTRY(lookup_widget(GTK_WIDGET(button),
- "vpnclient_default_user_entry"));
-
- vpnclient_start_hidden_cb = GTK_CHECK_BUTTON(lookup_widget(GTK_WIDGET(button),
- "vpnclient_start_hidden_cb"));
-
- gtkentry_text = gtk_entry_get_text(vpnclient_path_entry);
- gconf_client_set_string(client,"/apps/gnome-settings/gvpndialer/vpnclientdir"
- ,gtkentry_text,NULL);
-
-
- gtkentry_text = gtk_entry_get_text(vpn_profile_path_entry);
- gconf_client_set_string(client,
- "/apps/gnome-settings/gvpndialer/profiledir",
- gtkentry_text,
- NULL);
-
- gtkentry_text = gtk_entry_get_text(vpnclient_default_user_entry);
- gconf_client_set_string(client,
- "/apps/gnome-settings/gvpndialer/defaultuser",
- gtkentry_text,
- NULL);
-
- gconf_client_set_bool(client,
- "/apps/gnome-settings/gvpndialer/starthidden",
- gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(vpnclient_start_hidden_cb)),
- NULL);
-
- gtk_widget_destroy(gtk_widget_get_toplevel(GTK_WIDGET(button)));
-
- g_object_unref(client);
+ GtkEntry *vpnclient_path_entry;
+ GtkEntry *vpn_profile_path_entry;
+ GtkEntry *vpnclient_default_user_entry;
+ GtkCheckButton *vpnclient_start_hidden_cb;
+ const gchar *gtkentry_text;
+ GtkWidget *main_window;
+ GConfClient *client;
+
+ client = gconf_client_get_default();
+ main_window = gtk_widget_get_toplevel(GTK_WIDGET(button));
+ vpnclient_path_entry = GTK_ENTRY(lookup_widget(GTK_WIDGET(button),
+ "vpnclient_path_entry"));
+ vpn_profile_path_entry = GTK_ENTRY(lookup_widget(GTK_WIDGET(button),
+ "vpn_profile_path_entry"));
+ vpnclient_default_user_entry = GTK_ENTRY(lookup_widget(GTK_WIDGET(button),
+ "vpnclient_default_user_entry"));
+
+ vpnclient_start_hidden_cb = GTK_CHECK_BUTTON(lookup_widget(GTK_WIDGET(button),
+ "vpnclient_start_hidden_cb"));
+
+ gtkentry_text = gtk_entry_get_text(vpnclient_path_entry);
+ gconf_client_set_string(client,"/apps/gnome-settings/gvpndialer/vpnclientdir"
+ ,gtkentry_text,NULL);
+
+ gtkentry_text = gtk_entry_get_text(vpn_profile_path_entry);
+ gconf_client_set_string(client,
+ "/apps/gnome-settings/gvpndialer/profiledir",
+ gtkentry_text,
+ NULL);
+
+ gtkentry_text = gtk_entry_get_text(vpnclient_default_user_entry);
+ gconf_client_set_string(client,
+ "/apps/gnome-settings/gvpndialer/defaultuser",
+ gtkentry_text,
+ NULL);
+
+ gconf_client_set_bool(client,
+ "/apps/gnome-settings/gvpndialer/starthidden",
+ gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(vpnclient_start_hidden_cb)),
+ NULL);
+
+ gtk_widget_destroy(gtk_widget_get_toplevel(GTK_WIDGET(button)));
+
+ g_object_unref(client);
}
gboolean
on_status_window_delete_event (GtkWidget *widget,
- GdkEvent *event,
- gpointer user_data)
+GdkEvent *event,
+gpointer user_data)
{
- return FALSE;
+ return FALSE;
}
+
void
on_enter_username_activate (GtkEntry *entry,
- gpointer user_data)
+gpointer user_data)
{
}
@@ -466,17 +489,17 @@ on_enter_username_activate (GtkEntry *entry,
void
on_enter_password_activate (GtkEntry *entry,
- gpointer user_data)
+gpointer user_data)
{
- GtkButton *mybutton;
- mybutton = GTK_BUTTON(lookup_widget(GTK_WIDGET(entry),"submit_button"));
- on_submit_button_clicked(mybutton,user_data);
+ GtkButton *mybutton;
+ mybutton = GTK_BUTTON(lookup_widget(GTK_WIDGET(entry),"submit_button"));
+ on_submit_button_clicked(mybutton,user_data);
}
void
on_submit_button_activate (GtkButton *button,
- gpointer user_data)
+gpointer user_data)
{
}
@@ -484,68 +507,72 @@ on_submit_button_activate (GtkButton *button,
void
on_status_window_show (GtkWidget *widget,
- gpointer user_data)
+gpointer user_data)
{
-
-
+
}
+
void
on_close_status_window_button_clicked (GtkButton *button,
- gpointer user_data)
+gpointer user_data)
{
- /* hide window */
- gtk_widget_hide(gtk_widget_get_toplevel(GTK_WIDGET(button)));
-
+/* hide window */
+ gtk_widget_hide(gtk_widget_get_toplevel(GTK_WIDGET(button)));
+
}
/** BEGIN NON-GLADE FUNCTIONS **/
+int kill_child()
+{
+
+/* borrowed from http://www.linux-mag.com/2000-02/compile_03.html
+ Kills the child process graciously */
+
+ pid_t rc;
-int kill_child(){
-
-
- /* borrowed from http://www.linux-mag.com/2000-02/compile_03.html
- Kills the child process graciously */
-
- pid_t rc;
-
- if (vpnclient_pid > 1 ){
- kill(vpnclient_pid, SIGTERM);
- alarm(2);
- rc = waitpid(vpnclient_pid, NULL,0);
- alarm(0);
- if (rc) {
- /* we were interrupted by an alarm :-( */
- kill(SIGKILL, SIGTERM);
- rc = waitpid(vpnclient_pid, NULL,0);
+ if (vpnclient_pid > 1 )
+ {
+ kill(vpnclient_pid, SIGTERM);
+ alarm(2);
+ rc = waitpid(vpnclient_pid, NULL,0);
+ alarm(0);
+ if (rc)
+ {
+/* we were interrupted by an alarm :-( */
+ kill(SIGKILL, SIGTERM);
+ rc = waitpid(vpnclient_pid, NULL,0);
+ }
+ return 1;
}
- return 1;
- }
- return 0;
+ return 0;
}
+
/* write text into stdin of forked process */
-int write_text_into_fd (const gchar *my_text_entry,GIOChannel *ioc ){
- GString *i_buffer = NULL;
-
- i_buffer = g_string_new(my_text_entry);
+int write_text_into_fd (const gchar *my_text_entry,GIOChannel *ioc )
+{
+ GString *i_buffer = NULL;
+
+ i_buffer = g_string_new(my_text_entry);
/* if buffer is empty, return zero. Something must be written */
- if ( i_buffer->len == 0 ){
+ if ( i_buffer->len == 0 )
+ {
+ g_string_free(i_buffer,TRUE);
+ return 0;
+ }
+ i_buffer = g_string_append_c(i_buffer,'\r');
+ g_io_channel_write_chars(ioc,i_buffer->str,strlen(i_buffer->str),NULL,NULL);
+ g_io_channel_flush(ioc,NULL);
g_string_free(i_buffer,TRUE);
- return 0;
- }
- i_buffer = g_string_append_c(i_buffer,'\r');
- g_io_channel_write_chars(ioc,i_buffer->str,strlen(i_buffer->str),NULL,NULL);
- g_io_channel_flush(ioc,NULL);
- g_string_free(i_buffer,TRUE);
- return 1;
+ return 1;
}
-/* Read Vpnclient stdout and taken appropriate action depending on
+/* Read Vpnclient stdout and taken appropriate action depending on
what it prints outs
* returns 1 if you want to continue monitoring stdout activity
* returns 0 if you don't want to monitor stdout activity.
@@ -553,7 +580,8 @@ what it prints outs
*/
gboolean
-iofunc_stdout (GIOChannel *ioc, GIOCondition cond, gpointer data){
+iofunc_stdout (GIOChannel *ioc, GIOCondition cond, gpointer data)
+{
#define GROUP_PASSWORD 1
#define REAUTHENTICATE 2
#define ENTER_USERNAME 3
@@ -563,728 +591,795 @@ iofunc_stdout (GIOChannel *ioc, GIOCondition cond, gpointer data){
#define CONNECTION_TERMINATED 7
#define REASON_FOR_FAILURE 8
#define SAVE_PASS 9
-
- GtkWidget *main_window = GTK_WIDGET(data);
- GtkWidget *login_window;
- GtkWidget *grouppw_window;
- GtkLabel *invalid_user_pass;
- GtkEntry *enter_password;
- GtkEntry *enter_username;
- GtkEntry *enter_grouppw;
- gchar **reason = NULL;
- gchar *line;
- GIOStatus ret;
- GString *buf = g_string_new_len("",BUFSIZE);
- GtkWidget *vpn_profile_combolist;
- GConfClient *client;
- GtkWidget *icon;
- int count = 0;
- GIOChannel *pty_channel = (GIOChannel *)g_object_get_data(G_OBJECT(main_window),"pty");
-
- /* if something is seriously wrong..kill process */
- if ( cond & G_IO_HUP ){
- close_all_io_channels(main_window);
- kill_child();
- g_string_free(buf,TRUE);
- /* stop monitoring stdout of the process */
- return 0;
- }
- /* Get relevant widgets */
- login_window = GTK_WIDGET(g_object_get_data
- (G_OBJECT(main_window),"loginwindow_key"));
- grouppw_window = GTK_WIDGET(g_object_get_data
- (G_OBJECT(main_window),"group_pass_win"));
-
- enter_password = GTK_ENTRY(lookup_widget
- (login_window,"enter_password"));
- enter_username = GTK_ENTRY(lookup_widget
- (login_window,"enter_username"));
- invalid_user_pass = GTK_LABEL(lookup_widget
- (login_window,"invalid_user_pass"));
- enter_grouppw = GTK_ENTRY(lookup_widget
- (grouppw_window,"group_pw_entry"));
- /* there is something to read */
- if ( cond & G_IO_IN ){
- while ( ret != G_IO_STATUS_EOF ){
- ret = g_io_channel_read_line_string(ioc,buf,NULL,NULL);
- if ( ret == G_IO_STATUS_AGAIN ){
- /* print out a prompt */
- g_string_free(buf,TRUE);
- buf = g_string_new_len("",BUFSIZE);
- ret = g_io_channel_read_chars(ioc,buf->str,BUFSIZE,NULL,NULL);}
- if ( ret == G_IO_STATUS_NORMAL ){
-
- switch (check_for_events(buf))
- {
-
- case GROUP_PASSWORD:
- /* show password group window
- exit iofunc_stdout, stop monitoring stdout activity */
- gtk_widget_grab_focus(GTK_WIDGET(enter_grouppw));
- gtk_widget_show(grouppw_window);
- g_string_free(buf,TRUE);
- return 0;
- break;
- case CONTACTING_GATEWAY:
- update_statusbar(main_window,buf->str);
- continue;
- case REAUTHENTICATE:
- /* show the invalid username field if authentication failed */
- if ( authentication_attempts > 0 ){
- gtk_label_set_text
- (invalid_user_pass,
- "Invalid Username or Password");
- gtk_widget_grab_focus(GTK_WIDGET(enter_password));
-
- }
- continue;
-
- case ENTER_USERNAME:
- gtk_entry_set_text(enter_password,"");
- /* set the focus back onto the username entry */
- gtk_widget_grab_focus(GTK_WIDGET(enter_username));
- authentication_attempts++;
- gtk_widget_show(login_window);
- g_string_free(buf,TRUE);
- return 0;
- break;
- case CONTINUE_YES:
- write_text_into_fd ("yes",pty_channel);
- break;
-
- case CONNECTION_TERMINATED:
- gtk_entry_set_text(enter_password,"");
- gtk_entry_set_text(enter_username,"");
- gtk_entry_set_text(enter_grouppw,"");
- count++;
- sleep(1);
- continue;
-
- case VPN_SECURE:
- gtk_entry_set_text(enter_password,"");
- gtk_entry_set_text(enter_username,"");
- update_statusbar(main_window,"VPN Connection Active");
- vpn_connection_active = 1;
- /* save successfully used profile . Will default to this next time */
- vpn_profile_combolist = lookup_widget(main_window,"profile_entry");
- /* initialize gconfclient */
- client = gconf_client_get_default();
- gconf_client_set_string
- (client,
- "/apps/gnome-settings/gvpndialer/lastchosenprofile",
- gtk_entry_get_text
- (GTK_ENTRY(GTK_COMBO(vpn_profile_combolist)->entry)),NULL);
- g_object_unref(client);
- /* change icon to be the closed padlock */
- icon = GTK_WIDGET(g_object_get_data(G_OBJECT(main_window),"icon"));
- tray_icon_load (icon,"gvpndialer/status_lock.png");
- gtk_widget_hide(main_window);
- /* no need to read stdout anymore. stop monitoring it. */
- g_string_free(buf,TRUE);
- sleep(2); /* don't know why i need to do this. stops app from crashing */
- /* Check VPN status now that connection is secure.
- Do something if something bad happens */
- g_timeout_add((guint)1000,is_vpn_connection_active_full,(gpointer)main_window);
- return 0;
- break;
-
- case REASON_FOR_FAILURE:
- if (! GTK_WIDGET_VISIBLE(main_window)){
- gtk_widget_show(main_window);
- }
- if ( count > 0 ){
- reason = g_strsplit(g_strchomp(buf->str),"Reason:",2);
- update_statusbar(main_window,reason[1]);
- g_strfreev(reason);
- g_string_free(buf,TRUE);
- }else {
- g_string_free(buf,TRUE);
- update_statusbar(main_window,
- "VPNclient terminated for unknown reason");
- }
- /* check to see if process is active. if not kill it */
- if (is_vpn_connection_active() ){
- close_all_io_channels(main_window);
- kill_child();
- }
- return 0;
- break;
-
- case SAVE_PASS:
- write_text_into_fd ("n",pty_channel);
- break;
-
- default:
- continue;
- }
- }
- return 1;
+
+ GtkWidget *main_window = GTK_WIDGET(data);
+ GtkWidget *login_window;
+ GtkWidget *grouppw_window;
+ GtkLabel *invalid_user_pass;
+ GtkEntry *enter_password;
+ GtkEntry *enter_username;
+ GtkEntry *enter_grouppw;
+ gchar **reason = NULL;
+ gchar *line;
+ GIOStatus ret;
+ GString *buf = g_string_new_len("",BUFSIZE);
+ GtkWidget *vpn_profile_combolist;
+ GConfClient *client;
+ GtkWidget *icon;
+ int count = 0;
+ GIOChannel *pty_channel = (GIOChannel *)g_object_get_data(G_OBJECT(main_window),"pty");
+
+/* if something is seriously wrong..kill process */
+ if ( cond & G_IO_HUP )
+ {
+ close_all_io_channels(main_window);
+ kill_child();
+ g_string_free(buf,TRUE);
+/* stop monitoring stdout of the process */
+ return 0;
}
- }
- g_string_free(buf,TRUE);
- return 1;
+/* Get relevant widgets */
+ login_window = GTK_WIDGET(g_object_get_data
+ (G_OBJECT(main_window),"loginwindow_key"));
+ grouppw_window = GTK_WIDGET(g_object_get_data
+ (G_OBJECT(main_window),"group_pass_win"));
+
+ enter_password = GTK_ENTRY(lookup_widget
+ (login_window,"enter_password"));
+ enter_username = GTK_ENTRY(lookup_widget
+ (login_window,"enter_username"));
+ invalid_user_pass = GTK_LABEL(lookup_widget
+ (login_window,"invalid_user_pass"));
+ enter_grouppw = GTK_ENTRY(lookup_widget
+ (grouppw_window,"group_pw_entry"));
+/* there is something to read */
+ if ( cond & G_IO_IN )
+ {
+ while ( ret != G_IO_STATUS_EOF )
+ {
+ ret = g_io_channel_read_line_string(ioc,buf,NULL,NULL);
+ if ( ret == G_IO_STATUS_AGAIN )
+ {
+/* print out a prompt */
+ g_string_free(buf,TRUE);
+ buf = g_string_new_len("",BUFSIZE);
+ ret = g_io_channel_read_chars(ioc,buf->str,BUFSIZE,NULL,NULL);
+ }
+ if ( ret == G_IO_STATUS_NORMAL )
+ {
+
+ switch (check_for_events(buf))
+ {
+
+ case GROUP_PASSWORD:
+/* show password group window
+ exit iofunc_stdout, stop monitoring stdout activity */
+ gtk_widget_grab_focus(GTK_WIDGET(enter_grouppw));
+ gtk_widget_show(grouppw_window);
+ g_string_free(buf,TRUE);
+ return 0;
+ break;
+ case CONTACTING_GATEWAY:
+ update_statusbar(main_window,buf->str);
+ continue;
+ case REAUTHENTICATE:
+/* show the invalid username field if authentication failed */
+ if ( authentication_attempts > 0 )
+ {
+ gtk_label_set_text
+ (invalid_user_pass,
+ "Invalid Username or Password");
+ gtk_widget_grab_focus(GTK_WIDGET(enter_password));
+
+ }
+ continue;
+
+ case ENTER_USERNAME:
+ gtk_entry_set_text(enter_password,"");
+/* set the focus back onto the username entry */
+ gtk_widget_grab_focus(GTK_WIDGET(enter_username));
+ authentication_attempts++;
+ gtk_widget_show(login_window);
+ g_string_free(buf,TRUE);
+ return 0;
+ break;
+ case CONTINUE_YES:
+ write_text_into_fd ("yes",pty_channel);
+ break;
+
+ case CONNECTION_TERMINATED:
+ gtk_entry_set_text(enter_password,"");
+ gtk_entry_set_text(enter_username,"");
+ gtk_entry_set_text(enter_grouppw,"");
+ count++;
+ sleep(1);
+ continue;
+
+ case VPN_SECURE:
+ gtk_entry_set_text(enter_password,"");
+ gtk_entry_set_text(enter_username,"");
+ update_statusbar(main_window,"VPN Connection Active");
+ vpn_connection_active = 1;
+/* save successfully used profile . Will default to this next time */
+ vpn_profile_combolist = lookup_widget(main_window,"profile_entry");
+/* initialize gconfclient */
+ client = gconf_client_get_default();
+ gconf_client_set_string
+ (client,
+ "/apps/gnome-settings/gvpndialer/lastchosenprofile",
+ gtk_entry_get_text
+ (GTK_ENTRY(GTK_COMBO(vpn_profile_combolist)->entry)),NULL);
+ g_object_unref(client);
+/* change icon to be the closed padlock */
+ icon = GTK_WIDGET(g_object_get_data(G_OBJECT(main_window),"icon"));
+ tray_icon_load (icon,"gvpndialer/status_lock.png");
+ gtk_widget_hide(main_window);
+/* no need to read stdout anymore. stop monitoring it. */
+ g_string_free(buf,TRUE);
+ sleep(2); /* don't know why i need to do this. stops app from crashing */
+/* Check VPN status now that connection is secure.
+ Do something if something bad happens */
+ g_timeout_add((guint)1000,is_vpn_connection_active_full,(gpointer)main_window);
+ return 0;
+ break;
+
+ case REASON_FOR_FAILURE:
+ if (! GTK_WIDGET_VISIBLE(main_window))
+ {
+ gtk_widget_show(main_window);
+ }
+ if ( count > 0 )
+ {
+ reason = g_strsplit(g_strchomp(buf->str),"Reason:",2);
+ update_statusbar(main_window,reason[1]);
+ g_strfreev(reason);
+ g_string_free(buf,TRUE);
+ }
+ else
+ {
+ g_string_free(buf,TRUE);
+ update_statusbar(main_window,
+ "VPNclient terminated for unknown reason");
+ }
+/* check to see if process is active. if not kill it */
+ if (is_vpn_connection_active() )
+ {
+ close_all_io_channels(main_window);
+ kill_child();
+ }
+ return 0;
+ break;
+
+ case SAVE_PASS:
+ write_text_into_fd ("n",pty_channel);
+ break;
+
+ default:
+ continue;
+ }
+ }
+ return 1;
+ }
+ }
+ g_string_free(buf,TRUE);
+ return 1;
}
+
void
update_statusbar( GtkWidget *anywidget,
- gchar *status_message){
-
-
- GnomeAppBar *statusbar = GNOME_APPBAR(lookup_widget(anywidget,"statusbar"));
- gnome_appbar_push(statusbar,status_message);
+gchar *status_message)
+{
+
+ GnomeAppBar *statusbar = GNOME_APPBAR(lookup_widget(anywidget,"statusbar"));
+ gnome_appbar_push(statusbar,status_message);
}
+
/* return 1 if successful, or 0 if not */
int
executeVpnClient(const gchar *profile,
- GtkWidget *widget){
- gchar *filename = NULL;
- gchar *vpn_args[4];
- GConfClient *client;
- GtkWidget *mainwindow = gtk_widget_get_toplevel(widget);
-
- client = gconf_client_get_default();
- filename = gconf_client_get_string(client,"/apps/gnome-settings/gvpndialer/vpnclientdir",NULL);
- if(filename != NULL ){
- filename = g_strjoin("/",filename,"vpnclient",NULL);
- }else{
- filename = "vpnclient";
- }
- g_object_unref(client);
- vpn_args[0] = filename;
- vpn_args[1] = "connect";
- vpn_args[2] = (gchar *)profile;
- vpn_args[3] = NULL;
-
- /* start vpnclient */
- start_term(vpn_args,mainwindow);
-
- /* check to see if vpnclient was successfully activated */
- if ( vpnclient_pid <= 1 ){
-
- return 0;
- }
-
- return 1;
+GtkWidget *widget)
+{
+ gchar *filename = NULL;
+ gchar *vpn_args[4];
+ GConfClient *client;
+ GtkWidget *mainwindow = gtk_widget_get_toplevel(widget);
+
+ client = gconf_client_get_default();
+ filename = gconf_client_get_string(client,"/apps/gnome-settings/gvpndialer/vpnclientdir",NULL);
+ if(filename != NULL )
+ {
+ filename = g_strjoin("/",filename,"vpnclient",NULL);
+ }
+ else
+ {
+ filename = "vpnclient";
+ }
+ g_object_unref(client);
+ vpn_args[0] = filename;
+ vpn_args[1] = "connect";
+ vpn_args[2] = (gchar *)profile;
+ vpn_args[3] = NULL;
+
+/* start vpnclient */
+ start_term(vpn_args,mainwindow);
+
+/* check to see if vpnclient was successfully activated */
+ if ( vpnclient_pid <= 1 )
+ {
+
+ return 0;
+ }
+
+ return 1;
}
-/* creates pty
+
+/* creates pty
Used code from anjuta and gst projects.
*/
-
+
void start_term ( gchar **args, GtkWidget *main_window)
{
- int pty_master_fd, md;
- int stdout_pipe[2],stderr_pipe[2];
- GIOChannel *pty_channel = NULL;
- GIOChannel *stdout_channel = NULL;
- GIOChannel *stderr_channel = NULL;
-
-
- pipe (stderr_pipe);
- pipe (stdout_pipe);
- /* Fork the command */
- vpnclient_pid = forkpty (&pty_master_fd, NULL, NULL, NULL);
- if (vpnclient_pid == 0)
+ int pty_master_fd, md;
+ int stdout_pipe[2],stderr_pipe[2];
+ GIOChannel *pty_channel = NULL;
+ GIOChannel *stdout_channel = NULL;
+ GIOChannel *stderr_channel = NULL;
+
+ pipe (stderr_pipe);
+ pipe (stdout_pipe);
+/* Fork the command */
+ vpnclient_pid = forkpty (&pty_master_fd, NULL, NULL, NULL);
+ if (vpnclient_pid == 0)
{
- unsetenv("LC_ALL");
- unsetenv("LC_MESSAGES");
- unsetenv("LANG");
- unsetenv("LANGUAGE");
-
- dup2 (stderr_pipe[1],2);
- dup2 (stdout_pipe[1],1);
-
- /* Close unnecessary pipes */
- close (stderr_pipe[0]);
- close (stdout_pipe[0]);
-
- execvp (args[0], args);
- exit(255);
- }
-
- /* Close parent's side pipes */
- close (stderr_pipe[1]);
- close (stdout_pipe[1]);
-
- if (vpnclient_pid < 0)
+ unsetenv("LC_ALL");
+ unsetenv("LC_MESSAGES");
+ unsetenv("LANG");
+ unsetenv("LANGUAGE");
+
+ dup2 (stderr_pipe[1],2);
+ dup2 (stdout_pipe[1],1);
+
+/* Close unnecessary pipes */
+ close (stderr_pipe[0]);
+ close (stdout_pipe[0]);
+
+ execvp (args[0], args);
+ exit(255);
+ }
+
+/* Close parent's side pipes */
+ close (stderr_pipe[1]);
+ close (stdout_pipe[1]);
+
+ if (vpnclient_pid < 0)
{
- /* if fork failed */
- /* Close parent's side pipes */
- close (stderr_pipe[0]);
- close (stdout_pipe[0]);
- exit(255);
+/* if fork failed */
+/* Close parent's side pipes */
+ close (stderr_pipe[0]);
+ close (stdout_pipe[0]);
+ exit(255);
}
-
-
- /* Initialize GIOChannels */
- pty_channel = g_io_channel_unix_new(pty_master_fd);
- stderr_channel = g_io_channel_unix_new (stderr_pipe[0]);
- stdout_channel = g_io_channel_unix_new (stdout_pipe[0]);
- /* Set channels to not block */
- g_io_channel_set_flags(stdout_channel,G_IO_FLAG_NONBLOCK,NULL);
- g_io_channel_set_flags(stderr_channel,G_IO_FLAG_NONBLOCK,NULL);
- g_io_channel_set_flags(pty_channel, G_IO_FLAG_NONBLOCK,NULL);
- /* track stdout and stderr channel using main_window widget */
- g_object_set_data(G_OBJECT(main_window),"stdout",stdout_channel);
- g_object_set_data(G_OBJECT(main_window),"stderr",stderr_channel);
- g_object_set_data(G_OBJECT(main_window),"pty",pty_channel);
-
- /* Watch events for stdout stream */
- g_io_add_watch (stdout_channel,
- G_IO_IN | G_IO_HUP ,
- (GIOFunc)iofunc_stdout, (gpointer)main_window);
- /* Exit. Process created successfully! */
+/* Initialize GIOChannels */
+ pty_channel = g_io_channel_unix_new(pty_master_fd);
+ stderr_channel = g_io_channel_unix_new (stderr_pipe[0]);
+ stdout_channel = g_io_channel_unix_new (stdout_pipe[0]);
+/* Set channels to not block */
+ g_io_channel_set_flags(stdout_channel,G_IO_FLAG_NONBLOCK,NULL);
+ g_io_channel_set_flags(stderr_channel,G_IO_FLAG_NONBLOCK,NULL);
+ g_io_channel_set_flags(pty_channel, G_IO_FLAG_NONBLOCK,NULL);
+/* track stdout and stderr channel using main_window widget */
+ g_object_set_data(G_OBJECT(main_window),"stdout",stdout_channel);
+ g_object_set_data(G_OBJECT(main_window),"stderr",stderr_channel);
+ g_object_set_data(G_OBJECT(main_window),"pty",pty_channel);
+
+/* Watch events for stdout stream */
+ g_io_add_watch (stdout_channel,
+ G_IO_IN | G_IO_HUP ,
+ (GIOFunc)iofunc_stdout, (gpointer)main_window);
+/* Exit. Process created successfully! */
}
+
int getHostnamefromProfile(GtkWidget *mywidget)
{
- int profile_fd;
- GIOChannel *Mychannel = NULL;
- GError *error = NULL;
- GString *line = NULL;
- gboolean pending;
- gchar *matching_line = "Host";
- gchar **host = NULL;
- gchar *filename = NULL;
- GConfClient *client ;
- GtkEntry *hostname_entry ;
-
-
- client = gconf_client_get_default();
- hostname_entry = GTK_ENTRY(lookup_widget(mywidget,
- "hostname_entry" ));
- filename = gtk_editable_get_chars(GTK_EDITABLE(mywidget),0,-1);
- filename = g_strjoin(".",filename,"pcf",NULL);
-
- filename = g_strjoin("/",
- gconf_client_get_string(
- client,
- "/apps/gnome-settings/gvpndialer/profiledir",
- NULL),
- filename,
- NULL
- );
- g_object_unref(client);
- /* Initialize GString */
- line = g_string_new("");
- /* Use open to create a file descriptor that points to an int */
- profile_fd = open(filename,O_RDONLY);
- /* for some reason the widget chooses a filename that doesn't exist need to catch this */
- if ( profile_fd == -1 ){
- return 0;
- }
+ int profile_fd;
+ GIOChannel *Mychannel = NULL;
+ GError *error = NULL;
+ GString *line = NULL;
+ gboolean pending;
+ gchar *matching_line = "Host";
+ gchar **host = NULL;
+ gchar *filename = NULL;
+ GConfClient *client ;
+ GtkEntry *hostname_entry ;
+
+ client = gconf_client_get_default();
+ hostname_entry = GTK_ENTRY(lookup_widget(mywidget,
+ "hostname_entry" ));
+ filename = gtk_editable_get_chars(GTK_EDITABLE(mywidget),0,-1);
+ filename = g_strjoin(".",filename,"pcf",NULL);
+
+ filename = g_strjoin("/",
+ gconf_client_get_string(
+ client,
+ "/apps/gnome-settings/gvpndialer/profiledir",
+ NULL),
+ filename,
+ NULL
+ );
+ g_object_unref(client);
+/* Initialize GString */
+ line = g_string_new("");
+/* Use open to create a file descriptor that points to an int */
+ profile_fd = open(filename,O_RDONLY);
+/* for some reason the widget chooses a filename that doesn't exist need to catch this */
+ if ( profile_fd == -1 )
+ {
+ return 0;
+ }
- Mychannel = g_io_channel_unix_new(profile_fd);
- if(Mychannel != NULL )
+ Mychannel = g_io_channel_unix_new(profile_fd);
+ if(Mychannel != NULL )
{
- /* read each line of the file, and find the line starting with
+/* read each line of the file, and find the line starting with
Host
- split the line and only print out the hostname */
- while(g_io_channel_read_line_string
+ split the line and only print out the hostname */
+ while(g_io_channel_read_line_string
(Mychannel,line,NULL,&error) == G_IO_STATUS_NORMAL)
{
- if (g_ascii_strncasecmp(line->str,matching_line,4) == 0 )
+ if (g_ascii_strncasecmp(line->str,matching_line,4) == 0 )
{
- host = g_strsplit(g_strchomp(line->str),"=",2);
- gtk_entry_set_text(hostname_entry,host[1]);
- break;
+ host = g_strsplit(g_strchomp(line->str),"=",2);
+ gtk_entry_set_text(hostname_entry,host[1]);
+ break;
}
}
- } else {
- return 0;
}
- g_io_channel_shutdown(Mychannel,pending,&error);
- g_free(filename);
- g_strfreev(host);
- g_string_free(line,TRUE);
- close(profile_fd);
- return 1;
+ else
+ {
+ return 0;
+ }
+ g_io_channel_shutdown(Mychannel,pending,&error);
+ g_free(filename);
+ g_strfreev(host);
+ g_string_free(line,TRUE);
+ close(profile_fd);
+ return 1;
}
+
/* according to GTK API GtkCombo is deprecated ..
Need to work on using new way but also supporting old way */
int
getProfiles (gchar *dir_path,
- GtkCombo *vpn_profile_entry){
-
- GDir *directory = NULL;
- GList *vpn_profiles = NULL;
- GError **error = NULL;
- gchar *filename = NULL;
- gchar **split_string = NULL;
- gchar *lastprofile;
- GConfClient *client;
- int count = 0;
- int last_profile_exists = 0;
-
- client = gconf_client_get_default();
- lastprofile = gconf_client_get_string(client,"/apps/gnome-settings/gvpndialer/lastchosenprofile",NULL);
-
-
- /*unreference gconfclient */
- g_object_unref(client);
-
- directory = g_dir_open(dir_path,0,error);
- while ((filename = (gchar *) g_dir_read_name(directory)) != NULL ){ /*run for *.pcf file only */
- if (g_str_has_suffix(filename,"pcf") == TRUE ){
- /* save filename in Glist */
- count++;
-
- split_string = g_strsplit(filename,".",2);
- /* put the default profile at the top of the list */
- if(( lastprofile != NULL )
- && (last_profile_exists == 0 ) ){
-
- if ( ( g_ascii_strcasecmp(lastprofile,split_string[0])) == 0 ){
- last_profile_exists = 1;
- }else {
- vpn_profiles = g_list_append (vpn_profiles,split_string[0]);
- }
-
- }else{
- vpn_profiles = g_list_append (vpn_profiles, split_string[0]); }
+GtkCombo *vpn_profile_entry)
+{
+
+ GDir *directory = NULL;
+ GList *vpn_profiles = NULL;
+ GError **error = NULL;
+ gchar *filename = NULL;
+ gchar **split_string = NULL;
+ gchar *lastprofile;
+ GConfClient *client;
+ int count = 0;
+ int last_profile_exists = 0;
+
+ client = gconf_client_get_default();
+ lastprofile = gconf_client_get_string(client,"/apps/gnome-settings/gvpndialer/lastchosenprofile",NULL);
+
+/*unreference gconfclient */
+ g_object_unref(client);
+
+ directory = g_dir_open(dir_path,0,error);
+ /*run for *.pcf file only */
+ while ((filename = (gchar *) g_dir_read_name(directory)) != NULL )
+ {
+ if (g_str_has_suffix(filename,"pcf") == TRUE )
+ {
+/* save filename in Glist */
+ count++;
+
+ split_string = g_strsplit(filename,".",2);
+/* put the default profile at the top of the list */
+ if(( lastprofile != NULL )
+ && (last_profile_exists == 0 ) )
+ {
+
+ if ( ( g_ascii_strcasecmp(lastprofile,split_string[0])) == 0 )
+ {
+ last_profile_exists = 1;
+ }
+ else
+ {
+ vpn_profiles = g_list_append (vpn_profiles,split_string[0]);
+ }
+
+ }
+ else
+ {
+ vpn_profiles = g_list_append (vpn_profiles, split_string[0]);
+ }
+ }
}
- }
-
- if ( count == 0 ) return 0;
- /* sort list alphabetically */
- vpn_profiles = glist_strings_sort(vpn_profiles);
- /* add last used profile to the top */
- if (last_profile_exists == 1 ){
- vpn_profiles = g_list_prepend (vpn_profiles,lastprofile);
- }
- gtk_combo_set_popdown_strings(vpn_profile_entry,vpn_profiles);
- g_dir_close(directory);
- g_list_free(vpn_profiles);
- g_free(lastprofile);
- g_strfreev(split_string);
- return 1;
+
+ if ( count == 0 ) return 0;
+/* sort list alphabetically */
+ vpn_profiles = glist_strings_sort(vpn_profiles);
+/* add last used profile to the top */
+ if (last_profile_exists == 1 )
+ {
+ vpn_profiles = g_list_prepend (vpn_profiles,lastprofile);
+ }
+ gtk_combo_set_popdown_strings(vpn_profile_entry,vpn_profiles);
+ g_dir_close(directory);
+ g_list_free(vpn_profiles);
+ g_free(lastprofile);
+ g_strfreev(split_string);
+ return 1;
}
+
/* check if vpn connection is alive */
-gboolean is_vpn_connection_active_full (gpointer mainwindow) {
- pid_t zombie;
-
- int is_process_died;
- GtkWidget *icon;
-
- is_process_died = kill(vpnclient_pid,0);
- zombie = waitpid(vpnclient_pid,NULL,WNOHANG);
- /* if the process is not there, please stop checking the vpn connection */
- if (is_process_died){ return FALSE; }
-
- /* check if vpnclient is a zombie */
- if (zombie){
- if (! GTK_WIDGET_VISIBLE(mainwindow)){
+gboolean is_vpn_connection_active_full (gpointer mainwindow)
+{
+ pid_t zombie;
+
+ int is_process_died;
+ GtkWidget *icon;
+
+ is_process_died = kill(vpnclient_pid,0);
+ zombie = waitpid(vpnclient_pid,NULL,WNOHANG);
+/* if the process is not there, please stop checking the vpn connection */
+ if (is_process_died){ return FALSE; }
+
+/* check if vpnclient is a zombie */
+ if (zombie)
+ {
+ if (! GTK_WIDGET_VISIBLE(mainwindow))
+ {
gtk_widget_show(mainwindow);
- }
- update_statusbar(GTK_WIDGET(mainwindow)
- ,"VPN Connection Ended Abruptly or VPN Daemon is not active");
- icon = GTK_WIDGET(g_object_get_data(G_OBJECT(mainwindow),"icon"));
- tray_icon_load(icon,"gvpndialer/status_unlocked.png");
- close_all_io_channels(mainwindow);
- /* show main window if you get an abrupt failure */
- if (! GTK_WIDGET_VISIBLE(mainwindow) ) gtk_widget_show(mainwindow);
- return FALSE;
- } else {
- return TRUE;
- }
-
-}
-
-gboolean is_vpn_connection_active () {
- pid_t zombie;
- int is_process_died;
- is_process_died = kill(vpnclient_pid,0);
- zombie = waitpid(vpnclient_pid,NULL,WNOHANG);
- /* if the process is not there, please stop checking the vpn connection */
- if (is_process_died){ return FALSE; }
-
- /* check if vpnclient is a zombie */
- if (zombie){
- return FALSE;
- } else {
- return TRUE;
- }
-
+ }
+ update_statusbar(GTK_WIDGET(mainwindow)
+ ,"VPN Connection Ended Abruptly or VPN Daemon is not active");
+ icon = GTK_WIDGET(g_object_get_data(G_OBJECT(mainwindow),"icon"));
+ tray_icon_load(icon,"gvpndialer/status_unlocked.png");
+ close_all_io_channels(mainwindow);
+/* show main window if you get an abrupt failure */
+ if (! GTK_WIDGET_VISIBLE(mainwindow) ) gtk_widget_show(mainwindow);
+ return FALSE;
+ }
+ else
+ {
+ return TRUE;
+ }
+
+}
+
+
+gboolean is_vpn_connection_active ()
+{
+ pid_t zombie;
+ int is_process_died;
+ is_process_died = kill(vpnclient_pid,0);
+ zombie = waitpid(vpnclient_pid,NULL,WNOHANG);
+/* if the process is not there, please stop checking the vpn connection */
+ if (is_process_died){ return FALSE; }
+
+/* check if vpnclient is a zombie */
+ if (zombie)
+ {
+ return FALSE;
+ }
+ else
+ {
+ return TRUE;
+ }
+
}
+
/* Close all IO Channels before killing process */
-void close_all_io_channels(gpointer mymain_window) {
-
- GIOChannel *stdout_channel = (GIOChannel *)g_object_get_data(G_OBJECT(mymain_window),
- "stdout");
- GIOChannel *stderr_channel = (GIOChannel *)g_object_get_data(G_OBJECT(mymain_window),
- "stderr");
- GIOChannel *pty_channel = (GIOChannel *)g_object_get_data(G_OBJECT(mymain_window),
- "pty");
- GString *buf = g_string_new_len("",1024);
- GIOStatus ret;
- if (g_io_channel_get_flags(stderr_channel) & G_IO_FLAG_IS_READABLE){
- ret = g_io_channel_read_line_string(stderr_channel, buf,NULL,NULL);
- if (ret == G_IO_STATUS_NORMAL ){
- update_statusbar(GTK_WIDGET(mymain_window),buf->str);
-
- }
- }
- g_string_free(buf,TRUE);
- g_io_channel_shutdown(stdout_channel,TRUE,NULL);
- g_io_channel_shutdown(stderr_channel,TRUE,NULL);
- g_io_channel_shutdown(pty_channel,TRUE,NULL);
+void close_all_io_channels(gpointer mymain_window)
+{
+
+ GIOChannel *stdout_channel = (GIOChannel *)g_object_get_data(G_OBJECT(mymain_window),
+ "stdout");
+ GIOChannel *stderr_channel = (GIOChannel *)g_object_get_data(G_OBJECT(mymain_window),
+ "stderr");
+ GIOChannel *pty_channel = (GIOChannel *)g_object_get_data(G_OBJECT(mymain_window),
+ "pty");
+ GString *buf = g_string_new_len("",1024);
+ GIOStatus ret;
+ if (g_io_channel_get_flags(stderr_channel) & G_IO_FLAG_IS_READABLE)
+ {
+ ret = g_io_channel_read_line_string(stderr_channel, buf,NULL,NULL);
+ if (ret == G_IO_STATUS_NORMAL )
+ {
+ update_statusbar(GTK_WIDGET(mymain_window),buf->str);
+
+ }
+ }
+ g_string_free(buf,TRUE);
+ g_io_channel_shutdown(stdout_channel,TRUE,NULL);
+ g_io_channel_shutdown(stderr_channel,TRUE,NULL);
+ g_io_channel_shutdown(pty_channel,TRUE,NULL);
}
/* this function runs every second while the status window is up */
/* It updates the stats on the status/statistics window */
-gboolean updatestats( gpointer data ){
+gboolean updatestats( gpointer data )
+{
#define TUNNELSTATS 1
#define TRAFFICSTATS 2
#define ROUTESTATS 3
-
- GString *routestats;
- GString *trafficstats;
- GString *tunnelstats;
- GString *mybuffer;
- int statstype;
- GError *error;
- gint output_fd,child_pid;
- gchar *vpnfilename;
- GtkWidget *statuswindow;
- GtkWidget *mainwindow;
- GIOChannel *vpnstats_io;
- GtkTextView *tunnel;
- GtkTextView *route;
- GtkTextView *traffic;
- GConfClient *client;
- client = gconf_client_get_default();
- vpnfilename = gconf_client_get_string(client,"/apps/gnome-settings/gvpndialer/vpnclientdir",NULL);
- vpnfilename = g_strjoin("/",vpnfilename,"vpnclient",NULL);
- g_object_unref(client);
-
- mybuffer = g_string_new("");
- routestats = g_string_new("");
- trafficstats = g_string_new("");
- tunnelstats = g_string_new("");
- statuswindow = GTK_WIDGET(data);
-
- traffic = (GtkTextView *)lookup_widget(statuswindow,"trafficstats_text");
- route = (GtkTextView *)lookup_widget(statuswindow,"routestats_text");
- tunnel = (GtkTextView *)lookup_widget(statuswindow,"tunnelstats_text");
- gchar *executable[] = {vpnfilename,"stat",NULL};
- /* if status window is visible, print the latest stats */
- if ( GTK_WIDGET_VISIBLE(statuswindow) ){
- /* create a new i/o pipe to capture data from vpnclient stat */
- if ( g_spawn_async_with_pipes
- (NULL,
- executable,
- NULL,
- (G_SPAWN_SEARCH_PATH),
- NULL,
- NULL,
- &child_pid,
- NULL,
- &output_fd,
- NULL,
- &error))
- {
- error = NULL;
- vpnstats_io = g_io_channel_unix_new(output_fd);
- while (g_io_channel_read_line_string
- (vpnstats_io,mybuffer,NULL,&error)
- == G_IO_STATUS_NORMAL){
- if (g_ascii_strncasecmp
- ("VPN tunnel",mybuffer->str,10) == 0 ){
- statstype = 1;
- continue;
- }else if (g_ascii_strncasecmp
- ("VPN traffic",mybuffer->str,11) == 0 ){
- statstype = 2;
- continue;
- }else if (g_ascii_strncasecmp
- ("Configured routes",mybuffer->str,17) == 0 ){
- statstype = 3;
- }
- switch(statstype) {
- case TUNNELSTATS:
- g_string_append(tunnelstats,mybuffer->str);
- break;
- case TRAFFICSTATS:
- g_string_append(trafficstats,mybuffer->str);
- break;
- case ROUTESTATS:
- g_string_append(routestats,mybuffer->str);
- break;
- }
- }
- /* update the vpnclient status window with the latest data */
- gtk_text_buffer_set_text
- (gtk_text_view_get_buffer
- (traffic),trafficstats->str,-1);
- gtk_text_buffer_set_text
- (gtk_text_view_get_buffer
- (route),routestats->str,-1);
- gtk_text_buffer_set_text
- (gtk_text_view_get_buffer
- (tunnel),tunnelstats->str,-1);
-
-
- g_io_channel_shutdown(vpnstats_io,TRUE,NULL);
- g_string_free(mybuffer,TRUE);
- g_string_free(tunnelstats,TRUE);
- g_string_free(trafficstats,TRUE);
- g_string_free(routestats,TRUE);
- return TRUE;
- }else {
- /* for some reason can't execute vpnclient stat */
- return FALSE;
- }
- } else
- /* status window is closed */
- return FALSE;
+
+ GString *routestats;
+ GString *trafficstats;
+ GString *tunnelstats;
+ GString *mybuffer;
+ int statstype;
+ GError *error;
+ gint output_fd,child_pid;
+ gchar *vpnfilename;
+ GtkWidget *statuswindow;
+ GtkWidget *mainwindow;
+ GIOChannel *vpnstats_io;
+ GtkTextView *tunnel;
+ GtkTextView *route;
+ GtkTextView *traffic;
+ GConfClient *client;
+ client = gconf_client_get_default();
+ vpnfilename = gconf_client_get_string(client,"/apps/gnome-settings/gvpndialer/vpnclientdir",NULL);
+ vpnfilename = g_strjoin("/",vpnfilename,"vpnclient",NULL);
+ g_object_unref(client);
+
+ mybuffer = g_string_new("");
+ routestats = g_string_new("");
+ trafficstats = g_string_new("");
+ tunnelstats = g_string_new("");
+ statuswindow = GTK_WIDGET(data);
+
+ traffic = (GtkTextView *)lookup_widget(statuswindow,"trafficstats_text");
+ route = (GtkTextView *)lookup_widget(statuswindow,"routestats_text");
+ tunnel = (GtkTextView *)lookup_widget(statuswindow,"tunnelstats_text");
+ gchar *executable[] = {vpnfilename,"stat",NULL};
+/* if status window is visible, print the latest stats */
+ if ( GTK_WIDGET_VISIBLE(statuswindow) )
+ {
+/* create a new i/o pipe to capture data from vpnclient stat */
+ if ( g_spawn_async_with_pipes
+ (NULL,
+ executable,
+ NULL,
+ (G_SPAWN_SEARCH_PATH),
+ NULL,
+ NULL,
+ &child_pid,
+ NULL,
+ &output_fd,
+ NULL,
+ &error))
+ {
+ error = NULL;
+ vpnstats_io = g_io_channel_unix_new(output_fd);
+ while (g_io_channel_read_line_string
+ (vpnstats_io,mybuffer,NULL,&error)
+ == G_IO_STATUS_NORMAL)
+ {
+ if (g_ascii_strncasecmp
+ ("VPN tunnel",mybuffer->str,10) == 0 )
+ {
+ statstype = 1;
+ continue;
+ }else if (g_ascii_strncasecmp
+ ("VPN traffic",mybuffer->str,11) == 0 )
+ {
+ statstype = 2;
+ continue;
+ }else if (g_ascii_strncasecmp
+ ("Configured routes",mybuffer->str,17) == 0 )
+ {
+ statstype = 3;
+ }
+ switch(statstype)
+ {
+ case TUNNELSTATS:
+ g_string_append(tunnelstats,mybuffer->str);
+ break;
+ case TRAFFICSTATS:
+ g_string_append(trafficstats,mybuffer->str);
+ break;
+ case ROUTESTATS:
+ g_string_append(routestats,mybuffer->str);
+ break;
+ }
+ }
+/* update the vpnclient status window with the latest data */
+ gtk_text_buffer_set_text
+ (gtk_text_view_get_buffer
+ (traffic),trafficstats->str,-1);
+ gtk_text_buffer_set_text
+ (gtk_text_view_get_buffer
+ (route),routestats->str,-1);
+ gtk_text_buffer_set_text
+ (gtk_text_view_get_buffer
+ (tunnel),tunnelstats->str,-1);
+
+ g_io_channel_shutdown(vpnstats_io,TRUE,NULL);
+ g_string_free(mybuffer,TRUE);
+ g_string_free(tunnelstats,TRUE);
+ g_string_free(trafficstats,TRUE);
+ g_string_free(routestats,TRUE);
+ return TRUE;
+ }
+ else
+ {
+/* for some reason can't execute vpnclient stat */
+ return FALSE;
+ }
+ } else
+/* status window is closed */
+ return FALSE;
}
-
+
/* creates the sys tray */
-void tray_create (GtkWidget *mainwindow) {
- GtkWidget *box;
- EggTrayIcon *tray_icon;
- GtkWidget *icon = NULL ;
- GtkWidget *menu = NULL;
-
- /* create the menu, if it doesn't exist */
-
- if (!menu){
- /* create menu */
- menu = gtk_menu_new();
- /* associate menu and mainwindow */
- g_object_set_data(G_OBJECT(menu),"mainwindow",mainwindow);
- /* add menuitems */
- create_menu (menu);
-
- }
-
- /* create the system tray entry */
- tray_icon = egg_tray_icon_new ("GvpnDialer System Tray");
- box = gtk_event_box_new ();
- icon = gtk_image_new ();
-
-
- /* continue creating system tray entry */
- gtk_container_add (GTK_CONTAINER (box), icon);
- gtk_container_add (GTK_CONTAINER (tray_icon), box);
- gtk_widget_show_all (GTK_WIDGET (tray_icon));
-
- g_signal_connect (G_OBJECT (box), "button-press-event", G_CALLBACK (clicked), (gpointer)menu);
-
- /* associate icon with main window */
- g_object_set_data(G_OBJECT(mainwindow),"icon",icon);
-
- /* load the icon */
- tray_icon_load (icon,"gvpndialer/status_unlocked.png");
+void tray_create (GtkWidget *mainwindow)
+{
+ GtkWidget *box;
+ EggTrayIcon *tray_icon;
+ GtkWidget *icon = NULL ;
+ GtkWidget *menu = NULL;
+
+/* create the menu, if it doesn't exist */
+
+ if (!menu)
+ {
+/* create menu */
+ menu = gtk_menu_new();
+/* associate menu and mainwindow */
+ g_object_set_data(G_OBJECT(menu),"mainwindow",mainwindow);
+/* add menuitems */
+ create_menu (menu);
+
+ }
+
+/* create the system tray entry */
+ tray_icon = egg_tray_icon_new ("GvpnDialer System Tray");
+ box = gtk_event_box_new ();
+ icon = gtk_image_new ();
+
+/* continue creating system tray entry */
+ gtk_container_add (GTK_CONTAINER (box), icon);
+ gtk_container_add (GTK_CONTAINER (tray_icon), box);
+ gtk_widget_show_all (GTK_WIDGET (tray_icon));
+
+ g_signal_connect (G_OBJECT (box), "button-press-event", G_CALLBACK (clicked), (gpointer)menu);
+
+/* associate icon with main window */
+ g_object_set_data(G_OBJECT(mainwindow),"icon",icon);
+
+/* load the icon */
+ tray_icon_load (icon,"g