--- sql/pgsql/Attic/configure.in	2009/08/23 05:51:43	1.25.2.1
+++ sql/pgsql/Attic/configure.in	2012/06/11 22:02:26	1.35
@@ -1,60 +1,57 @@
-dnl Process this file with autoconf to produce a configure script.
-AC_INIT(parser3pgsql.C)
-AM_INIT_AUTOMAKE(parser3pgsql, 10.2, nodefine)
-
+dnl Autoconf initialisation
+AC_PREREQ(2.59)
+AC_INIT(parser3pgsql.C, 10.3)
+AC_CONFIG_SRCDIR(parser3pgsql.C)
 AM_CONFIG_HEADER(config_auto.h)
 
-dnl Arguments
+dnl Automake Initialisation
+AM_INIT_AUTOMAKE
 
-AC_ARG_WITH(pgsql-inc,[  --with-pgsql-inc[=DIR]      DIR is the PgSQL includes directory],,
-	withval="/usr/local/pgsql/include"
-)
-PGSQL_INC=$withval
-AC_SUBST(PGSQL_INC)
-
-if test \! -f "$PGSQL_INC/libpq-fe.h"; then
-	AC_MSG_ERROR($PGSQL_INC does not seem to be valid PgSQL includes directory)
-fi
+dnl Checks for argumenrs
+AC_DEFUN([PGSQL_INC_CHK],[
+	if test -r "$1/libpq-fe.h"; then
+		PGSQL_INC=$1
+	fi
+])
 
+dnl Arguments
+AC_ARG_WITH(pgsql-inc,[  --with-pgsql-inc=DIR        DIR is the PgSql includes directory],
+	PGSQL_INC_CHK($withval)
 
-AC_ARG_WITH(dynamic-stdcpp, [  --with-dynamic-stdcpp   link libstdc++ dynamically
-                          by default, libstdc++ is linked statically],[
-		LDFLAGS="-lstdc++"
-],[
-		LDFLAGS="-Wl,-Bstatic -Wl,-lstdc++ -Wl,-Bdynamic"
-])
+	if test -z "$PGSQL_INC"; then
+		AC_MSG_ERROR($PGSQL_INC does not seem to be valid PgSql includes directory)
+	fi
+,
+	AC_MSG_CHECKING(for PGSQL_INC directory)
+	for d in \
+		/usr/local/include/postgresql \
+		/usr/include/postgresql \
+		/usr/local/pgsql/include ; do
+		PGSQL_INC_CHK($d)
+	done
+
+	if test -z "$PGSQL_INC"; then
+		AC_MSG_ERROR(use --with-pgsql-inc=DIR to specify PgSql includes directory)
+	fi
 
-AC_SUBST(LDFLAGS)
+	AC_MSG_RESULT($PGSQL_INC)
+)
 
+AC_SUBST(PGSQL_INC)
 
-dnl Checks for programs.
+dnl Checks for programs
 AC_PROG_INSTALL
-AC_PROG_MAKE_SET
-AC_PROG_AWK
 AC_PROG_CXX
 AC_PROG_CC
 
-dnl most tests should be compiled with C compiler [especially qsort test]
-AC_LANG_C 
-
 dnl Enable building of the convenience library
-dnl and set LIBLTDL accordingly
-AC_LIBLTDL_CONVENIENCE
-dnl Substitute INCLTDL and LIBLTDL in the Makefiles
-AC_SUBST(INCLTDL)
-AC_SUBST(LIBLTDL)
-AC_SUBST(LIBADD_DL)
-dnl Configure libtool
-AC_DISABLE_STATIC
-AC_LIBTOOL_WIN32_DLL
-AM_PROG_LIBTOOL
-dnl Configure libltdl
-AC_CONFIG_SUBDIRS(libltdl)
+LT_CONFIG_LTDL_DIR(libltdl)
+LT_INIT(disable-static dlopen win32-dll)
+LTDL_INIT
 
-dnl Checks for libraries.
-
-dnl Checks for header files.
+dnl Checks for libraries
 
+dnl Checks for header files
 AC_CHECK_HEADERS(
 stdio.h \
 stdlib.h \
@@ -63,12 +60,10 @@ setjmp.h \
 ctype.h
 )
 
-dnl Checks for typedefs, structures, and compiler characteristics.
-
+dnl Checks for typedefs, structures, and compiler characteristics
 AC_TYPE_SIZE_T
 
-dnl Checks for library functions.
+dnl Checks for library functions
 
 dnl Output makefiles
-
 AC_OUTPUT(Makefile)