Attachment #50916 for bug #77482




#

PORTNAME=	phase
PORTVERSION=	0.7
PORTREVISION=	1
CATEGORIES=	x11-themes kde
MASTER_SITES=	http://www.usermode.org/code/

MAINTAINER=	david@usermode.org
COMMENT=	An original Qt/KDE widget style

USE_KDELIBS_VER=3
USE_BZIP2=	yes
GNU_CONFIGURE=	yes
USE_GMAKE=	yes
INSTALLS_SHLIB=	yes
USE_LIBTOOL_VER=15
LDCONFIG_DIRS+=	%%PREFIX%%/lib/kde3

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)phase/distinfo (-2 / +2 lines)
1	MD5 (phase-0.6.tar.gz) = ab23b2970ca6479a483a6d24c6880acc	1	MD5 (phase-0.7.tar.bz2) = 9a0c054802fdf0c1c8c7ca8ed19ba8af
2	SIZE (phase-0.6.tar.gz) = 474823	2	SIZE (phase-0.7.tar.bz2) = 370677




--- configure.orig	Sun Oct 31 23:08:13 2004
+++ configure	Mon Nov  8 23:57:04 2004
@@ -19945,16 +19945,39 @@
 fi
 
 
-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 
+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" | 
+echo "$as_me:$LINENO: checking for pthread_create in -l$PTHREAD_LIBS" >&5
+echo $ECHO_N "checking for pthread_create in -l$PTHREAD_LIBS... 
+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"
-#include "confdefs.h"
+/* 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
@@ -19963,12 +19986,6 @@
 /* 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 ();
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
 int
 main ()
 {
@@ -19979,231 +19996,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
-cat conftest.$ac_ext >&5
-ac_cv_lib_pthread_pthread_create=no
+sed 's/^/| /' conftest.$ac_ext >&5
+
+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"
-#include "confdefs.h"
-$ac_includes_default
-#include <$ac_header>
+/* confdefs.h.  */
 _ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
+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_create ();
+int
+main ()
+{
+pthread_create ();
+  ;
+  return 0;
+}
+_ACEOF
+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
-cat 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"
-#include "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=$?
-  egrep -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
-  cat 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 
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected 
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the 
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's 
-  no:yes )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be 
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing 
-echo "$as_me: WARNING: $ac_header: check for missing prerequisite 
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the 
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's 
-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"
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+sed 's/^/| /' conftest.$ac_ext >&5
 
+ac_cv_lib_pthread_pthread_create=no
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
+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"
 fi
 
-done
-
-      CXXFLAGS="$ac_save_CXXFLAGS"
-      CFLAGS="$ac_save_CFLAGS"
-      if test "$ac_cv_header_pthread_linuxthreads_pthread_h" = "no"; 
-        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"
-#include "confdefs.h"
+  fi
 
-/* 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 ();
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
+    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.  */
+#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
-cat 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"
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+	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
 
@@ -20286,7 +20259,6 @@
 fi
 
       fi
-    fi
 
     case $host_os in
  	solaris*)

Lines 3-11 Link Here

(-)phase/pkg-plist (-6 lines)
3	lib/kde3/plugins/styles/phasestyle.la	3	lib/kde3/plugins/styles/phasestyle.la
4	lib/kde3/plugins/styles/phasestyle.so	4	lib/kde3/plugins/styles/phasestyle.so
5	share/apps/kstyle/themes/phase.themerc	5	share/apps/kstyle/themes/phase.themerc
6	@dirrm share/apps/kstyle/themes
7	@dirrm share/apps/kstyle
8	@dirrm share/apps
9	@dirrm lib/kde3/plugins/styles
10	@dirrm lib/kde3/plugins
11	@dirrm lib/kde3

Return to bug 77482

Lines 6-22 Link Here

(-)phase/Makefile (-3 / +5 lines)
6	#	6	#
7		7
8	PORTNAME= phase	8	PORTNAME= phase
9	PORTVERSION= 0.6	9	PORTVERSION= 0.7
10	PORTREVISION= 1
11	CATEGORIES= x11-themes kde	10	CATEGORIES= x11-themes kde
12	MASTER_SITES= http://www.usermode.org/code/	11	MASTER_SITES= http://www.usermode.org/code/
13		12
14	MAINTAINER= david@usermode.org	13	MAINTAINER= david@usermode.org
15	COMMENT= An original Qt/KDE widget style	14	COMMENT= An original Qt/KDE widget style
16		15
17	USE_KDEBASE_VER=3	16	USE_KDELIBS_VER=3
		17	USE_BZIP2= yes
18	GNU_CONFIGURE= yes	18	GNU_CONFIGURE= yes
19	USE_GMAKE= yes	19	USE_GMAKE= yes
20	INSTALLS_SHLIB= yes	20	INSTALLS_SHLIB= yes
		21	USE_LIBTOOL_VER=15
		22	LDCONFIG_DIRS+= %%PREFIX%%/lib/kde3
21		23
22	.include <bsd.port.mk>	24	.include <bsd.port.mk>

Lines 1-425 Link Here

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