Use PTHREAD_* instead of hard-wired -lpthread, esp. when testing for

libgadu. Let errno.h provide errno in libgsm.

3 files changed, 50 insertions, 8 deletions

diff --git a/chat/kadu/distinfo b/chat/kadu/distinfo
index 9f720da8575..dc4d3ab6a04 100644
--- a/chat/kadu/distinfo
+++ b/chat/kadu/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.7 2005/08/05 21:42:54 salo Exp $
+$NetBSD: distinfo,v 1.8 2006/01/05 16:36:38 joerg Exp $
 
 SHA1 (kadu-0.4.1.tar.bz2) = e2eb3af9b156e0adfa8d6aa4577e2a8b67807514
 RMD160 (kadu-0.4.1.tar.bz2) = aab9004b0b830a14a7a13168217040d7bf68a656
 Size (kadu-0.4.1.tar.bz2) = 1218351 bytes
 SHA1 (patch-aa) = 326e786f46223121de946294a647289f1c190b87
-SHA1 (patch-ab) = 02684bdadb7c5fb46d4d79cfcfd1f5671d55f1a3
+SHA1 (patch-ab) = f9fb003dc4b45a746877f4a4acb25e5e0e8b6078
+SHA1 (patch-ac) = 91c66b6810d3452217b084d23d2ea67b19681963
diff --git a/chat/kadu/patches/patch-ab b/chat/kadu/patches/patch-ab
index abdb093a0ce..dbd50ccd361 100644
--- a/chat/kadu/patches/patch-ab
+++ b/chat/kadu/patches/patch-ab
@@ -1,13 +1,41 @@
-$NetBSD: patch-ab,v 1.6 2005/08/05 21:42:54 salo Exp $
+$NetBSD: patch-ab,v 1.7 2006/01/05 16:36:38 joerg Exp $
 
 --- configure.orig	2005-07-19 19:52:02.000000000 +0000
-+++ configure	2005-08-05 21:18:36.000000000 +0000
-@@ -9494,12 +9494,12 @@
++++ configure
+@@ -4259,13 +4259,13 @@ done
+ ##################
+ 
+ 
+-	echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
+-echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6
++	echo "$as_me:$LINENO: checking for pthread_create in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" >&5
++echo $ECHO_N "checking for pthread_create in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}... $ECHO_C" >&6
+ if test "${ac_cv_lib_pthread_pthread_create+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"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -4326,8 +4326,8 @@ echo "${ECHO_T}$ac_cv_lib_pthread_pthrea
+ if test $ac_cv_lib_pthread_pthread_create = yes; then
+ 
+ 		PTHREAD_CPPFLAGS=
+-		PTHREAD_LDFLAGS=
+-		PTHREAD_LIBS=-lpthread
++		PTHREAD_LDFLAGS=${PTHREAD_LDFLAGS}
++		PTHREAD_LIBS=${PTHREAD_LIBS}
+ 
+ else
+ 
+@@ -9494,12 +9494,12 @@ echo "$as_me: error: libgadu.h not found
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  
 -	GADU_LIBS=-lgadu
-+	GADU_LIBS="-lgadu -lssl -lcrypto -lpthread"
++	GADU_LIBS="-lgadu -lssl -lcrypto ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}"
  
  	echo "$as_me:$LINENO: checking if libgadu is in system directories" >&5
  echo $ECHO_N "checking if libgadu is in system directories... $ECHO_C" >&6
@@ -17,7 +45,7 @@ $NetBSD: patch-ab,v 1.6 2005/08/05 21:42:54 salo Exp $
  	cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -9858,7 +9858,11 @@
+@@ -9858,7 +9858,11 @@ echo "$as_me: error: $mod download faile
  	echo "$as_me:$LINENO: checking if lib$lib is in system directories" >&5
  echo $ECHO_N "checking if lib$lib is in system directories... $ECHO_C" >&6
  	save_CFLAGS="$CFLAGS"
@@ -29,7 +57,7 @@ $NetBSD: patch-ab,v 1.6 2005/08/05 21:42:54 salo Exp $
  	cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -9992,7 +9996,7 @@
+@@ -9992,7 +9996,7 @@ fi
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
   \
diff --git a/chat/kadu/patches/patch-ac b/chat/kadu/patches/patch-ac
new file mode 100644
index 00000000000..d7e7ba60727
--- /dev/null
+++ b/chat/kadu/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.3 2006/01/05 16:36:38 joerg Exp $
+
+--- modules/voice/libgsm/inc/config.h.orig	2006-01-05 16:21:24.000000000 +0000
++++ modules/voice/libgsm/inc/config.h
+@@ -15,7 +15,7 @@
+ #define	HAS_STDLIB_H	1		/* /usr/include/stdlib.h	*/
+ /*efine	HAS_LIMITS_H	1		/* /usr/include/limits.h	*/
+ #define	HAS_FCNTL_H	1		/* /usr/include/fcntl.h		*/
+-/*efine	HAS_ERRNO_DECL	1		/* errno.h declares errno	*/
++#define	HAS_ERRNO_DECL	1		/* errno.h declares errno	*/
+ 
+ #define	HAS_FSTAT 	1		/* fstat syscall		*/
+ #define	HAS_FCHMOD 	1		/* fchmod syscall		*/