From 99ddaa2744f4c31bbb0c8040b9f7c2946d08daed Mon Sep 17 00:00:00 2001 From: bdc Date: Sun, 25 Feb 2001 21:44:23 +0000 Subject: [PATCH] Now that things are building on unix, working on cygwin again --- configure | 6 +++--- configure.in | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/configure b/configure index cbfc1f6..31a5d96 100755 --- a/configure +++ b/configure @@ -955,7 +955,7 @@ else int main() { /* Ultrix mips cc rejects this. */ -typedef int charset[2]; const charset x = {0,0}; +typedef int charset[2]; const charset x; /* SunOS 4.1.1 cc rejects this. */ char const *const *ccp; char **p; @@ -2429,8 +2429,8 @@ EOF CFLAGS1=${CFLAGS} -if test ! $HAVE_WINDOWS_H = ""; then - SCSHODBCOBJS="ODBCOBJS" +if grep -c HAVE_WINDOWS_H confdefs.h > /dev/null; then + SCSHODBCOBJS="\$(ODBCOBJS)" fi diff --git a/configure.in b/configure.in index 975c598..e76149f 100644 --- a/configure.in +++ b/configure.in @@ -371,8 +371,8 @@ SCSH_CONST_SYS_ERRLIST CFLAGS1=${CFLAGS} -if test ! $HAVE_WINDOWS_H = ""; then - SCSHODBCOBJS="ODBCOBJS" +if grep -c HAVE_WINDOWS_H confdefs.h > /dev/null; then + SCSHODBCOBJS="\$(ODBCOBJS)" fi AC_SUBST(AIX_P)