57 lines
1.4 KiB
Plaintext
57 lines
1.4 KiB
Plaintext
$OpenBSD: patch-configure,v 1.2 2007/04/27 13:38:09 ajacoutot Exp $
|
|
--- configure.orig Wed Feb 22 12:53:28 2006
|
|
+++ configure Fri Apr 27 15:28:49 2007
|
|
@@ -1951,7 +1951,7 @@ LIBDIR=${libdir}
|
|
MAJOR_VERSION=`cat ${PWLIBDIR}/version.h | grep MAJOR_VERSION | cut -f3 -d' '`
|
|
MINOR_VERSION=`cat ${PWLIBDIR}/version.h | grep MINOR_VERSION | cut -f3 -d' '`
|
|
BUILD_NUMBER=`cat ${PWLIBDIR}/version.h | grep BUILD_NUMBER | cut -f3 -d' '`
|
|
-PWLIB_VERSION="${MAJOR_VERSION}.${MINOR_VERSION}.${BUILD_NUMBER}"
|
|
+PWLIB_VERSION="${MAJOR_VERSION}.${MINOR_VERSION}"
|
|
|
|
|
|
|
|
@@ -4567,8 +4567,12 @@ else
|
|
fi
|
|
|
|
if test ${HAS_PTHREADS} = yes ; then
|
|
- ENDLDLIBS="$ENDLDLIBS -lpthread"
|
|
- STDCCFLAGS="$STDCCFLAGS -D_REENTRANT"
|
|
+ if test ${OSTYPE} = OpenBSD ; then
|
|
+ ENDLDLIBS="$ENDLDLIBS -pthread"
|
|
+ else
|
|
+ ENDLDLIBS="$ENDLDLIBS -lpthread"
|
|
+ fi
|
|
+ STDCCFLAGS="$STDCCFLAGS -D_REENTRANT"
|
|
else
|
|
if test ${OSTYPE} = FreeBSD ; then
|
|
HAS_PTHREADS=yes
|
|
@@ -4789,7 +4793,7 @@ cat >>conftest.$ac_ext <<_ACEOF
|
|
int
|
|
main ()
|
|
{
|
|
-pthread_mutexattr_t attr; pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE_NP);
|
|
+pthread_mutexattr_t attr; pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
|
|
;
|
|
return 0;
|
|
}
|
|
@@ -5495,19 +5499,9 @@ fi
|
|
|
|
|
|
|
|
-if test "x$LIB64" != "x" ; then
|
|
-
|
|
cat >>confdefs.h <<_ACEOF
|
|
-#define P_DEFAULT_PLUGIN_DIR "${INSTALLPREFIX}/lib64/pwlib"
|
|
-_ACEOF
|
|
-
|
|
-else
|
|
-
|
|
-cat >>confdefs.h <<_ACEOF
|
|
#define P_DEFAULT_PLUGIN_DIR "${INSTALLPREFIX}/lib/pwlib"
|
|
_ACEOF
|
|
-
|
|
-fi
|
|
|
|
|
|
|