Fixing up ODBC stuff so it builds on Unix

Makefile.in

@@ -3,20 +3,18 @@
 
 # Documentation in files INSTALL and doc/install.txt
 
-ODBC=/cygdrive/d/Program Files/Microsoft Platform SDK
-#ODBCCPPFLAGS="-I$(ODBC)/Include/"
-ODBCLDFLAGS="-L$(ODBC)/Lib/"
-ODBCLIBS=-lodbc32
+ODBCDIR       =/cygdrive/c/Program Files/Microsoft Platform SDK
+ODBCLDFLAGS   ="-L$(ODBCDIR)/Lib/"
 
 srcdir = @srcdir@
 VPATH = @srcdir@
 CC = @CC@
 DEFS = @DEFS@
 EXEEXT = @EXEEXT@
-LIBS = @LIBS@ $(ODBCLIBS)
+LIBS = @LIBS@
 #DBOPEN = @DBOPEN@
 CFLAGS = @CFLAGS@
-CPPFLAGS= @CPPFLAGS@ -I$(srcdir)/cig -I$(srcdir)/scsh/regexp $(ODBCCPPFLAGS)
+CPPFLAGS= @CPPFLAGS@ -I$(srcdir)/cig -I$(srcdir)/scsh/regexp
 INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@ -c
 INSTALL_DATA = @INSTALL_DATA@ -c
@@ -132,13 +130,15 @@ SCSHOBJS = \
 #    	scsh/$(DBOPEN) \
 #    	scsh/dbm.o scsh/dbm1.o
 
-SCSHODBCOBJS = \
+ODBCOBJS = \
 	scsh/odbc/scsh-odbc.o  \
 	scsh/odbc/odbc0.o \
 	scsh/odbc/odbc1.o \
 	scsh/odbc/odbc2.o \
 #
 
+SCSHODBCOBJS = @SCSHODBCOBJS@
+
 OBJS = unix.o dynload.o prescheme.o extension.o scheme48vm.o \
 	process_args.o $(CIGOBJS) $(SCSHVMHACKS) $(SCSHOBJS) $(SCSHODBCOBJS)
 

configure.in

@@ -349,10 +349,12 @@ AC_CHECK_LIB(ld, ldopen)
 AC_CHECK_LIB(dl, dlopen)
 AC_CHECK_LIB(dld, shl_findsym)
 dnl	AC_CHECK_LIB(mld, main)
+AC_CHECK_LIB(odbc32, SQLAllocConnect)
 
 AC_RETSIGTYPE
 AC_HAVE_HEADERS(libgen.h sys/timeb.h posix/time.h sys/select.h nlist.h)
 AC_HAVE_HEADERS(sys/un.h)
+AC_HAVE_HEADERS(windows.h)
 AC_HAVE_FUNCS(strerror)
 AC_HAVE_FUNCS(dlopen gettimeofday ftime nlist select setitimer sigaction)
 AC_HAVE_FUNCS(socket chroot)
@@ -369,6 +371,10 @@ SCSH_CONST_SYS_ERRLIST
 
 CFLAGS1=${CFLAGS}
 
+if test ! $HAVE_WINDOWS_H = ""; then
+  SCSHODBCOBJS="ODBCOBJS"
+fi
+
 AC_SUBST(AIX_P)
 AC_SUBST(AR)
 AC_SUBST(CC)
@@ -379,6 +385,7 @@ AC_SUBST(ENDIAN)
 AC_SUBST(LDFLAGS)
 AC_SUBST(LDFLAGS_AIX)
 AC_SUBST(LIBS)
+AC_SUBST(SCSHODBCOBJS)
 AC_SUBST(TMPDIR)
 
 AC_OUTPUT(Makefile scsh/regexp/Makefile scsh/endian.scm scsh/static.scm)

sysdep.h.in

@@ -140,5 +140,9 @@ struct sigaction {
 /* Define if your sys_errlist is a const definition */
 #undef HAVE_CONST_SYS_ERRLIST
 
+/* Define if we have a Windows header file. It's possible even on Unix
+   if we are using ODBC so we don't move it to scsh/win32/sysdep.h */
+#undef HAVE_WINDOWS_H
+
 /* Include info we know about the system from config.scsh */
 #include "scsh/machine/sysdep.h"