Changeset eb7c6b in git

Timestamp:

Sep 12, 2014, 12:20:09 PM (9 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

3b6f1bf8adb986d207f385b4473052dca49baf56

Parents:

cad9d1320047d98fd4177239334b76e7ccee061c

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2014-09-12 12:20:09+02:00

git-committer:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2014-09-12 12:20:56+02:00

Message:

changed test for pthread, avoiding a libtool/gcc bug

File:

• configure.ac (modified) (2 diffs)

configure.ac

@@ -56 +56 @@
 
 # Checks for libraries.
+
+# This test for -lpthread etc has to come before AX_PTHREAD,
+# because libtool tends to ignore -pthread in linking shared C++-libs
+# see https://gcc.gnu.org/bugzilla/show_bug.cgi?id=25460
+# (happens with ubuntu 14.04)
+AC_SEARCH_LIBS(sem_wait,[rt pthreads pthread],[],[
+  AC_MSG_ERROR([sem_wait not found in rt,pthreads,pthread])
+])
+
 #AC_CHECK_LIB(pthread,pthread_create)
 AX_PTHREAD([], [
@@ -70 +79 @@
 # Set the correct PTHREAD flags and, if needed, change the compiler to one that is pthread-enabled.
 CC="$PTHREAD_CC"
-PTHREAD_LDFLAGS="$PTHREAD_CFLAGS"
+CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+LDFLAGS="$LDFLAGS $PTHREAD_LDFLAGS"
 
 AC_SUBST(PTHREAD_CFLAGS)