OK, I have tidied up todays (13th) snapshot with the attached patch, I

have'nt r un autoconf to create a new configure, I guess that's done by
the smapshot process, I had to remove a line from interface/odbc/
GNUMakefile to get it to build, it was a autoconf variable that looks to
not be used anymore, I am assuming that this is  ok.

Nick Gorham
Easysoft Ltd

diff --git a/configure.in b/configure.in
index 14034cf00f55e12cc00e0c02d30a9526a03cbf01..42930ab94bf80ff0c7ae166dbcb2a9da164e4795 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -488,111 +488,6 @@ then
 fi
 export SHLIB_ODBC
 
-#check for unixODBC libs
-
-if test "x$use_unixODBC" = "xyes"
-then
-
-  # default to /usr/local if not specified
-  if test "x$unixODBC" = "x"
-  then
-      unixODBC="/usr/local";
-  fi
-  
-  unixODBC_libs="$unixODBC/lib"
-  unixODBC_includes="$unixODBC/include"
-
-  CPPFLAGS="$CPPFLAGS -I$unixODBC_includes"
-  AC_CHECK_HEADERS(sql.h sqlext.h odbcinst.h,
-          unixODBC_ok=yes;
-          odbc_headers="$odbc_headers $ac_hdr",
-          unixODBC_ok=no )
-  
-  if test "x$unixODBC_ok" != "xyes"
-  then
-      AC_MSG_ERROR([Unable to find the unixODBC headers in $1])
-  fi
- 
-  save_LIBS="$LIBS"
-  LIBS="-L$unixODBC_libs $LIBS"
-  
-  AC_CHECK_LIB(odbcinst,SQLGetPrivateProfileString,
-    [AC_DEFINE(HAVE_SQLGETPRIVATEPROFILESTRING)
-    SHLIB_ODBC="$LDFLAGS_ODBC -L$unixODBC_libs -lodbcinst" ],
-    [LIBS="$save_LIBS"] )
-fi
-export SHLIB_ODBC
-
-#check for unixODBC libs
-
-if test "x$use_unixODBC" = "xyes"
-then
-
-  # default to /usr/local if not specified
-  if test "x$unixODBC" = "x"
-  then
-      unixODBC="/usr/local";
-  fi
-  
-  unixODBC_libs="$unixODBC/lib"
-  unixODBC_includes="$unixODBC/include"
-
-  CPPFLAGS="$CPPFLAGS -I$unixODBC_includes"
-  AC_CHECK_HEADERS(sql.h sqlext.h odbcinst.h,
-          unixODBC_ok=yes;
-          odbc_headers="$odbc_headers $ac_hdr",
-          unixODBC_ok=no )
-  
-  if test "x$unixODBC_ok" != "xyes"
-  then
-      AC_MSG_ERROR([Unable to find the unixODBC headers in $1])
-  fi
- 
-  save_LIBS="$LIBS"
-  LIBS="-L$unixODBC_libs $LIBS"
-  
-  AC_CHECK_LIB(odbcinst,SQLGetPrivateProfileString,
-    [AC_DEFINE(HAVE_SQLGETPRIVATEPROFILESTRING)
-    SHLIB_ODBC="$LDFLAGS_ODBC -L$unixODBC_libs -lodbcinst" ],
-    [LIBS="$save_LIBS"] )
-fi
-export SHLIB_ODBC
-
-#check for unixODBC libs
-
-if test "x$use_unixODBC" = "xyes"
-then
-
-  # default to /usr/local if not specified
-  if test "x$unixODBC" = "x"
-  then
-      unixODBC="/usr/local";
-  fi
-  
-  unixODBC_libs="$unixODBC/lib"
-  unixODBC_includes="$unixODBC/include"
-
-  CPPFLAGS="$CPPFLAGS -I$unixODBC_includes"
-  AC_CHECK_HEADERS(sql.h sqlext.h odbcinst.h,
-          unixODBC_ok=yes;
-          odbc_headers="$odbc_headers $ac_hdr",
-          unixODBC_ok=no )
-  
-  if test "x$unixODBC_ok" != "xyes"
-  then
-      AC_MSG_ERROR([Unable to find the unixODBC headers in $1])
-  fi
- 
-  save_LIBS="$LIBS"
-  LIBS="-L$unixODBC_libs $LIBS"
-  
-  AC_CHECK_LIB(odbcinst,SQLGetPrivateProfileString,
-    [AC_DEFINE(HAVE_SQLGETPRIVATEPROFILESTRING)
-    SHLIB_ODBC="$LDFLAGS_ODBC -L$unixODBC_libs -lodbcinst" ],
-    [LIBS="$save_LIBS"] )
-fi
-export SHLIB_ODBC
-
 dnl Unless we specify the command line options
 dnl    --enable cassert        to explicitly enable it
 dnl If you do not explicitly do it, it defaults to disabled

diff --git a/src/interfaces/odbc/GNUmakefile.in b/src/interfaces/odbc/GNUmakefile.in
index 23a84c57672703e9621b987c066f3aa2b3491955..816b6f2c0aeecf1de5a0a0167157551213f180ce 100644 (file)
--- a/src/interfaces/odbc/GNUmakefile.in
+++ b/src/interfaces/odbc/GNUmakefile.in
@@ -7,10 +7,9 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/interfaces/odbc/Attic/GNUmakefile.in,v 1.14 2000/06/12 17:58:20 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/interfaces/odbc/Attic/GNUmakefile.in,v 1.15 2000/06/14 02:43:46 momjian Exp $
 #
 #-------------------------------------------------------------------------
-@SET_MAKE@
 
 NAME = psqlodbc
 SRCDIR= ../..