Changeset: 4c8019a7fa69 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4c8019a7fa69
Modified Files:
buildtools/conf/MonetDB.m4
Branch: default
Log Message:
AM_MONETDB_LIB_PTHREAD: fixup for fix from 338278a768f4
If no lib is necessary, $ac_cv_search_sem_wait contains something like
"nothing necessary", which causes linking issues. Another attempt to
use LIBS, since AC_SEARCH_LIBS is supposed to append to that whatever it
needs.
diffs (42 lines):
diff -r 72af72ddf19a -r 4c8019a7fa69 buildtools/conf/MonetDB.m4
--- a/buildtools/conf/MonetDB.m4 Tue Nov 02 13:08:56 2010 +0100
+++ b/buildtools/conf/MonetDB.m4 Tue Nov 02 13:43:26 2010 +0100
@@ -2250,7 +2250,6 @@
esac
CPPFLAGS="$save_CPPFLAGS"
- save_LIBS="$LIBS"
case $GCC in
yes)
# use GCC's knowledge about the target
platform, sets flags
@@ -2261,6 +2260,7 @@
LIBS="$LIBS -pthread"
;;
*)
+ save_LIBS="$LIBS"
# ok, do old-fashioned stuff
LIBS="$LIBS $PTHREAD_LIBS" # in case user did
--with-pthreads
pthread_found=yes
@@ -2289,6 +2289,7 @@
fi
have_pthread=no
fi
+ LIBS="$save_LIBS"
;;
esac
@@ -2307,9 +2308,11 @@
dnl this function very ugly is overloaded with semaphore stuff
dnl so we DO need to check for it, for platforms which have it
dnl in a separate lib, like Solaris
- AC_SEARCH_LIBS(sem_wait, rt,
- [PTHREAD_LIBS="$PTHREAD_LIBS $ac_cv_search_sem_wait"])
- LIBS="$save_LIBS"
+ oldLIBS="$LIBS"
+ LIBS="$PTHREAD_LIBS"
+ AC_SEARCH_LIBS(sem_wait, rt)
+ PTHREAD_LIBS="$LIBS"
+ LIBS="$oldLIBS"
CPPFLAGS="$save_CPPFLAGS"
fi
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
