Changeset: 8cad6e4b14bd for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8cad6e4b14bd
Modified Files:
configure.ag
Branch: default
Log Message:
Merged from Apr2011
diffs (82 lines):
diff --git a/NT/winconfig.py b/NT/winconfig.py
--- a/NT/winconfig.py
+++ b/NT/winconfig.py
@@ -41,7 +41,6 @@
("@pkgincludedir@", r'%prefix%\include\@PACKAGE@'),
("@DIRSEP@", '\\'),
("@CROSS_COMPILING_FALSE@", ''),
- ("@LINK_STATIC_FALSE@", ''),
("@HAVE_CLIENTS_FALSE@", '#'),
("@HAVE_MONETDB_FALSE@", '#'),
("@NATIVE_WIN32_FALSE@", '#'),
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -1230,35 +1230,6 @@
AC_MSG_RESULT([no])
fi
-dnl static or shared linking
-SHARED_LIBS=''
-AC_MSG_CHECKING([for --enable-static])
-if test "$enable_static" = "yes" ; then
- CFLAGS="$CFLAGS -DMONETDB_STATIC"
- SHARED_LIBS='$(STATIC_LIBS) $(smallTOC_SHARED_LIBS)
$(largeTOC_SHARED_LIBS)'
- case "$host_os" in
- aix*)
- if test "x$GCC" = xyes; then
- LDFLAGS="$LDFLAGS -Xlinker"
- fi
- LDFLAGS="$LDFLAGS -bbigtoc"
- ;;
- irix*)
- if test "x$GCC" != xyes; then
- SHARED_LIBS="$SHARED_LIBS -lm"
- fi
- ;;
- esac
- AC_MSG_RESULT([yes])
-else
- case "$host_os" in
- aix*) LDFLAGS="$LDFLAGS -Wl,-brtl";;
- esac
- AC_MSG_RESULT([no])
-fi
-AC_SUBST(SHARED_LIBS)
-AM_CONDITIONAL(LINK_STATIC,test "x$enable_static" = xyes)
-
AC_PATH_PROG(BASH,bash, /usr/bin/bash, $PATH)
AC_CHECK_PROG(RM,rm,rm -f)
AC_CHECK_PROG(MV,mv,mv -f)
diff --git a/testing/Mtest.py.in b/testing/Mtest.py.in
--- a/testing/Mtest.py.in
+++ b/testing/Mtest.py.in
@@ -228,7 +228,6 @@
'HAVE_SPHINXCLIENT' : "@HAVE_SPHINXCLIENT_FALSE@",
'HAVE_SQL' : "@HAVE_SQL_FALSE@",
'HAVE_TESTING' : "@HAVE_TESTING_FALSE@",
- 'LINK_STATIC' : "@LINK_STATIC_FALSE@",
'NATIVE_WIN32' : "@NATIVE_WIN32_FALSE@",
'NOT_WIN32' : "@NOT_WIN32_FALSE@",
'PROFILING' : "@PROFILING_FALSE@",
@@ -3491,8 +3490,6 @@
env['TST_BITS'] = "32bit"
elif CONDITIONALS.has_key('BITS64') and CONDITIONALS['BITS64']:
env['TST_BITS'] = "64bit"
- if CONDITIONALS.has_key('LINK_STATIC') and
CONDITIONALS['LINK_STATIC']:
- env['TST_STATIC'] = "STATIC"
else:
if Check('%s --dbname=%s' % (env['exe']['Mserver'][1], TSTPREF),
QUIT):
sys.exit(1)
diff --git a/tools/mserver/Makefile.ag b/tools/mserver/Makefile.ag
--- a/tools/mserver/Makefile.ag
+++ b/tools/mserver/Makefile.ag
@@ -31,7 +31,7 @@
bin_mserver5 = {
SOURCES = mserver5.c monet_version.h monet_version.c.in
- LIBS = ../../monetdb5/tools/libmonetdb5 @SHARED_LIBS@ \
+ LIBS = ../../monetdb5/tools/libmonetdb5 \
../../gdk/libbat \
$(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
