Changeset: 6ff639d58499 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6ff639d58499
Modified Files:
configure.ag
gdk/Makefile.ag
tools/merovingian/client/Makefile.ag
tools/merovingian/daemon/Makefile.ag
tools/mserver/Makefile.ag
Branch: Apr2011
Log Message:
build: backout -lc changes for OpenBSD
It is unlikely we ever need to add -lc. On FreeBSD we can find sysctl
without problems without explicitly adding -lc to the link line.
Hence revert all commits that introduced C_LIBS containing -lc if
necessary for sysctl.
diffs (58 lines):
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -2031,11 +2031,6 @@
AC_SUBST(PTHREAD_LIBS)
AC_SUBST(PTHREAD_INCS)
-dnl sysctl is in libc on FreeBSD and NetBSD according to their manpages
-C_LIBS=""
-AC_CHECK_LIB(c, sysctl, [ C_LIBS="-lc" ] )
-AC_SUBST(C_LIBS)
-
dnl libreadline
have_readline=auto
READLINE_LIBS=""
diff --git a/gdk/Makefile.ag b/gdk/Makefile.ag
--- a/gdk/Makefile.ag
+++ b/gdk/Makefile.ag
@@ -50,5 +50,5 @@
../common/stream/libstream \
../common/utils/libmutils \
$(SOCKET_LIBS) $(zlib_LIBS) $(BZ_LIBS) \
- $(MALLOC_LIBS) $(PTHREAD_LIBS) $(DL_LIBS) $(C_LIBS)
+ $(MALLOC_LIBS) $(PTHREAD_LIBS) $(DL_LIBS)
}
diff --git a/tools/merovingian/client/Makefile.ag
b/tools/merovingian/client/Makefile.ag
--- a/tools/merovingian/client/Makefile.ag
+++ b/tools/merovingian/client/Makefile.ag
@@ -36,6 +36,5 @@
$(UUID_LIBS) \
$(curl_LIBS) \
$(SOCKET_LIBS) \
- $(MALLOC_LIBS) \
- $(C_LIBS)
+ $(MALLOC_LIBS)
}
diff --git a/tools/merovingian/daemon/Makefile.ag
b/tools/merovingian/daemon/Makefile.ag
--- a/tools/merovingian/daemon/Makefile.ag
+++ b/tools/merovingian/daemon/Makefile.ag
@@ -69,6 +69,5 @@
$(curl_LIBS) \
$(SOCKET_LIBS) \
$(MALLOC_LIBS) \
- $(PTHREAD_LIBS) \
- $(C_LIBS)
+ $(PTHREAD_LIBS)
}
diff --git a/tools/mserver/Makefile.ag b/tools/mserver/Makefile.ag
--- a/tools/mserver/Makefile.ag
+++ b/tools/mserver/Makefile.ag
@@ -33,6 +33,6 @@
SOURCES = mserver5.c monet_version.h monet_version.c.in
LIBS = ../../monetdb5/tools/libmonetdb5 \
../../gdk/libbat \
- $(SOCKET_LIBS) $(MALLOC_LIBS) $(PTHREAD_LIBS) $(DL_LIBS)
$(C_LIBS) \
+ $(SOCKET_LIBS) $(MALLOC_LIBS) $(PTHREAD_LIBS) $(DL_LIBS) \
$(curl_LIBS) $(pcre_LIBS) $(openssl_LIBS) $(PSAPILIB)
}
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
