1
0
Fork 0
mirror of https://github.com/tobast/libunwind-eh_elf.git synced 2024-06-28 20:21:45 +02:00

Fix merge conflict.

2004/11/30 22:53:53-08:00 mostang.com!davidm
Regenerate.

2004/11/16 14:09:01-08:00 hp.com!davidm
Manual merge.

2004/11/05 00:14:10-08:00 hp.com!davidm
Fix merge conflict.

2004/11/03 13:56:59-08:00 hp.com!davidm
Merge.

2004/10/19 23:06:23-07:00 mostang.com!davidm
Regenerate.

(Logical change 1.290)
This commit is contained in:
hp.com!davidm 2005-05-03 09:13:17 +00:00
parent 7b17187a39
commit e02ef902df

26
configure vendored
View file

@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.59 for libunwind 0.98.5.
# Generated by GNU Autoconf 2.59 for libunwind 0.99-alpha.
#
# Report bugs to <libunwind@linux.hpl.hp.com>.
#
@ -423,8 +423,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='libunwind'
PACKAGE_TARNAME='libunwind'
PACKAGE_VERSION='0.98.5'
PACKAGE_STRING='libunwind 0.98.5'
PACKAGE_VERSION='0.99-alpha'
PACKAGE_STRING='libunwind 0.99-alpha'
PACKAGE_BUGREPORT='libunwind@linux.hpl.hp.com'
ac_unique_file="src/mi/backtrace.c"
@ -962,7 +962,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 <<_ACEOF
\`configure' configures libunwind 0.98.5 to adapt to many kinds of systems.
\`configure' configures libunwind 0.99-alpha to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@ -1029,7 +1029,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of libunwind 0.98.5:";;
short | recursive ) echo "Configuration of libunwind 0.99-alpha:";;
esac
cat <<\_ACEOF
@ -1173,7 +1173,7 @@ fi
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
libunwind configure 0.98.5
libunwind configure 0.99-alpha
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@ -1187,7 +1187,7 @@ 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 libunwind $as_me 0.98.5, which was
It was created by libunwind $as_me 0.99-alpha, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@ -1913,7 +1913,7 @@ fi
# Define the identity of the package.
PACKAGE='libunwind'
VERSION='0.98.5'
VERSION='0.99-alpha'
cat >>confdefs.h <<_ACEOF
@ -20868,7 +20868,7 @@ fi
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
if test x$GCC = xyes -a x$intel_compiler != xyes; then
CFLAGS="${CFLAGS} -Wall -Wsign-compare"
CFLAGS="${CFLAGS} -fexceptions -Wall -Wsign-compare"
LIBCRTS="-lgcc"
fi
@ -20878,8 +20878,8 @@ arch="$target_arch"
ARCH=`echo $target_arch | tr a-z A-Z`
PKG_MAJOR=0
PKG_MINOR=98
PKG_EXTRA=.5
PKG_MINOR=99
PKG_EXTRA=-alpha
PKG_MAINTAINER=libunwind@linux.hpl.hp.com
@ -21334,7 +21334,7 @@ _ASBOX
} >&5
cat >&5 <<_CSEOF
This file was extended by libunwind $as_me 0.98.5, which was
This file was extended by libunwind $as_me 0.99-alpha, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@ -21400,7 +21400,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
libunwind config.status 0.98.5
libunwind config.status 0.99-alpha
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"