summaryrefslogtreecommitdiff
path: root/devel/chmlib/patches/patch-ac
diff options
context:
space:
mode:
Diffstat (limited to 'devel/chmlib/patches/patch-ac')
-rw-r--r--devel/chmlib/patches/patch-ac38
1 files changed, 19 insertions, 19 deletions
diff --git a/devel/chmlib/patches/patch-ac b/devel/chmlib/patches/patch-ac
index 8364f4b315f..18eaede4326 100644
--- a/devel/chmlib/patches/patch-ac
+++ b/devel/chmlib/patches/patch-ac
@@ -1,25 +1,25 @@
-$NetBSD: patch-ac,v 1.1 2006/01/03 16:25:59 joerg Exp $
+$NetBSD: patch-ac,v 1.2 2006/06/23 12:56:26 salo Exp $
---- configure.orig 2006-01-03 16:13:34.000000000 +0000
-+++ configure
-@@ -3201,13 +3201,13 @@ if test "${enable_pthread+set}" = set; t
-
+--- configure.orig 2006-06-17 01:09:19.000000000 +0200
++++ configure 2006-06-23 14:13:20.000000000 +0200
+@@ -19435,13 +19435,13 @@ if test "${enable_pthread+set}" = set; t
+ enableval=$enable_pthread;
if test "$enableval" = "yes"; then
--echo "$as_me:$LINENO: checking for pthread_mutex_init in -lpthread" >&5
--echo $ECHO_N "checking for pthread_mutex_init in -lpthread... $ECHO_C" >&6
-+echo "$as_me:$LINENO: checking for pthread_mutex_init in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" >&5
-+echo $ECHO_N "checking for pthread_mutex_init in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}... $ECHO_C" >&6
+-{ echo "$as_me:$LINENO: checking for pthread_mutex_init in -lpthread" >&5
+-echo $ECHO_N "checking for pthread_mutex_init in -lpthread... $ECHO_C" >&6; }
++{ echo "$as_me:$LINENO: checking for pthread_mutex_init in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" >&5
++echo $ECHO_N "checking for pthread_mutex_init in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}... $ECHO_C" >&6; }
if test "${ac_cv_lib_pthread_pthread_mutex_init+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lpthread $LIBS"
-+LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} $LIBS"
++LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -3269,12 +3269,12 @@ if test $ac_cv_lib_pthread_pthread_mutex
+@@ -19505,12 +19505,12 @@ if test $ac_cv_lib_pthread_pthread_mutex
#define HAVE_LIBPTHREAD 1
_ACEOF
@@ -34,24 +34,24 @@ $NetBSD: patch-ac,v 1.1 2006/01/03 16:25:59 joerg Exp $
else
CHM_MT=""
{ echo "$as_me:$LINENO: WARNING: Thread safe mode turned off. chm_http will not be built" >&5
-@@ -3284,13 +3284,13 @@ echo "$as_me: WARNING: Thread safe mode
+@@ -19520,13 +19520,13 @@ echo "$as_me: WARNING: Thread safe mode
else
--echo "$as_me:$LINENO: checking for pthread_mutex_init in -lpthread" >&5
--echo $ECHO_N "checking for pthread_mutex_init in -lpthread... $ECHO_C" >&6
-+echo "$as_me:$LINENO: checking for pthread_mutex_init in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" >&5
-+echo $ECHO_N "checking for pthread_mutex_init in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}... $ECHO_C" >&6
+-{ echo "$as_me:$LINENO: checking for pthread_mutex_init in -lpthread" >&5
+-echo $ECHO_N "checking for pthread_mutex_init in -lpthread... $ECHO_C" >&6; }
++{ echo "$as_me:$LINENO: checking for pthread_mutex_init in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" >&5
++echo $ECHO_N "checking for pthread_mutex_init in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}... $ECHO_C" >&6; }
if test "${ac_cv_lib_pthread_pthread_mutex_init+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lpthread $LIBS"
-+LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} $LIBS"
++LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -3352,12 +3352,12 @@ if test $ac_cv_lib_pthread_pthread_mutex
+@@ -19590,12 +19590,12 @@ if test $ac_cv_lib_pthread_pthread_mutex
#define HAVE_LIBPTHREAD 1
_ACEOF
@@ -64,5 +64,5 @@ $NetBSD: patch-ac,v 1.1 2006/01/03 16:25:59 joerg Exp $
- LDFLAGS="$LDFLAGS -lpthread"
+ LDFLAGS="$LDFLAGS ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}"
- fi;
+ fi