Attachment #58814 for bug #88559

View | Details | Raw Unified | Return to bug 88559
Collapse All | Expand All




#

PORTNAME=	kpum
PORTVERSION=	0.5.3.1
PORTREVISION=	3
CATEGORIES=	ftp
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=	${PORTNAME}

MAINTAINER=	ports@FreeBSD.org
COMMENT=	KDE pureftpd user manager

EXTRACT_AFTER_ARGS=	| ${TAR} --no-same-permission -xf - || ${TRUE}

WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:R}

USE_BZIP2=	yes
USE_KDELIBS_VER=	3
GNU_CONFIGURE=	yes
USE_GMAKE=	yes
GNU_CONFIGURE=	yes

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)ftp/kpum/distinfo (-2 / +2 lines)
1	MD5 (kpum-0.5.2.1.tar.gz) = 93608f687c1e421ceb7aa199c027107c	1	MD5 (kpum-0.5.3.1.tar.bz2) = d850024c97739f76055e5a5708a7c591
2	SIZE (kpum-0.5.2.1.tar.gz) = 591539	2	SIZE (kpum-0.5.3.1.tar.bz2) = 464046




--- configure.orig	Thu Nov 11 21:01:00 2004
+++ configure	Thu Nov 11 21:02:48 2004
@@ -21019,15 +21019,34 @@
 
 
 
-echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
-echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6
-if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
+                LIBPTHREAD=""
+
+  if test -n "$PTHREAD_LIBS"; then
+    if test "x$PTHREAD_LIBS" = "x-pthread" ; then
+      LIBPTHREAD="PTHREAD"
+    else
+      PTHREAD_LIBS_save="$PTHREAD_LIBS"
+      PTHREAD_LIBS=`echo "$PTHREAD_LIBS_save" | sed -e 's,^-l,,g'`
+      echo "$as_me:$LINENO: checking for pthread_create in $PTHREAD_LIBS" >&5
+echo $ECHO_N "checking for pthread_create in $PTHREAD_LIBS... $ECHO_C" >&6
+
+     kde_save_LDFLAGS="$LDFLAGS"
+          kde_save_LIBS="$LIBS"
+     LDFLAGS="$LDFLAGS $all_libraries"
+     case $host_os in
+      aix*) LDFLAGS="-brtl $LDFLAGS"
+	test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
+	;;
+     esac
+     as_ac_Lib=`echo "ac_cv_lib_$PTHREAD_LIBS''_pthread_create" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for pthread_create in -l$PTHREAD_LIBS" >&5
+echo $ECHO_N "checking for pthread_create in -l$PTHREAD_LIBS... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Lib+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lpthread  $LIBS"
+LIBS="-l$PTHREAD_LIBS  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -21051,259 +21070,187 @@
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
+  (eval $ac_link) 2>conftest.er1
   ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_cv_lib_pthread_pthread_create=yes
+  eval "$as_ac_Lib=yes"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_lib_pthread_pthread_create=no
+eval "$as_ac_Lib=no"
 fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5
-echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6
-if test $ac_cv_lib_pthread_pthread_create = yes; then
-  LIBPTHREAD="-lpthread"
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Lib'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
+if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+  LIBPTHREAD="$PTHREAD_LIBS_save"
 fi
 
+     LDFLAGS="$kde_save_LDFLAGS"
+     LIBS="$kde_save_LIBS"
 
+      PTHREAD_LIBS="$PTHREAD_LIBS_save"
+    fi
+  fi
 
-
-    # Check whether --enable-kernel-threads or --disable-kernel-threads was given.
-if test "${enable_kernel_threads+set}" = set; then
-  enableval="$enable_kernel_threads"
-  kde_use_kernthreads=$enableval
-else
-  kde_use_kernthreads=no
-fi;
-
-    if test "$kde_use_kernthreads" = "yes"; then
-      ac_save_CXXFLAGS="$CXXFLAGS"
-      ac_save_CFLAGS="$CFLAGS"
-      CXXFLAGS="-I/usr/local/include/pthread/linuxthreads $CXXFLAGS"
-      CFLAGS="-I/usr/local/include/pthread/linuxthreads $CFLAGS"
-
-for ac_header in pthread/linuxthreads/pthread.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  if test -z "$LIBPTHREAD"; then
+    echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
+echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6
+if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 else
-  # Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lpthread  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char pthread_create ();
+int
+main ()
+{
+pthread_create ();
+  ;
+  return 0;
+}
 _ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
   ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_header_compiler=no
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
-
-# Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  ac_header_preproc=yes
+  (exit $ac_status); }; }; then
+  ac_cv_lib_pthread_pthread_create=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-  ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc in
-  yes:no )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    (
-      cat <<\_ASBOX
-## ------------------------------------ ##
-## Report this to bug-autoconf@gnu.org. ##
-## ------------------------------------ ##
-_ASBOX
-    ) |
-      sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-  no:yes )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    (
-      cat <<\_ASBOX
-## ------------------------------------ ##
-## Report this to bug-autoconf@gnu.org. ##
-## ------------------------------------ ##
-_ASBOX
-    ) |
-      sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  eval "$as_ac_Header=$ac_header_preproc"
+ac_cv_lib_pthread_pthread_create=no
 fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
+echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5
+echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6
+if test $ac_cv_lib_pthread_pthread_create = yes; then
+  LIBPTHREAD="-lpthread"
 fi
 
-done
+  fi
 
-      CXXFLAGS="$ac_save_CXXFLAGS"
-      CFLAGS="$ac_save_CFLAGS"
-      if test "$ac_cv_header_pthread_linuxthreads_pthread_h" = "no"; then
-        kde_use_kernthreads=no
-      else
-                echo "$as_me:$LINENO: checking for pthread_join in -llthread" >&5
-echo $ECHO_N "checking for pthread_join in -llthread... $ECHO_C" >&6
-if test "${ac_cv_lib_lthread_pthread_join+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-llthread  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
+    if test -z "$LIBPTHREAD" ; then
+    echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
+echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6
+    kde_safe_libs=$LIBS
+    LIBS="$LIBS -lpthread"
+    cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char pthread_join ();
+#include <pthread.h>
 int
 main ()
 {
-pthread_join ();
+(void)pthread_create(0,0,0,0);
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
+  (eval $ac_link) 2>conftest.er1
   ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_cv_lib_lthread_pthread_join=yes
+
+        echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+        LIBPTHREAD="-lpthread"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_lib_lthread_pthread_join=no
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_lthread_pthread_join" >&5
-echo "${ECHO_T}$ac_cv_lib_lthread_pthread_join" >&6
-if test $ac_cv_lib_lthread_pthread_join = yes; then
-  LIBPTHREAD="-llthread -llgcc_r"
+
+	echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
-         if test "x$LIBPTHREAD" = "x"; then
-          kde_use_kernthreads=no
-        else
-          USE_THREADS="-D_THREAD_SAFE -I/usr/local/include/pthread/linuxthreads"
-        fi
-      fi
-    else
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+    LIBS=$kde_safe_libs
+  fi
+
+    if test "x$LIBPTHREAD" = "xPTHREAD" ; then
+    LIBPTHREAD=""
+  fi
+  
+  
+  
+  
       USE_THREADS=""
       if test -z "$LIBPTHREAD"; then
 
@@ -21385,7 +21332,7 @@
 fi
 
       fi
-    fi
+    
 
 
 

Lines 13-17 Link Here

(-)ftp/kpum/pkg-plist (-1 / +1 lines)
13	share/icons/locolor/22x22/apps/kpum.png	13	share/icons/locolor/22x22/apps/kpum.png
14	share/icons/locolor/32x32/apps/kpum.png	14	share/icons/locolor/32x32/apps/kpum.png
15	share/locale/de/LC_MESSAGES/kpum.mo	15	share/locale/de/LC_MESSAGES/kpum.mo
16	@dirrm share/apps/kpum
17	@dirrm share/doc/HTML/en/kpum	16	@dirrm share/doc/HTML/en/kpum
		17	@dirrm share/apps/kpum

Return to bug 88559

Lines 7-14 Link Here

(-)ftp/kpum/Makefile (-3 / +7 lines)
7	#	7	#
8		8
9	PORTNAME= kpum	9	PORTNAME= kpum
10	PORTVERSION= 0.5.2.1	10	PORTVERSION= 0.5.3.1
11	PORTREVISION= 3
12	CATEGORIES= ftp	11	CATEGORIES= ftp
13	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
14	MASTER_SITE_SUBDIR= ${PORTNAME}	13	MASTER_SITE_SUBDIR= ${PORTNAME}
Lines 16-23 Link Here
16	MAINTAINER= ports@FreeBSD.org	15	MAINTAINER= ports@FreeBSD.org
17	COMMENT= KDE pureftpd user manager	16	COMMENT= KDE pureftpd user manager
18		17
		18	EXTRACT_AFTER_ARGS= \| ${TAR} --no-same-permission -xf - \|\| ${TRUE}
		19
		20	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:R}
		21
		22	USE_BZIP2= yes
19	USE_KDELIBS_VER= 3	23	USE_KDELIBS_VER= 3
20	GNU_CONFIGURE= yes
21	USE_GMAKE= yes	24	USE_GMAKE= yes
		25	GNU_CONFIGURE= yes
22		26
23	.include <bsd.port.mk>	27	.include <bsd.port.mk>

Lines 1-419 Link Here

(-)ftp/kpum/files/patch-configure (-419 lines)
1	--- configure.orig Thu Nov 11 21:01:00 2004
2	+++ configure Thu Nov 11 21:02:48 2004
3	@@ -21019,15 +21019,34 @@
4
5
6
7	-echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
8	-echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6
9	-if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
10	+ LIBPTHREAD=""
11	+
12	+ if test -n "$PTHREAD_LIBS"; then
13	+ if test "x$PTHREAD_LIBS" = "x-pthread" ; then
14	+ LIBPTHREAD="PTHREAD"
15	+ else
16	+ PTHREAD_LIBS_save="$PTHREAD_LIBS"
17	+ PTHREAD_LIBS=`echo "$PTHREAD_LIBS_save" \| sed -e 's,^-l,,g'`
18	+ echo "$as_me:$LINENO: checking for pthread_create in $PTHREAD_LIBS" >&5
19	+echo $ECHO_N "checking for pthread_create in $PTHREAD_LIBS... $ECHO_C" >&6
20	+
21	+ kde_save_LDFLAGS="$LDFLAGS"
22	+ kde_save_LIBS="$LIBS"
23	+ LDFLAGS="$LDFLAGS $all_libraries"
24	+ case $host_os in
25	+ aix*) LDFLAGS="-brtl $LDFLAGS"
26	+ test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
27	+ ;;
28	+ esac
29	+ as_ac_Lib=`echo "ac_cv_lib_$PTHREAD_LIBS''_pthread_create" \| $as_tr_sh`
30	+echo "$as_me:$LINENO: checking for pthread_create in -l$PTHREAD_LIBS" >&5
31	+echo $ECHO_N "checking for pthread_create in -l$PTHREAD_LIBS... $ECHO_C" >&6
32	+if eval "test \"\${$as_ac_Lib+set}\" = set"; then
33	echo $ECHO_N "(cached) $ECHO_C" >&6
34	else
35	ac_check_lib_save_LIBS=$LIBS
36	-LIBS="-lpthread $LIBS"
37	+LIBS="-l$PTHREAD_LIBS $LIBS"
38	cat >conftest.$ac_ext <<_ACEOF
39	-#line $LINENO "configure"
40	/* confdefs.h. */
41	_ACEOF
42	cat confdefs.h >>conftest.$ac_ext
43	@@ -21051,259 +21070,187 @@
44	_ACEOF
45	rm -f conftest.$ac_objext conftest$ac_exeext
46	if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
47	- (eval $ac_link) 2>&5
48	+ (eval $ac_link) 2>conftest.er1
49	ac_status=$?
50	+ grep -v '^ *+' conftest.er1 >conftest.err
51	+ rm -f conftest.er1
52	+ cat conftest.err >&5
53	echo "$as_me:$LINENO: \$? = $ac_status" >&5
54	(exit $ac_status); } &&
55	- { ac_try='test -s conftest$ac_exeext'
56	+ { ac_try='test -z "$ac_c_werror_flag"
57	+ \|\| test ! -s conftest.err'
58	+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
59	+ (eval $ac_try) 2>&5
60	+ ac_status=$?
61	+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
62	+ (exit $ac_status); }; } &&
63	+ { ac_try='test -s conftest$ac_exeext'
64	{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
65	(eval $ac_try) 2>&5
66	ac_status=$?
67	echo "$as_me:$LINENO: \$? = $ac_status" >&5
68	(exit $ac_status); }; }; then
69	- ac_cv_lib_pthread_pthread_create=yes
70	+ eval "$as_ac_Lib=yes"
71	else
72	echo "$as_me: failed program was:" >&5
73	sed 's/^/\| /' conftest.$ac_ext >&5
74
75	-ac_cv_lib_pthread_pthread_create=no
76	+eval "$as_ac_Lib=no"
77	fi
78	-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
79	+rm -f conftest.err conftest.$ac_objext \
80	+ conftest$ac_exeext conftest.$ac_ext
81	LIBS=$ac_check_lib_save_LIBS
82	fi
83	-echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5
84	-echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6
85	-if test $ac_cv_lib_pthread_pthread_create = yes; then
86	- LIBPTHREAD="-lpthread"
87	+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Lib'}'`" >&5
88	+echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
89	+if test `eval echo '${'$as_ac_Lib'}'` = yes; then
90	+ LIBPTHREAD="$PTHREAD_LIBS_save"
91	fi
92
93	+ LDFLAGS="$kde_save_LDFLAGS"
94	+ LIBS="$kde_save_LIBS"
95
96	+ PTHREAD_LIBS="$PTHREAD_LIBS_save"
97	+ fi
98	+ fi
99
100	-
101	- # Check whether --enable-kernel-threads or --disable-kernel-threads was given.
102	-if test "${enable_kernel_threads+set}" = set; then
103	- enableval="$enable_kernel_threads"
104	- kde_use_kernthreads=$enableval
105	-else
106	- kde_use_kernthreads=no
107	-fi;
108	-
109	- if test "$kde_use_kernthreads" = "yes"; then
110	- ac_save_CXXFLAGS="$CXXFLAGS"
111	- ac_save_CFLAGS="$CFLAGS"
112	- CXXFLAGS="-I/usr/local/include/pthread/linuxthreads $CXXFLAGS"
113	- CFLAGS="-I/usr/local/include/pthread/linuxthreads $CFLAGS"
114	-
115	-for ac_header in pthread/linuxthreads/pthread.h
116	-do
117	-as_ac_Header=`echo "ac_cv_header_$ac_header" \| $as_tr_sh`
118	-if eval "test \"\${$as_ac_Header+set}\" = set"; then
119	- echo "$as_me:$LINENO: checking for $ac_header" >&5
120	-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
121	-if eval "test \"\${$as_ac_Header+set}\" = set"; then
122	+ if test -z "$LIBPTHREAD"; then
123	+ echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
124	+echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6
125	+if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
126	echo $ECHO_N "(cached) $ECHO_C" >&6
127	-fi
128	-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
129	-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
130	else
131	- # Is the header compilable?
132	-echo "$as_me:$LINENO: checking $ac_header usability" >&5
133	-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
134	+ ac_check_lib_save_LIBS=$LIBS
135	+LIBS="-lpthread $LIBS"
136	cat >conftest.$ac_ext <<_ACEOF
137	-#line $LINENO "configure"
138	/* confdefs.h. */
139	_ACEOF
140	cat confdefs.h >>conftest.$ac_ext
141	cat >>conftest.$ac_ext <<_ACEOF
142	/* end confdefs.h. */
143	-$ac_includes_default
144	-#include <$ac_header>
145	+
146	+/* Override any gcc2 internal prototype to avoid an error. */
147	+#ifdef __cplusplus
148	+extern "C"
149	+#endif
150	+/* We use char because int might match the return type of a gcc2
151	+ builtin and then its argument prototype would still apply. */
152	+char pthread_create ();
153	+int
154	+main ()
155	+{
156	+pthread_create ();
157	+ ;
158	+ return 0;
159	+}
160	_ACEOF
161	-rm -f conftest.$ac_objext
162	-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
163	- (eval $ac_compile) 2>&5
164	+rm -f conftest.$ac_objext conftest$ac_exeext
165	+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
166	+ (eval $ac_link) 2>conftest.er1
167	ac_status=$?
168	+ grep -v '^ *+' conftest.er1 >conftest.err
169	+ rm -f conftest.er1
170	+ cat conftest.err >&5
171	echo "$as_me:$LINENO: \$? = $ac_status" >&5
172	(exit $ac_status); } &&
173	- { ac_try='test -s conftest.$ac_objext'
174	+ { ac_try='test -z "$ac_c_werror_flag"
175	+ \|\| test ! -s conftest.err'
176	{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
177	(eval $ac_try) 2>&5
178	ac_status=$?
179	echo "$as_me:$LINENO: \$? = $ac_status" >&5
180	- (exit $ac_status); }; }; then
181	- ac_header_compiler=yes
182	-else
183	- echo "$as_me: failed program was:" >&5
184	-sed 's/^/\| /' conftest.$ac_ext >&5
185	-
186	-ac_header_compiler=no
187	-fi
188	-rm -f conftest.$ac_objext conftest.$ac_ext
189	-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
190	-echo "${ECHO_T}$ac_header_compiler" >&6
191	-
192	-# Is the header present?
193	-echo "$as_me:$LINENO: checking $ac_header presence" >&5
194	-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
195	-cat >conftest.$ac_ext <<_ACEOF
196	-#line $LINENO "configure"
197	-/* confdefs.h. */
198	-_ACEOF
199	-cat confdefs.h >>conftest.$ac_ext
200	-cat >>conftest.$ac_ext <<_ACEOF
201	-/* end confdefs.h. */
202	-#include <$ac_header>
203	-_ACEOF
204	-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
205	- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
206	+ (exit $ac_status); }; } &&
207	+ { ac_try='test -s conftest$ac_exeext'
208	+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
209	+ (eval $ac_try) 2>&5
210	ac_status=$?
211	- grep -v '^ *+' conftest.er1 >conftest.err
212	- rm -f conftest.er1
213	- cat conftest.err >&5
214	echo "$as_me:$LINENO: \$? = $ac_status" >&5
215	- (exit $ac_status); } >/dev/null; then
216	- if test -s conftest.err; then
217	- ac_cpp_err=$ac_c_preproc_warn_flag
218	- else
219	- ac_cpp_err=
220	- fi
221	-else
222	- ac_cpp_err=yes
223	-fi
224	-if test -z "$ac_cpp_err"; then
225	- ac_header_preproc=yes
226	+ (exit $ac_status); }; }; then
227	+ ac_cv_lib_pthread_pthread_create=yes
228	else
229	echo "$as_me: failed program was:" >&5
230	sed 's/^/\| /' conftest.$ac_ext >&5
231
232	- ac_header_preproc=no
233	-fi
234	-rm -f conftest.err conftest.$ac_ext
235	-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
236	-echo "${ECHO_T}$ac_header_preproc" >&6
237	-
238	-# So? What about this header?
239	-case $ac_header_compiler:$ac_header_preproc in
240	- yes:no )
241	- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
242	-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
243	- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
244	-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
245	- (
246	- cat <<\_ASBOX
247	-## ------------------------------------ ##
248	-## Report this to bug-autoconf@gnu.org. ##
249	-## ------------------------------------ ##
250	-_ASBOX
251	- ) \|
252	- sed "s/^/$as_me: WARNING: /" >&2
253	- ;;
254	- no:yes )
255	- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
256	-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
257	- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
258	-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
259	- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
260	-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
261	- (
262	- cat <<\_ASBOX
263	-## ------------------------------------ ##
264	-## Report this to bug-autoconf@gnu.org. ##
265	-## ------------------------------------ ##
266	-_ASBOX
267	- ) \|
268	- sed "s/^/$as_me: WARNING: /" >&2
269	- ;;
270	-esac
271	-echo "$as_me:$LINENO: checking for $ac_header" >&5
272	-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
273	-if eval "test \"\${$as_ac_Header+set}\" = set"; then
274	- echo $ECHO_N "(cached) $ECHO_C" >&6
275	-else
276	- eval "$as_ac_Header=$ac_header_preproc"
277	+ac_cv_lib_pthread_pthread_create=no
278	fi
279	-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
280	-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
281	-
282	+rm -f conftest.err conftest.$ac_objext \
283	+ conftest$ac_exeext conftest.$ac_ext
284	+LIBS=$ac_check_lib_save_LIBS
285	fi
286	-if test `eval echo '${'$as_ac_Header'}'` = yes; then
287	- cat >>confdefs.h <<_ACEOF
288	-#define `echo "HAVE_$ac_header" \| $as_tr_cpp` 1
289	-_ACEOF
290	-
291	+echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5
292	+echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6
293	+if test $ac_cv_lib_pthread_pthread_create = yes; then
294	+ LIBPTHREAD="-lpthread"
295	fi
296
297	-done
298	+ fi
299
300	- CXXFLAGS="$ac_save_CXXFLAGS"
301	- CFLAGS="$ac_save_CFLAGS"
302	- if test "$ac_cv_header_pthread_linuxthreads_pthread_h" = "no"; then
303	- kde_use_kernthreads=no
304	- else
305	- echo "$as_me:$LINENO: checking for pthread_join in -llthread" >&5
306	-echo $ECHO_N "checking for pthread_join in -llthread... $ECHO_C" >&6
307	-if test "${ac_cv_lib_lthread_pthread_join+set}" = set; then
308	- echo $ECHO_N "(cached) $ECHO_C" >&6
309	-else
310	- ac_check_lib_save_LIBS=$LIBS
311	-LIBS="-llthread $LIBS"
312	-cat >conftest.$ac_ext <<_ACEOF
313	-#line $LINENO "configure"
314	+ if test -z "$LIBPTHREAD" ; then
315	+ echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
316	+echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6
317	+ kde_safe_libs=$LIBS
318	+ LIBS="$LIBS -lpthread"
319	+ cat >conftest.$ac_ext <<_ACEOF
320	/* confdefs.h. */
321	_ACEOF
322	cat confdefs.h >>conftest.$ac_ext
323	cat >>conftest.$ac_ext <<_ACEOF
324	/* end confdefs.h. */
325	-
326	-/* Override any gcc2 internal prototype to avoid an error. */
327	-#ifdef __cplusplus
328	-extern "C"
329	-#endif
330	-/* We use char because int might match the return type of a gcc2
331	- builtin and then its argument prototype would still apply. */
332	-char pthread_join ();
333	+#include <pthread.h>
334	int
335	main ()
336	{
337	-pthread_join ();
338	+(void)pthread_create(0,0,0,0);
339	;
340	return 0;
341	}
342	_ACEOF
343	rm -f conftest.$ac_objext conftest$ac_exeext
344	if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
345	- (eval $ac_link) 2>&5
346	+ (eval $ac_link) 2>conftest.er1
347	ac_status=$?
348	+ grep -v '^ *+' conftest.er1 >conftest.err
349	+ rm -f conftest.er1
350	+ cat conftest.err >&5
351	echo "$as_me:$LINENO: \$? = $ac_status" >&5
352	(exit $ac_status); } &&
353	- { ac_try='test -s conftest$ac_exeext'
354	+ { ac_try='test -z "$ac_c_werror_flag"
355	+ \|\| test ! -s conftest.err'
356	+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
357	+ (eval $ac_try) 2>&5
358	+ ac_status=$?
359	+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
360	+ (exit $ac_status); }; } &&
361	+ { ac_try='test -s conftest$ac_exeext'
362	{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
363	(eval $ac_try) 2>&5
364	ac_status=$?
365	echo "$as_me:$LINENO: \$? = $ac_status" >&5
366	(exit $ac_status); }; }; then
367	- ac_cv_lib_lthread_pthread_join=yes
368	+
369	+ echo "$as_me:$LINENO: result: yes" >&5
370	+echo "${ECHO_T}yes" >&6
371	+ LIBPTHREAD="-lpthread"
372	else
373	echo "$as_me: failed program was:" >&5
374	sed 's/^/\| /' conftest.$ac_ext >&5
375
376	-ac_cv_lib_lthread_pthread_join=no
377	-fi
378	-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
379	-LIBS=$ac_check_lib_save_LIBS
380	-fi
381	-echo "$as_me:$LINENO: result: $ac_cv_lib_lthread_pthread_join" >&5
382	-echo "${ECHO_T}$ac_cv_lib_lthread_pthread_join" >&6
383	-if test $ac_cv_lib_lthread_pthread_join = yes; then
384	- LIBPTHREAD="-llthread -llgcc_r"
385	+
386	+ echo "$as_me:$LINENO: result: no" >&5
387	+echo "${ECHO_T}no" >&6
388	fi
389	- if test "x$LIBPTHREAD" = "x"; then
390	- kde_use_kernthreads=no
391	- else
392	- USE_THREADS="-D_THREAD_SAFE -I/usr/local/include/pthread/linuxthreads"
393	- fi
394	- fi
395	- else
396	+rm -f conftest.err conftest.$ac_objext \
397	+ conftest$ac_exeext conftest.$ac_ext
398	+ LIBS=$kde_safe_libs
399	+ fi
400	+
401	+ if test "x$LIBPTHREAD" = "xPTHREAD" ; then
402	+ LIBPTHREAD=""
403	+ fi
404	+
405	+
406	+
407	+
408	USE_THREADS=""
409	if test -z "$LIBPTHREAD"; then
410
411	@@ -21385,7 +21332,7 @@
412	fi
413
414	fi
415	- fi
416	+
417
418
419