diff options
| author | Chris Larson <clarson@kergoth.com> | 2004-12-09 09:47:41 +0000 |
|---|---|---|
| committer | Chris Larson <clarson@kergoth.com> | 2004-12-09 09:47:41 +0000 |
| commit | 2c5b8ec6d95cf68650265941530e5ce38c8dd6d9 (patch) | |
| tree | bf879bea7ef8517ba8c3d1286ef300401d3d484c /bvi | |
| parent | 101e2f1623def0a355d20aacb8bd93810703e834 (diff) | |
Merge oe-devel@oe-devel.bkbits.net:openembedded
into hyperion.kergoth.com:/home/kergoth/code/openembedded
2004/12/09 03:39:39-06:00 kergoth.com!kergoth
Break people's builds again.. this time moving the packages into a packages/ subdir to clean things up a bit.
BKrev: 41b81f3dvlp3rU7_8MUXLcI8LDdDoA
Diffstat (limited to 'bvi')
| -rw-r--r-- | bvi/bvi-1.3.1/compile.patch | 16 | ||||
| -rw-r--r-- | bvi/bvi-1.3.1/configure.patch | 5928 | ||||
| -rw-r--r-- | bvi/bvi_1.3.1.bb | 0 |
3 files changed, 0 insertions, 5944 deletions
diff --git a/bvi/bvi-1.3.1/compile.patch b/bvi/bvi-1.3.1/compile.patch deleted file mode 100644 index b64cd8f445..0000000000 --- a/bvi/bvi-1.3.1/compile.patch +++ /dev/null @@ -1,16 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- bvi-1.3.1/bmore.h~compile -+++ bvi-1.3.1/bmore.h -@@ -48,7 +48,7 @@ - # include <unistd.h> - #if HAVE_NCURSES_H - # include <ncurses.h> --# include <ncurses/term.h> -+# include <term.h> - #else - # include <curses.h> - # include <term.h> diff --git a/bvi/bvi-1.3.1/configure.patch b/bvi/bvi-1.3.1/configure.patch deleted file mode 100644 index 4d25e1f482..0000000000 --- a/bvi/bvi-1.3.1/configure.patch +++ /dev/null @@ -1,5928 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- bvi-1.3.1/configure.in~configure -+++ bvi-1.3.1/configure.in -@@ -20,6 +20,9 @@ - - - dnl Some curses specials -+AC_DEFINE(NEED_PUTC_CHAR, [], [Description]) -+AC_DEFINE(HAVE_CURSES_H, [], [Description]) -+ - dnl Solaris needs for tputs 'putc(char)' instead of 'putc(int)' - case "$host_os" in - solaris*) -@@ -47,9 +50,6 @@ - AC_CHECK_HEADERS(fcntl.h termcap.h termio.h termios.h unistd.h) - - dnl Check if ncurses requested --_cppflags="${CPPFLAGS}" --_ldflags="${LDFLAGS}" -- - AC_ARG_WITH(ncurses, - [ --with-ncurses[=DIR] path to ncurses],[ - if test "$withval" != "no"; then -@@ -62,13 +62,12 @@ - AC_CHECK_LIB(ncurses, initscr, - AC_DEFINE(HAVE_NCURSES_H) LIBS="${LIBS} -lncurses", - AC_CHECK_LIB(curses, initscr, -- AC_DEFINE(HAVE_CURSES_H) LIBS="${LIBS} -lcurses", -- AC_MSG_ERROR([bvi requires the curses library]))), -- AC_CHECK_HEADER(curses.h, -- AC_CHECK_LIB(curses, initscr, -- AC_DEFINE(HAVE_CURSES_H) LIBS="${LIBS} -lcurses", -- AC_MSG_ERROR([bvi requires the curses library])), -- AC_MSG_ERROR([bvi requires the curses library]))) -+ AC_DEFINE(HAVE_CURSES_H) LIBS="${LIBS} -lcurses", -+ AC_MSG_ERROR([bvi requires the curses library]) -+ ) -+ ), -+ AC_MSG_ERROR([bvi requires the curses library]) -+) - - dnl Checks for typedefs, structures, and compiler characteristics. - dnl AC_TYPE_SIZE_T ---- bvi-1.3.1/configure~configure -+++ bvi-1.3.1/configure -@@ -1,12 +1,81 @@ - #! /bin/sh - # Guess values for system-dependent variables and create Makefiles. --# Generated by Autoconf 2.52. -+# Generated by GNU Autoconf 2.57. - # --# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 -+# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 - # 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 -+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 -+fi -+ -+# Support unset when possible. -+if (FOO=FOO; unset FOO) >/dev/null 2>&1; then -+ as_unset=unset -+else -+ as_unset=false -+fi -+ -+ -+# Work around bugs in pre-3.0 UWIN ksh. -+$as_unset ENV MAIL MAILPATH -+PS1='$ ' -+PS2='> ' -+PS4='+ ' -+ -+# NLS nuisances. -+for as_var in \ -+ LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ -+ LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ -+ LC_TELEPHONE LC_TIME -+do -+ if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then -+ eval $as_var=C; export $as_var -+ else -+ $as_unset $as_var -+ fi -+done -+ -+# Required to use basename. -+if expr a : '\(a\)' >/dev/null 2>&1; then -+ as_expr=expr -+else -+ as_expr=false -+fi -+ -+if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then -+ as_basename=basename -+else -+ as_basename=false -+fi -+ -+ -+# Name of the executable. -+as_me=`$as_basename "$0" || -+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ -+ X"$0" : 'X\(//\)$' \| \ -+ X"$0" : 'X\(/\)$' \| \ -+ . : '\(.\)' 2>/dev/null || -+echo X/"$0" | -+ sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } -+ /^X\/\(\/\/\)$/{ s//\1/; q; } -+ /^X\/\(\/\).*/{ s//\1/; q; } -+ s/.*/./; q'` -+ -+ -+# PATH needs CR, and LINENO needs CR and PATH. - # Avoid depending upon Character Ranges. - as_cr_letters='abcdefghijklmnopqrstuvwxyz' - as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -@@ -14,22 +83,113 @@ - as_cr_digits='0123456789' - as_cr_alnum=$as_cr_Letters$as_cr_digits - --# Sed expression to map a string onto a valid variable name. --as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g" -+# 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 - --# Sed expression to map a string onto a valid CPP name. --as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g" - --# Be Bourne compatible --if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then -- emulate sh -- NULLCMD=: --elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then -- set -o posix --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: 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 -+ -+ # 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. -+ # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the -+ # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) -+ sed '=' <$as_myself | -+ sed ' -+ N -+ s,$,-, -+ : loop -+ s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, -+ t loop -+ s,-$,, -+ s,^['$as_cr_digits']*\n,, -+ ' >$as_me.lineno && -+ chmod +x $as_me.lineno || -+ { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 -+ { (exit 1); exit 1; }; } -+ -+ # Don't try to exec as it changes $[0], causing all sort of problems -+ # (the dirname of $[0] is not the place where we might find the -+ # original and so on. Autoconf is especially sensible to this). -+ . ./$as_me.lineno -+ # Exit status is that of the last command. -+ exit -+} - --# Name of the executable. --as_me=`echo "$0" |sed 's,.*[\\/],,'` -+ -+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= ;; -+esac - - if expr a : '\(a\)' >/dev/null 2>&1; then - as_expr=expr -@@ -55,24 +215,20 @@ - fi - rm -f conf$$ conf$$.exe conf$$.file - --as_executable_p="test -f" -- --# Support unset when possible. --if (FOO=FOO; unset FOO) >/dev/null 2>&1; then -- as_unset=unset -+if mkdir -p . 2>/dev/null; then -+ as_mkdir_p=: - else -- as_unset=false -+ as_mkdir_p=false - fi - --# NLS nuisances. --$as_unset LANG || test "${LANG+set}" != set || { LANG=C; export LANG; } --$as_unset LC_ALL || test "${LC_ALL+set}" != set || { LC_ALL=C; export LC_ALL; } --$as_unset LC_TIME || test "${LC_TIME+set}" != set || { LC_TIME=C; export LC_TIME; } --$as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set || { LC_CTYPE=C; export LC_CTYPE; } --$as_unset LANGUAGE || test "${LANGUAGE+set}" != set || { LANGUAGE=C; export LANGUAGE; } --$as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set || { LC_COLLATE=C; export LC_COLLATE; } --$as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set || { LC_NUMERIC=C; export LC_NUMERIC; } --$as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set || { LC_MESSAGES=C; export LC_MESSAGES; } -+as_executable_p="test -f" -+ -+# Sed expression to map a string onto a valid CPP name. -+as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g" -+ -+# Sed expression to map a string onto a valid variable name. -+as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g" -+ - - # IFS - # We need space, tab and new line, in precisely that order. -@@ -81,7 +237,8 @@ - IFS=" $as_nl" - - # CDPATH. --$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=:; export CDPATH; } -+$as_unset CDPATH -+ - - # Name of the host. - # hostname on some systems (SVR3.2, Linux) returns a bogus exit status, -@@ -94,9 +251,11 @@ - # Initializations. - # - ac_default_prefix=/usr/local -+ac_config_libobj_dir=. - cross_compiling=no - subdirs= --MFLAGS= MAKEFLAGS= -+MFLAGS= -+MAKEFLAGS= - SHELL=${CONFIG_SHELL-/bin/sh} - - # Maximum number of lines to put in a shell here document. -@@ -104,6 +263,13 @@ - # only ac_max_sed_lines should be used. - : ${ac_max_here_lines=38} - -+# Identity of this package. -+PACKAGE_NAME= -+PACKAGE_TARNAME= -+PACKAGE_VERSION= -+PACKAGE_STRING= -+PACKAGE_BUGREPORT= -+ - ac_unique_file="bvi.c" - # Factoring default headers for most tests. - ac_includes_default="\ -@@ -142,6 +308,9 @@ - # 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 build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CPP EGREP LIBOBJS LTLIBOBJS' -+ac_subst_files='' -+ - # Initialize some variables set by options. - ac_init_help= - ac_init_version=false -@@ -180,13 +349,6 @@ - infodir='${prefix}/info' - mandir='${prefix}/man' - --# Identity of this package. --PACKAGE_NAME= --PACKAGE_TARNAME= --PACKAGE_VERSION= --PACKAGE_STRING= --PACKAGE_BUGREPORT= -- - ac_prev= - for ac_option - do -@@ -319,7 +481,7 @@ - with_fp=no ;; - - -no-create | --no-create | --no-creat | --no-crea | --no-cre \ -- | --no-cr | --no-c) -+ | --no-cr | --no-c | -n) - no_create=yes ;; - - -no-recursion | --no-recursion | --no-recursio | --no-recursi \ -@@ -498,7 +660,7 @@ - eval ac_val=$`echo $ac_var` - case $ac_val in - [\\/$]* | ?:[\\/]* | NONE | '' ) ;; -- *) { echo "$as_me: error: expected an absolute path for --$ac_var: $ac_val" >&2 -+ *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 - { (exit 1); exit 1; }; };; - esac - done -@@ -510,18 +672,19 @@ - eval ac_val=$`echo $ac_var` - case $ac_val in - [\\/$]* | ?:[\\/]* ) ;; -- *) { echo "$as_me: error: expected an absolute path for --$ac_var: $ac_val" >&2 -+ *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 - { (exit 1); exit 1; }; };; - esac - done - - # There might be people who depend on the old broken behavior: `$host' - # used to hold the argument of --host etc. -+# FIXME: To remove some day. - build=$build_alias - host=$host_alias - target=$target_alias - --# FIXME: should be removed in autoconf 3.0. -+# FIXME: To remove some day. - if test "x$host_alias" != x; then - if test "x$build_alias" = x; then - cross_compiling=maybe -@@ -537,13 +700,23 @@ - - test "$silent" = yes && exec 6>/dev/null - -+ - # 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_prog=$0 -- ac_confdir=`echo "$ac_prog" | sed 's%[\\/][^\\/][^\\/]*$%%'` -- test "x$ac_confdir" = "x$ac_prog" && ac_confdir=. -+ ac_confdir=`(dirname "$0") 2>/dev/null || -+$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -+ X"$0" : 'X\(//\)[^/]' \| \ -+ X"$0" : 'X\(//\)$' \| \ -+ 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'` - srcdir=$ac_confdir - if test ! -r $srcdir/$ac_unique_file; then - srcdir=.. -@@ -553,13 +726,16 @@ - fi - if test ! -r $srcdir/$ac_unique_file; then - if test "$ac_srcdir_defaulted" = yes; then -- { echo "$as_me: error: cannot find sources in $ac_confdir or .." >&2 -+ { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2 - { (exit 1); exit 1; }; } - else -- { echo "$as_me: error: cannot find sources in $srcdir" >&2 -+ { 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 -+ { (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 -@@ -600,7 +776,7 @@ - if test "$ac_init_help" = "long"; then - # Omit some internal or obsolete options to make the list less imposing. - # This message is too long to be a string in the A/UX 3.1 sh. -- cat <<EOF -+ cat <<_ACEOF - \`configure' configures this package to adapt to many kinds of systems. - - Usage: $0 [OPTION]... [VAR=VALUE]... -@@ -621,9 +797,9 @@ - -n, --no-create do not create output files - --srcdir=DIR find the sources in DIR [configure dir or \`..'] - --EOF -+_ACEOF - -- cat <<EOF -+ cat <<_ACEOF - Installation directories: - --prefix=PREFIX install architecture-independent files in PREFIX - [$ac_default_prefix] -@@ -650,19 +826,19 @@ - --oldincludedir=DIR C header files for non-gcc [/usr/include] - --infodir=DIR info documentation [PREFIX/info] - --mandir=DIR man documentation [PREFIX/man] --EOF -+_ACEOF - -- cat <<\EOF -+ cat <<\_ACEOF - - System types: - --build=BUILD configure for building on BUILD [guessed] -- --host=HOST build programs to run on HOST [BUILD] --EOF -+ --host=HOST cross-compile to build programs to run on HOST [BUILD] -+_ACEOF - fi - - if test -n "$ac_init_help"; then - -- cat <<\EOF -+ cat <<\_ACEOF - - Optional Packages: - --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] -@@ -681,40 +857,60 @@ - Use these variables to override the choices made by `configure' or to help - it to find libraries and programs with nonstandard names/locations. - --EOF -+_ACEOF - fi - - if test "$ac_init_help" = "recursive"; then - # If there are subdirs, report their specific --help. - ac_popdir=`pwd` -- for ac_subdir in : $ac_subdirs_all; do test "x$ac_subdir" = x: && continue -- cd $ac_subdir -- # A "../" for each directory in /$ac_subdir. -- ac_dots=`echo $ac_subdir | -- sed 's,^\./,,;s,[^/]$,&/,;s,[^/]*/,../,g'` -+ for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue -+ test -d $ac_dir || continue -+ ac_builddir=. - -- case $srcdir in -- .) # No --srcdir option. We are building in place. -- ac_sub_srcdir=$srcdir ;; -- [\\/]* | ?:[\\/]* ) # Absolute path. -- ac_sub_srcdir=$srcdir/$ac_subdir ;; -- *) # Relative path. -- ac_sub_srcdir=$ac_dots$srcdir/$ac_subdir ;; -- esac -+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 -+# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be -+# absolute. -+ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd` -+ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd` -+ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd` -+ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd` - -+ cd $ac_dir - # Check for guested configure; otherwise get Cygnus style configure. -- if test -f $ac_sub_srcdir/configure.gnu; then -+ if test -f $ac_srcdir/configure.gnu; then - echo -- $SHELL $ac_sub_srcdir/configure.gnu --help=recursive -- elif test -f $ac_sub_srcdir/configure; then -+ $SHELL $ac_srcdir/configure.gnu --help=recursive -+ elif test -f $ac_srcdir/configure; then - echo -- $SHELL $ac_sub_srcdir/configure --help=recursive -- elif test -f $ac_sub_srcdir/configure.ac || -- test -f $ac_sub_srcdir/configure.in; then -+ $SHELL $ac_srcdir/configure --help=recursive -+ elif test -f $ac_srcdir/configure.ac || -+ test -f $ac_srcdir/configure.in; then - echo - $ac_configure --help - else -- echo "$as_me: WARNING: no configuration information is in $ac_subdir" >&2 -+ echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 - fi - cd $ac_popdir - done -@@ -722,31 +918,31 @@ - - test -n "$ac_init_help" && exit 0 - if $ac_init_version; then -- cat <<\EOF -+ cat <<\_ACEOF - --Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 -+Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 - Free Software Foundation, Inc. - This configure script is free software; the Free Software Foundation - gives unlimited permission to copy, distribute and modify it. --EOF -+_ACEOF - exit 0 - fi - exec 5>config.log --cat >&5 <<EOF -+cat >&5 <<_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.52. Invocation command line was -+generated by GNU Autoconf 2.57. Invocation command line was - - $ $0 $@ - --EOF -+_ACEOF - { - cat <<_ASUNAME --## ---------- ## --## Platform. ## --## ---------- ## -+## --------- ## -+## Platform. ## -+## --------- ## - - hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` - uname -m = `(uname -m) 2>/dev/null || echo unknown` -@@ -765,51 +961,96 @@ - /usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` - /bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` - --PATH = $PATH -- - _ASUNAME -+ -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ echo "PATH: $as_dir" -+done -+ - } >&5 - --cat >&5 <<EOF --## ------------ ## --## Core tests. ## --## ------------ ## -+cat >&5 <<_ACEOF -+ -+ -+## ----------- ## -+## Core tests. ## -+## ----------- ## -+ -+_ACEOF - --EOF - - # Keep a trace of the command line. - # Strip out --no-create and --no-recursion so they do not pile up. -+# Strip out --silent because we don't want to record it for future runs. - # Also quote any args containing shell meta-characters. -+# Make two passes to allow for proper duplicate-argument suppression. - ac_configure_args= -+ac_configure_args0= -+ac_configure_args1= - ac_sep= --for ac_arg -+ac_must_keep_next=false -+for ac_pass in 1 2 - do -- case $ac_arg in -- -no-create | --no-create | --no-creat | --no-crea | --no-cre \ -- | --no-cr | --no-c) ;; -- -no-recursion | --no-recursion | --no-recursio | --no-recursi \ -- | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;; -- *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) -- ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` -- ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" -- ac_sep=" " ;; -- *) ac_configure_args="$ac_configure_args$ac_sep$ac_arg" -- ac_sep=" " ;; -- esac -- # Get rid of the leading space. -+ for ac_arg -+ do -+ case $ac_arg in -+ -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;; -+ -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 -+ 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;; -+ 2) -+ ac_configure_args1="$ac_configure_args1 '$ac_arg'" -+ if test $ac_must_keep_next = true; then -+ ac_must_keep_next=false # Got value, back to normal. -+ else -+ case $ac_arg in -+ *=* | --config-cache | -C | -disable-* | --disable-* \ -+ | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ -+ | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ -+ | -with-* | --with-* | -without-* | --without-* | --x) -+ case "$ac_configure_args0 " in -+ "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; -+ esac -+ ;; -+ -* ) 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=" " -+ ;; -+ esac -+ done - done -+$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; } -+$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; } - - # 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. - trap 'exit_status=$? - # Save into config.log some information that might help in debugging. -- echo >&5 -- echo "## ----------------- ##" >&5 -- echo "## Cache variables. ##" >&5 -- echo "## ----------------- ##" >&5 -- echo >&5 -- # The following way of writing the cache mishandles newlines in values, -+ { -+ echo -+ -+ cat <<\_ASBOX -+## ---------------- ## -+## Cache variables. ## -+## ---------------- ## -+_ASBOX -+ echo -+ # The following way of writing the cache mishandles newlines in values, - { - (set) 2>&1 | - case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in -@@ -823,21 +1064,53 @@ - "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" - ;; - esac; --} >&5 -- sed "/^$/d" confdefs.h >conftest.log -- if test -s conftest.log; then -- echo >&5 -- echo "## ------------ ##" >&5 -- echo "## confdefs.h. ##" >&5 -- echo "## ------------ ##" >&5 -- echo >&5 -- cat conftest.log >&5 -- fi -- (echo; echo) >&5 -- test "$ac_signal" != 0 && -- echo "$as_me: caught signal $ac_signal" >&5 -- echo "$as_me: exit $exit_status" >&5 -- rm -rf conftest* confdefs* core core.* *.core conf$$* $ac_clean_files && -+} -+ echo -+ -+ cat <<\_ASBOX -+## ----------------- ## -+## Output variables. ## -+## ----------------- ## -+_ASBOX -+ echo -+ for ac_var in $ac_subst_vars -+ do -+ eval ac_val=$`echo $ac_var` -+ echo "$ac_var='"'"'$ac_val'"'"'" -+ done | sort -+ echo -+ -+ if test -n "$ac_subst_files"; then -+ cat <<\_ASBOX -+## ------------- ## -+## Output files. ## -+## ------------- ## -+_ASBOX -+ echo -+ for ac_var in $ac_subst_files -+ do -+ eval ac_val=$`echo $ac_var` -+ echo "$ac_var='"'"'$ac_val'"'"'" -+ done | sort -+ echo -+ fi -+ -+ if test -s confdefs.h; then -+ cat <<\_ASBOX -+## ----------- ## -+## confdefs.h. ## -+## ----------- ## -+_ASBOX -+ echo -+ sed "/^$/d" confdefs.h | sort -+ echo -+ fi -+ test "$ac_signal" != 0 && -+ echo "$as_me: caught signal $ac_signal" -+ echo "$as_me: exit $exit_status" -+ } >&5 -+ rm -f core core.* *.core && -+ rm -rf conftest* confdefs* conf$$* $ac_clean_files && - exit $exit_status - ' 0 - for ac_signal in 1 2 13 15; do -@@ -850,6 +1123,33 @@ - # AIX cpp loses on an empty file, so make sure it contains at least a newline. - echo >confdefs.h - -+# Predefined preprocessor variables. -+ -+cat >>confdefs.h <<_ACEOF -+#define PACKAGE_NAME "$PACKAGE_NAME" -+_ACEOF -+ -+ -+cat >>confdefs.h <<_ACEOF -+#define PACKAGE_TARNAME "$PACKAGE_TARNAME" -+_ACEOF -+ -+ -+cat >>confdefs.h <<_ACEOF -+#define PACKAGE_VERSION "$PACKAGE_VERSION" -+_ACEOF -+ -+ -+cat >>confdefs.h <<_ACEOF -+#define PACKAGE_STRING "$PACKAGE_STRING" -+_ACEOF -+ -+ -+cat >>confdefs.h <<_ACEOF -+#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" -+_ACEOF -+ -+ - # 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 -@@ -861,9 +1161,9 @@ - fi - for ac_site_file in $CONFIG_SITE; do - if test -r "$ac_site_file"; then -- { echo "$as_me:864: loading site script $ac_site_file" >&5 -+ { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 - echo "$as_me: loading site script $ac_site_file" >&6;} -- cat "$ac_site_file" >&5 -+ sed 's/^/| /' "$ac_site_file" >&5 - . "$ac_site_file" - fi - done -@@ -872,7 +1172,7 @@ - # Some versions of bash will fail to source /dev/null (special - # files actually), so we avoid doing that. - if test -f "$cache_file"; then -- { echo "$as_me:875: loading cache $cache_file" >&5 -+ { echo "$as_me:$LINENO: loading cache $cache_file" >&5 - echo "$as_me: loading cache $cache_file" >&6;} - case $cache_file in - [\\/]* | ?:[\\/]* ) . $cache_file;; -@@ -880,7 +1180,7 @@ - esac - fi - else -- { echo "$as_me:883: creating cache $cache_file" >&5 -+ { echo "$as_me:$LINENO: creating cache $cache_file" >&5 - echo "$as_me: creating cache $cache_file" >&6;} - >$cache_file - fi -@@ -896,42 +1196,42 @@ - eval ac_new_val="\$ac_env_${ac_var}_value" - case $ac_old_set,$ac_new_set in - set,) -- { echo "$as_me:899: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 -+ { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 - echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} - ac_cache_corrupted=: ;; - ,set) -- { echo "$as_me:903: error: \`$ac_var' was not set in the previous run" >&5 -+ { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 - echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} - ac_cache_corrupted=: ;; - ,);; - *) - if test "x$ac_old_val" != "x$ac_new_val"; then -- { echo "$as_me:909: error: \`$ac_var' has changed since the previous run:" >&5 -+ { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 - echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} -- { echo "$as_me:911: former value: $ac_old_val" >&5 -+ { echo "$as_me:$LINENO: former value: $ac_old_val" >&5 - echo "$as_me: former value: $ac_old_val" >&2;} -- { echo "$as_me:913: current value: $ac_new_val" >&5 -+ { echo "$as_me:$LINENO: current value: $ac_new_val" >&5 - echo "$as_me: current value: $ac_new_val" >&2;} - ac_cache_corrupted=: - fi;; - esac -- # Pass precious variables to config.status. It doesn't matter if -- # we pass some twice (in addition to the command line arguments). -+ # 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_configure_args="$ac_configure_args '$ac_arg'" -- ;; -- *) ac_configure_args="$ac_configure_args $ac_var=$ac_new_val" -- ;; -+ ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; -+ *) ac_arg=$ac_var=$ac_new_val ;; -+ esac -+ case " $ac_configure_args " in -+ *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. -+ *) ac_configure_args="$ac_configure_args '$ac_arg'" ;; - esac - fi - done - if $ac_cache_corrupted; then -- { echo "$as_me:932: error: changes in the environment can compromise the build" >&5 -+ { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 - echo "$as_me: error: changes in the environment can compromise the build" >&2;} -- { { echo "$as_me:934: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 -+ { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 - echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} - { (exit 1); exit 1; }; } - fi -@@ -942,28 +1242,27 @@ - ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' - ac_compiler_gnu=$ac_cv_c_compiler_gnu - --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= ;; --esac --echo "#! $SHELL" >conftest.sh --echo "exit 0" >>conftest.sh --chmod +x conftest.sh --if { (echo "$as_me:954: PATH=\".;.\"; conftest.sh") >&5 -- (PATH=".;."; conftest.sh) 2>&5 -- ac_status=$? -- echo "$as_me:957: \$? = $ac_status" >&5 -- (exit $ac_status); }; then -- ac_path_separator=';' --else -- ac_path_separator=: --fi --PATH_SEPARATOR="$ac_path_separator" --rm -f conftest.sh - --ac_config_headers="$ac_config_headers config.h" -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ ac_config_headers="$ac_config_headers config.h" -+ - - ac_aux_dir= - for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do -@@ -982,7 +1281,7 @@ - fi - done - if test -z "$ac_aux_dir"; then -- { { echo "$as_me:985: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 -+ { { 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 -@@ -992,11 +1291,11 @@ - - # Make sure we can run config.sub. - $ac_config_sub sun4 >/dev/null 2>&1 || -- { { echo "$as_me:995: error: cannot run $ac_config_sub" >&5 -+ { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5 - echo "$as_me: error: cannot run $ac_config_sub" >&2;} - { (exit 1); exit 1; }; } - --echo "$as_me:999: checking build system type" >&5 -+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 -@@ -1005,23 +1304,24 @@ - test -z "$ac_cv_build_alias" && - ac_cv_build_alias=`$ac_config_guess` - test -z "$ac_cv_build_alias" && -- { { echo "$as_me:1008: error: cannot guess build type; you must specify one" >&5 -+ { { echo "$as_me:$LINENO: error: cannot gues |
