diff options
Diffstat (limited to 'games/ktritoc/files')
-rw-r--r-- | games/ktritoc/files/patch-configure | 355 |
1 files changed, 355 insertions, 0 deletions
diff --git a/games/ktritoc/files/patch-configure b/games/ktritoc/files/patch-configure new file mode 100644 index 000000000000..124ba8568934 --- /dev/null +++ b/games/ktritoc/files/patch-configure @@ -0,0 +1,355 @@ +--- configure.orig Sun Jun 1 18:53:22 2003 ++++ configure Thu Nov 11 22:13:06 2004 +@@ -19384,16 +19384,39 @@ + kde_qt_dirs="$QTDIR /usr/lib/qt" + fi + +-echo "$as_me:19387: 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 19395 "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 +@@ -19411,109 +19434,65 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:19414: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 ++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ++ (eval $ac_link) 2>conftest.er1 + ac_status=$? +- echo "$as_me:19417: \$? = $ac_status" >&5 ++ 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' +- { (eval echo "$as_me:19420: \"$ac_try\"") >&5 ++ { 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:19423: \$? = $ac_status" >&5 ++ 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:19434: 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 + +- # 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` +-echo "$as_me:19457: 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 +- cat >conftest.$ac_ext <<_ACEOF +-#line 19463 "configure" +-#include "confdefs.h" +-#include <$ac_header> +-_ACEOF +-if { (eval echo "$as_me:19467: \"$ac_cpp conftest.$ac_ext\"") >&5 +- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +- ac_status=$? +- egrep -v '^ *\+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:19473: \$? = $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= ++ LDFLAGS="$kde_save_LDFLAGS" ++ LIBS="$kde_save_LIBS" ++ ++ PTHREAD_LIBS="$PTHREAD_LIBS_save" ++ fi + fi +-else +- ac_cpp_err=yes +-fi +-if test -z "$ac_cpp_err"; then +- eval "$as_ac_Header=yes" +-else +- echo "$as_me: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- eval "$as_ac_Header=no" +-fi +-rm -f conftest.err conftest.$ac_ext +-fi +-echo "$as_me:19492: result: `eval echo '${'$as_ac_Header'}'`" >&5 +-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +-if test `eval echo '${'$as_ac_Header'}'` = yes; then +- cat >>confdefs.h <<EOF +-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +-EOF +- +-fi +-done +- +- 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:19507: 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 ++ ++ 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 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-llthread $LIBS" ++LIBS="-lpthread $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 19515 "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 +@@ -19521,50 +19500,118 @@ + #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 (); ++char pthread_create (); + int + main () + { +-pthread_join (); ++pthread_create (); + ; + return 0; + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:19534: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 ++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ++ (eval $ac_link) 2>conftest.er1 + ac_status=$? +- echo "$as_me:19537: \$? = $ac_status" >&5 ++ 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' +- { (eval echo "$as_me:19540: \"$ac_try\"") >&5 ++ { 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:19543: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +- ac_cv_lib_lthread_pthread_join=yes ++ ac_cv_lib_pthread_pthread_create=yes + else + echo "$as_me: failed program was:" >&5 +-cat conftest.$ac_ext >&5 +-ac_cv_lib_lthread_pthread_join=no ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ac_cv_lib_pthread_pthread_create=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:19554: 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" +-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 +- USE_THREADS="" +- if test -z "$LIBPTHREAD"; then ++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 ++ ++ fi ++ ++ 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 () ++{ ++(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>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 -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 ++ ++ 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 ++ ++ ++ echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6 ++fi ++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 + + echo "$as_me:19569: checking whether $CXX supports -pthread" >&5 + echo $ECHO_N "checking whether $CXX supports -pthread... $ECHO_C" >&6 +@@ -19634,8 +19681,7 @@ + + fi + +- fi +- fi ++ + + case $host_os in + solaris*) |