scsh-conservatory
/
scsh-0.5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixing up ODBC stuff so it builds on Unix

This commit is contained in:
bdc 2001-02-25 21:07:49 +00:00
parent 89c1f4b11b
commit a67626ddca
5 changed files with 324 additions and 138 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Makefile.in
View File

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

421
configure vendored
View File

File diff suppressed because it is too large Load Diff

7
configure.in
View File

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

BIN
initial.image
View File

Binary file not shown.

4
sysdep.h.in
View File

@ -140,5 +140,9 @@ struct sigaction {
/* Define if your sys_errlist is a const definition */ /* Define if your sys_errlist is a const definition */
#undef HAVE_CONST_SYS_ERRLIST #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 info we know about the system from config.scsh */
#include "scsh/machine/sysdep.h" #include "scsh/machine/sysdep.h"