Module: wine Branch: master Commit: c891f6bca74c4de74fba91a9a17ed9a43326a771 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c891f6bca74c4de74fba91a9a1...
Author: Alexandre Julliard julliard@winehq.org Date: Wed Feb 11 20:41:50 2009 +0100
configure: Print an error and fail if we don't have libpthread.
---
configure | 169 +++++++++++++++++++++++++++++++++------------------------ configure.ac | 14 ++++- 2 files changed, 110 insertions(+), 73 deletions(-)
diff --git a/configure b/configure index 691aa0d..b4fd46f 100755 --- a/configure +++ b/configure @@ -690,6 +690,7 @@ X_LIBS X_PRE_LIBS X_CFLAGS XMKMF +LIBPTHREAD CROSSTEST CROSSWINDRES CROSSCC @@ -715,7 +716,6 @@ DLLEXT CPP OPENGL_LIBS XLIB -LIBPTHREAD PRELINK ICOTOOL RSVG @@ -840,6 +840,7 @@ with_opengl with_openssl with_oss with_png +with_pthread with_sane with_xcomposite with_xcursor @@ -1529,6 +1530,7 @@ Optional Packages: --without-openssl do not use OpenSSL --without-oss do not use the OSS sound support --without-png do not use PNG + --without-pthread do not use the pthread library --without-sane do not use SANE (scanner support) --without-xcomposite do not use the Xcomposite extension --without-xcursor do not use the Xcursor extension @@ -2198,6 +2200,12 @@ if test "${with_png+set}" = set; then fi
+# Check whether --with-pthread was given. +if test "${with_pthread+set}" = set; then + withval=$with_pthread; if test "x$withval" = "xno"; then ac_cv_header_pthread_h=no; fi +fi + + # Check whether --with-sane was given. if test "${with_sane+set}" = set; then withval=$with_sane; @@ -5445,76 +5453,6 @@ _ACEOF
fi
-{ $as_echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5 -$as_echo_n "checking for pthread_create in -lpthread... " >&6; } -if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lpthread $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char pthread_create (); -int -main () -{ -return pthread_create (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *"* | *`* | *\*) ac_try_echo=$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo=""$as_me:$LINENO: $ac_try_echo"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: $? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - ac_cv_lib_pthread_pthread_create=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_pthread_pthread_create=no -fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5 -$as_echo "$ac_cv_lib_pthread_pthread_create" >&6; } -if test "x$ac_cv_lib_pthread_pthread_create" = x""yes; then - LIBPTHREAD="-lpthread" - -fi -
XLIB=""
@@ -7570,6 +7508,7 @@ fi enable_loader=${enable_loader:-no} enable_server=${enable_server:-no} with_x=${with_x:-no} + with_pthread=${with_pthread:-no} ;; darwin*|macosx*) DLLEXT=".so" @@ -8618,6 +8557,94 @@ test -n "$MINGWAR" || MINGWAR="false" fi
+if test "$ac_cv_header_pthread_h" = "yes" +then + { $as_echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5 +$as_echo_n "checking for pthread_create in -lpthread... " >&6; } +if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lpthread $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char pthread_create (); +int +main () +{ +return pthread_create (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *"* | *`* | *\*) ac_try_echo=$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo=""$as_me:$LINENO: $ac_try_echo"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: $? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + ac_cv_lib_pthread_pthread_create=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_pthread_pthread_create=no +fi + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5 +$as_echo "$ac_cv_lib_pthread_pthread_create" >&6; } +if test "x$ac_cv_lib_pthread_pthread_create" = x""yes; then + LIBPTHREAD="-lpthread" + +fi + +fi +if test "x$LIBPTHREAD" = "x"; then + case "x$with_pthread" in + xno) ;; + *) { { $as_echo "$as_me:$LINENO: error: pthread ${notice_platform}development files not found. +Wine cannot support threads without libpthread. +Use the --without-pthread option if you really want this." >&5 +$as_echo "$as_me: error: pthread ${notice_platform}development files not found. +Wine cannot support threads without libpthread. +Use the --without-pthread option if you really want this." >&2;} + { (exit 1); exit 1; }; } ;; +esac +fi + + + { $as_echo "$as_me:$LINENO: checking for X" >&5 $as_echo_n "checking for X... " >&6; }
diff --git a/configure.ac b/configure.ac index 074ad97..34650c8 100644 --- a/configure.ac +++ b/configure.ac @@ -56,6 +56,8 @@ AC_ARG_WITH(oss, AS_HELP_STRING([--without-oss],[do not use the OSS sound [if test "x$withval" = "xno"; then ac_cv_header_soundcard_h=no; ac_cv_header_sys_soundcard_h=no; ac_cv_header_machine_soundcard_h=no; fi]) AC_ARG_WITH(png, AS_HELP_STRING([--without-png],[do not use PNG]), [if test "x$withval" = "xno"; then ac_cv_header_png_h=no; fi]) +AC_ARG_WITH(pthread, AS_HELP_STRING([--without-pthread],[do not use the pthread library]), + [if test "x$withval" = "xno"; then ac_cv_header_pthread_h=no; fi]) AC_ARG_WITH(sane, AS_HELP_STRING([--without-sane],[do not use SANE (scanner support)])) AC_ARG_WITH(xcomposite,AS_HELP_STRING([--without-xcomposite],[do not use the Xcomposite extension]), [if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_Xcomposite_h=no; fi]) @@ -240,8 +242,6 @@ dnl Check for -li386 for NetBSD and OpenBSD AC_CHECK_LIB(i386,i386_set_ldt) dnl Check for -lossaudio for NetBSD AC_CHECK_LIB(ossaudio,_oss_ioctl) -dnl Check for -lpthread -AC_CHECK_LIB(pthread,pthread_create,AC_SUBST(LIBPTHREAD,"-lpthread"))
AC_SUBST(XLIB,"") AC_SUBST(OPENGL_LIBS,"") @@ -538,6 +538,7 @@ case $host_os in enable_server=${enable_server:-no} dnl Disable dependencies that are not useful on Windows with_x=${with_x:-no} + with_pthread=${with_pthread:-no} ;; darwin*|macosx*) DLLEXT=".so" @@ -668,6 +669,15 @@ then fi fi
+dnl **** Check for pthread **** + +if test "$ac_cv_header_pthread_h" = "yes" +then + AC_CHECK_LIB(pthread,pthread_create,[AC_SUBST(LIBPTHREAD,"-lpthread")]) +fi +WINE_ERROR_WITH(pthread,[test "x$LIBPTHREAD" = "x"],[pthread ${notice_platform}development files not found. +Wine cannot support threads without libpthread.]) + dnl **** Check for X11 ****
AC_PATH_XTRA