Index: configure.ac
===================================================================
RCS file: /usr/local/cvsroot/psqlodbc/psqlodbc/configure.ac,v
retrieving revision 1.10
diff -p -u -r1.10 configure.ac
--- configure.ac	6 Jan 2004 09:58:19 -0000	1.10
+++ configure.ac	30 Jan 2004 21:04:31 -0000
@@ -1,7 +1,7 @@
 # Process this file with autoconf to produce a configure script.
-AC_INIT(psqlodbc, 07.03.0205, [pgsql-odbc@postgresql.org])
+AC_INIT(psqlodbc.c)
 AC_PREREQ(2.52)
-AM_INIT_AUTOMAKE
+AM_INIT_AUTOMAKE(psqlodbc, 07.03.0205)
 AC_CONFIG_SRCDIR([bind.c])
 AM_CONFIG_HEADER([config.h])
 AM_MAINTAINER_MODE
@@ -10,12 +10,12 @@ AM_MAINTAINER_MODE
 AC_DEFINE(DRIVER_CURSOR_IMPLEMENT, 1,
 	[Define to 1 to build with driver cursors option)])
 
-PGAC_ARG_BOOL(with, unixodbc, no,
+AC_ARG_WITH(unixodbc,
               [  --with-unixodbc         build ODBC driver for unixODBC],
               [AC_DEFINE(WITH_UNIXODBC, 1,
                          [Define to 1 to build with unixODBC support (--with-unixodbc)])])
 
-PGAC_ARG_BOOL(with, iodbc, no,
+AC_ARG_WITH(iodbc,
               [  --with-iodbc            build ODBC driver for iODBC],
               [AC_DEFINE(WITH_IODBC, 1,
                          [Define to 1 to build with iODBC support (--with-iodbc)])])
@@ -28,20 +28,20 @@ fi
 # Default odbc version number (--with-odbcver), default 0x0300
 #
 AC_MSG_CHECKING([for ODBC version number])
-PGAC_ARG_REQ(with, odbcver, [  --with-odbcver=VERSION  change default ODBC version number
+AC_ARG_WITH(odbcver, [  --with-odbcver=VERSION  change default ODBC version number
  [0x0300]],
              [AC_DEFINE_UNQUOTED(ODBCVER, ${withval},
           	[Define to ODBC version (--with-odbcver)])])
 AC_MSG_RESULT([$with_odbcver])
 
-AM_CONDITIONAL(with_unixodbc, [test $with_unixodbc = yes])
-AM_CONDITIONAL(with_iodbc, [test $with_iodbc = yes])
+AM_CONDITIONAL(with_unixodbc, [test x"$with_unixodbc-no" != xno])
+AM_CONDITIONAL(with_iodbc, [test x"$with_iodbc-no" != xno])
 
 AC_CHECK_FUNCS(strtoul strtoll)
 AC_CHECK_LIB(socket, socket)
 
 # to implement the thread-safe driver
-PGAC_ARG_BOOL(enable, pthreads, no,
+AC_ARG_ENABLE(pthreads,
     [  --enable-pthreads         build pthread implementation if possible],
     [AC_DEFINE(POSIX_MULTITHREAD_SUPPORT, 1,
 	[Define to 1 to build with pthreads support (--enable-pthreads)])
@@ -71,7 +71,7 @@ PGAC_ARG_BOOL(enable, pthreads, no,
 
 # Allow for overriding the default location of the odbcinst.ini
 # file which is normally ${sysconfdir} (i.e., ${prefix}/etc).
-PGAC_ARG_REQ(with, odbcinst,
+AC_ARG_WITH(odbcinst,
              [  --with-odbcinst=DIR     default directory for odbcinst.ini [sysconfdir]],
              [odbcinst_ini_dir=$withval],
              [odbcinst_ini_dir="\${sysconfdir}"])
@@ -87,7 +87,7 @@ AC_PROG_LIBTOOL
 AC_CHECK_HEADERS([locale.h])
 AC_CHECK_HEADERS([sys/un.h])
 AC_CHECK_TYPES(uint8)
-PGAC_VAR_INT_TIMEZONE
+AC_STRUCT_TIMEZONE
 
 AC_C_CONST
 AC_TYPE_SIZE_T