From 09c959ad300b39d5f8fc8ac78cc39375701ea9f6 Mon Sep 17 00:00:00 2001
From: "hp.com!davidm" <hp.com!davidm>
Date: Tue, 3 May 2005 09:13:17 +0000
Subject: [PATCH] Fix merge conflict.

2005/02/24 23:28:02-08:00 hp.com!davidm
Fix merge-conflict.

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:57:00-08:00 hp.com!davidm
Merge.

2004/10/19 23:06:23-07:00 mostang.com!davidm
(pkg_minor): Switch to 99.
(pkg_extra): Switch to -alpha.
(CFLAGS): Add -fexceptions if we're compiling with GCC.  It's
	needed to get the proper unwind tables on platforms
	with DWARF unwind info (well, at least on x86 it's needed).

(Logical change 1.290)
---
 configure.in | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure.in b/configure.in
index 7e005728..1ae9d6c6 100644
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
 define(pkg_major, 0)
-define(pkg_minor, 98)
-define(pkg_extra, .5)
+define(pkg_minor, 99)
+define(pkg_extra, -alpha)
 define(pkg_maintainer, libunwind@linux.hpl.hp.com)
 define(mkvers, $1.$2$3)
 dnl Process this file with autoconf to produce a configure script.
@@ -101,7 +101,7 @@ AC_TRY_COMPILE([], [#ifndef __INTEL_COMPILER
 #endif], [intel_compiler=yes])
 
 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