From 79fa3ebd69f3eeca5a4db5ea4417f9f59426ccb6 Mon Sep 17 00:00:00 2001
From: Francesco Chemolli <li@kinkie.it>
Date: Fri, 28 Apr 2000 00:30:12 +0200
Subject: [PATCH] Put saner library-checks in place.
Rev: src/modules/sybase/acconfig.h:1.2
Rev: src/modules/sybase/configure.in:1.2
---
src/modules/sybase/acconfig.h | 35 +++++++--------------------------
src/modules/sybase/configure.in | 29 ++++++---------------------
2 files changed, 13 insertions(+), 51 deletions(-)
diff --git a/src/modules/sybase/acconfig.h b/src/modules/sybase/acconfig.h
index b9b3bae182..ac956ae609 100644
--- a/src/modules/sybase/acconfig.h
+++ b/src/modules/sybase/acconfig.h
@@ -1,5 +1,5 @@
/*
- * $Id: acconfig.h,v 1.1 2000/03/26 20:43:08 kinkie Exp $
+ * $Id: acconfig.h,v 1.2 2000/04/27 22:30:12 kinkie Exp $
*
* Config-file for the Pike sybase driver module
*
@@ -15,37 +15,16 @@
/* End of automatic session. Doing stuff now */
-#if defined(HAVE_LIBCOMN) || defined(HAVE_LIBCOMN64) || \
- defined(HAVE_LIBCOMN_DCE) || defined(HAVE_LIBCOMN_DCE64) || \
- defined(HAVE_LIBCOMN_R)
-#define PIKE_HAVE_LIBCOMN
-#endif
-
-#if defined(HAVE_LIBCS) || defined(HAVE_LIBCS64) || \
- defined(HAVE_LIBCS_R) || defined(HAVE_LIBCS_R64)
-#define PIKE_HAVE_LIBCS
-#endif
-
-#if defined(HAVE_LIBCT) || defined(HAVE_LIBCT64) || \
- defined(HAVE_LIBCT_R) || defined(HAVE_LIBCT_R64)
-#define PIKE_HAVE_LIBCT
-#endif
-
-#if defined(HAVE_LIBINTL) || defined(HAVE_LIBINTL64) || \
- defined(HAVE_LIBINTL_R) || defined(HAVE_LIBINTL_R64)
-#define PIKE_HAVE_LIBINTL
-#endif
-
-#if defined(HAVE_LIBSYBTCL) || defined(HAVE_LIBTCL) || \
- defined(HAVE_LIBTCL64) || defined(HAVE_LIBTCL_DCE) || \
- defined(HAVE_LIBTCL_DCE64) || defined(HAVE_LIBTCL_R)
-#define PIKE_HAVE_LIBSYBTCL
-#endif
+#undef PIKE_HAVE_LIBCOMN
+#undef PIKE_HAVE_LIBCS
+#undef PIKE_HAVE_LIBCT
+#undef PIKE_HAVE_LIBINTL
+#undef PIKE_HAVE_LIBSYBTCL
#if defined(PIKE_HAVE_LIBCOMN) && defined(PIKE_HAVE_LIBCS) \
&& defined(PIKE_HAVE_LIBCT) && defined(PIKE_HAVE_LIBINTL) \
&& defined(PIKE_HAVE_LIBSYBTCL) && defined(HAVE_CTPUBLIC_H)
-#define HAVE_SYBASE
+#define HAVE_SYBASE
#endif
#endif /* __PIKE_SYBASE_CONFIG_H */
diff --git a/src/modules/sybase/configure.in b/src/modules/sybase/configure.in
index 2a9846df62..1cf33ff80d 100755
--- a/src/modules/sybase/configure.in
+++ b/src/modules/sybase/configure.in
@@ -116,29 +116,12 @@ if test x$with_sybase != xno; then
AC_CHECK_LIB(m,floor)
AC_CHECK_LIB(dl,dlopen)
AC_CHECK_LIB(nsl,gethostbyname)
- AC_CHECK_LIB(intl_r64,intl_datetime)
- AC_CHECK_LIB(intl_r,intl_datetime)
- AC_CHECK_LIB(intl64,intl_datetime)
- AC_CHECK_LIB(intl,intl_datetime)
- AC_CHECK_LIB(comn_dce64,comn_free)
- AC_CHECK_LIB(comn_dce,comn_free)
- AC_CHECK_LIB(comn_r,comn_free)
- AC_CHECK_LIB(comn64,comn_free)
- AC_CHECK_LIB(comn,comn_free)
- AC_CHECK_LIB(tcl_dce64,syb_net_connect)
- AC_CHECK_LIB(tcl_dce,syb_net_connect)
- AC_CHECK_LIB(tcl_r,syb_net_connect)
- AC_CHECK_LIB(tcl64,syb_net_connect)
- AC_CHECK_LIB(sybtcl,syb_net_connect)
- AC_CHECK_LIB(tcl,syb_net_connect)
- AC_CHECK_LIB(cs64,cs_ctx_alloc)
- AC_CHECK_LIB(cs_r64,cs_ctx_alloc)
- AC_CHECK_LIB(cs_r,cs_ctx_alloc)
- AC_CHECK_LIB(cs,cs_ctx_alloc)
- AC_CHECK_LIB(ct64,ct_callback)
- AC_CHECK_LIB(ct_r64,ct_callback)
- AC_CHECK_LIB(ct_r,ct_callback)
- AC_CHECK_LIB(ct,ct_callback)
+
+ AC_SEARCH_LIBS(intl_datetime,intl_r64 intl_r intl64 intl,AC_DEFINE(PIKE_HAVE_LIBINTL))
+ AC_SEARCH_LIBS(comn_bintobin,comn_r64 comn_r comn_dce64 comn_dce comn64 comn,AC_DEFINE(PIKE_HAVE_LIBCOMN))
+ AC_SEARCH_LIBS(cs_ctx_alloc,cs_r64 cs_r cs64 cs,AC_DEFINE(PIKE_HAVE_LIBCS))
+ AC_SEARCH_LIBS(iface_open,tcl_r64 tcl_r tcl_dce64 tcl_dce sybtcl tcl64 tcl,AC_DEFINE(PIKE_HAVE_LIBSYBTCL))
+ AC_SEARCH_LIBS(ct_callback, ct_r64 ct_r ct64 ct,AC_DEFINE(PIKE_HAVE_LIBCT))
AC_CHECK_HEADERS(ctpublic.h)
--
GitLab