--- sql/pgsql/Attic/configure.in	2001/09/25 07:04:29	1.2
+++ sql/pgsql/Attic/configure.in	2001/10/29 08:37:01	1.5
@@ -6,7 +6,7 @@ AM_CONFIG_HEADER(config_auto.h)
 
 dnl Arguments
 
-AC_ARG_WITH(pgsql_inc,[  --with-pgsql_inc[=DIR]      DIR is the PgSQL includes directory],,
+AC_ARG_WITH(pgsql-inc,[  --with-pgsql-inc[=DIR]      DIR is the PgSQL includes directory],,
 	withval="/usr/local/pgsql/include"
 )
 PGSQL_INC=$withval
@@ -24,6 +24,27 @@ AC_PROG_AWK
 AC_LANG_CPLUSPLUS 
 AC_PROG_CXX
 
+AC_DEFUN(GCC_OPTION,
+[
+    AC_MSG_CHECKING(whether gcc accepts $1)
+    save_CXXFLAGS=$CXXFLAGS
+    CXXFLAGS="$save_CXXFLAGS $1"
+    AC_TRY_COMPILE(,,
+        AC_MSG_RESULT(yes)
+        dnl leave CXXFLAGS
+    ,		
+        AC_MSG_RESULT(no)
+        CXXFLAGS=$save_CXXFLAGS
+    )
+])
+
+if test "z$GXX" = "zyes"; then
+	dnl Versions of GCC up to 2.8.0 required -fhandle-exceptions, but it is
+	dnl the default in versions 2.8.0 and after.
+    dnl GCC_OPTION(-fhandle-exceptions)
+    GCC_OPTION(-fno-rtti)
+fi
+
 dnl Enable building of the convenience library
 dnl and set LIBLTDL accordingly
 AC_LIBLTDL_CONVENIENCE
@@ -45,7 +66,8 @@ dnl Checks for header files.
 AC_CHECK_HEADERS(
 stdio.h \
 stdlib.h \
-string.h
+string.h \
+setjmp.h
 )
 
 dnl Checks for typedefs, structures, and compiler characteristics.