From 832cce5dcb72212ec5d8a91ddf220c62f0d6a2e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Grubbstr=C3=B6m=20=28Grubba=29?=
<grubba@grubba.org>
Date: Sun, 5 Oct 1997 05:41:43 +0200
Subject: [PATCH] Removed ODBC_LIBS variable.
Rev: src/modules/Odbc/Makefile.in:1.2
Rev: src/modules/Odbc/configure.in:1.7
---
src/modules/Odbc/Makefile.in | 4 ++--
src/modules/Odbc/configure.in | 10 +---------
2 files changed, 3 insertions(+), 11 deletions(-)
diff --git a/src/modules/Odbc/Makefile.in b/src/modules/Odbc/Makefile.in
index a2ba0da840..6b01c7cb1e 100644
--- a/src/modules/Odbc/Makefile.in
+++ b/src/modules/Odbc/Makefile.in
@@ -1,12 +1,12 @@
#
-# $Id: Makefile.in,v 1.1 1997/03/10 19:01:49 grubba Exp $
+# $Id: Makefile.in,v 1.2 1997/10/05 03:41:42 grubba Exp $
#
SRCDIR=@srcdir@
VPATH=@srcdir@:@srcdir@/../..:../..
MODULE_CPPFLAGS=@DEFS@ @CPPFLAGS@
OBJS=odbc.o odbc_result.o
-MODULE_LDFLAGS=@LDFLAGS@ @ODBC_LIBS@
+MODULE_LDFLAGS=@LDFLAGS@ @LIBS@
@dynamic_module_makefile@
@dependencies@
\ No newline at end of file
diff --git a/src/modules/Odbc/configure.in b/src/modules/Odbc/configure.in
index 9c895391e3..f6cab891d8 100644
--- a/src/modules/Odbc/configure.in
+++ b/src/modules/Odbc/configure.in
@@ -1,5 +1,5 @@
#
-# $Id: configure.in,v 1.6 1997/06/13 15:58:02 grubba Exp $
+# $Id: configure.in,v 1.7 1997/10/05 03:41:43 grubba Exp $
#
# Configure script for the odbc-module
#
@@ -14,7 +14,6 @@ sinclude(../module_configure.in)
OLD_LIBS=$LIBS
OLD_LDFLAGS=$LDFLAGS
OLD_CPPFLAGS=$CPPFLAGS
-ODBC_LIBS=""
AC_ARG_WITH(odbc, [ --without-odbc no support for the ODBC databases],[],[with_odbc=yes])
@@ -97,7 +96,6 @@ if test x$with_odbc = xyes; then
else
AC_CHECK_LIB(socket, socket, [
LIBS="-lsocket $LIBS"
- ODBC_LIBS="-lsocket ${ODBC_LIBS}"
], [])
fi
if echo $LIBS|grep -- -lnsl >&5 2>&5; then
@@ -105,7 +103,6 @@ if test x$with_odbc = xyes; then
else
AC_CHECK_LIB(nsl, gethostbyname, [
LIBS="-lnsl $LIBS"
- ODBC_LIBS="-lnsl ${ODBC_LIBS}"
], [])
fi
if echo $LIBS|grep -- -lm >&5 2>&5; then
@@ -113,13 +110,11 @@ if test x$with_odbc = xyes; then
else
AC_CHECK_LIB(m, floor, [
LIBS="-lm $LIBS"
- ODBC_LIBS="-lm ${ODBC_LIBS}"
], [])
fi
AC_CHECK_LIB(odbc, SQLConnect, [
LIBS="-lodbc $LIBS"
- ODBC_LIBS="-lodbc ${ODBC_LIBS}"
pike_cv_odbc=yes;
], [])
else
@@ -131,7 +126,6 @@ if test x$with_odbc = xyes; then
LIBS=$OLD_LIBS
CPPFLAGS=$OLD_CPPFLAGS
LDFLAGS=$OLD_LDFLAGS
- ODBC_LIBS=""
else
AC_DEFINE(HAVE_ODBC)
@@ -140,6 +134,4 @@ else
:
fi
-AC_SUBST(ODBC_LIBS)
-
AC_OUTPUT(Makefile,echo FOO >stamp-h )
--
GitLab