Module: wine Branch: master Commit: 19a988a25caa818e73c1498e145c15d815b2c901 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19a988a25caa818e73c1498e14...
Author: Alexandre Julliard julliard@winehq.org Date: Mon Jul 9 22:42:28 2007 +0200
configure: Make the libXcursor soname check depend on the header check.
---
configure | 160 +++++++++++++++++++++++---------------------- configure.ac | 7 ++- dlls/winex11.drv/mouse.c | 17 ++--- 3 files changed, 95 insertions(+), 89 deletions(-)
diff --git a/configure b/configure index 3a9a625..94908b1 100755 --- a/configure +++ b/configure @@ -9103,6 +9103,88 @@ fi
fi
+ if test "$ac_cv_header_X11_Xcursor_Xcursor_h" = "yes" + then + { echo "$as_me:$LINENO: checking for -lXcursor" >&5 +echo $ECHO_N "checking for -lXcursor... $ECHO_C" >&6; } +if test "${ac_cv_lib_soname_Xcursor+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_soname_save_LIBS=$LIBS +LIBS="-lXcursor $X_LIBS -lXext -lX11 $X_EXTRA_LIBS $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 XcursorImageLoadCursor (); +int +main () +{ +return XcursorImageLoadCursor (); + ; + 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 "echo "$as_me:$LINENO: $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 + 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 && + $as_test_x conftest$ac_exeext; then + case "$LIBEXT" in + dll) ;; + dylib) ac_cv_lib_soname_Xcursor=`otool -L conftest$ac_exeext | grep "libXcursor\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*/(libXcursor.[0-9A-Za-z.]*dylib).*$/\1/"';2,$d'` ;; + *) ac_cv_lib_soname_Xcursor=`$ac_cv_path_LDD conftest$ac_exeext | grep "libXcursor\.$LIBEXT" | sed -e "s/^.*(libXcursor.$LIBEXT[^ ]*).*$/\1/"';2,$d'` ;; + esac +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_soname_save_LIBS +fi +if test "x$ac_cv_lib_soname_Xcursor" = "x"; then + { echo "$as_me:$LINENO: result: not found" >&5 +echo "${ECHO_T}not found" >&6; } + +else + { echo "$as_me:$LINENO: result: $ac_cv_lib_soname_Xcursor" >&5 +echo "${ECHO_T}$ac_cv_lib_soname_Xcursor" >&6; } + +cat >>confdefs.h <<_ACEOF +#define SONAME_LIBXCURSOR "$ac_cv_lib_soname_Xcursor" +_ACEOF + + +fi + + fi + if test "$ac_cv_header_X11_extensions_XShm_h" = "yes" then { echo "$as_me:$LINENO: checking for XShmQueryExtension in -lXext" >&5 @@ -15335,84 +15417,6 @@ _ACEOF
fi
-{ echo "$as_me:$LINENO: checking for -lXcursor" >&5 -echo $ECHO_N "checking for -lXcursor... $ECHO_C" >&6; } -if test "${ac_cv_lib_soname_Xcursor+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_soname_save_LIBS=$LIBS -LIBS="-lXcursor $X_LIBS -lX11 $X_EXTRA_LIBS $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 XcursorImageLoadCursor (); -int -main () -{ -return XcursorImageLoadCursor (); - ; - 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 "echo "$as_me:$LINENO: $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 - 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 && - $as_test_x conftest$ac_exeext; then - case "$LIBEXT" in - dll) ;; - dylib) ac_cv_lib_soname_Xcursor=`otool -L conftest$ac_exeext | grep "libXcursor\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*/(libXcursor.[0-9A-Za-z.]*dylib).*$/\1/"';2,$d'` ;; - *) ac_cv_lib_soname_Xcursor=`$ac_cv_path_LDD conftest$ac_exeext | grep "libXcursor\.$LIBEXT" | sed -e "s/^.*(libXcursor.$LIBEXT[^ ]*).*$/\1/"';2,$d'` ;; - esac -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_soname_save_LIBS -fi -if test "x$ac_cv_lib_soname_Xcursor" = "x"; then - { echo "$as_me:$LINENO: result: not found" >&5 -echo "${ECHO_T}not found" >&6; } - -else - { echo "$as_me:$LINENO: result: $ac_cv_lib_soname_Xcursor" >&5 -echo "${ECHO_T}$ac_cv_lib_soname_Xcursor" >&6; } - -cat >>confdefs.h <<_ACEOF -#define SONAME_LIBXCURSOR "$ac_cv_lib_soname_Xcursor" -_ACEOF - - -fi - { echo "$as_me:$LINENO: checking for -lfreetype" >&5 echo $ECHO_N "checking for -lfreetype... $ECHO_C" >&6; } if test "${ac_cv_lib_soname_freetype+set}" = set; then diff --git a/configure.ac b/configure.ac index 885bdcc..963adb1 100644 --- a/configure.ac +++ b/configure.ac @@ -508,6 +508,12 @@ then $X_LIBS -lXext -lX11 $X_EXTRA_LIBS) fi
+ dnl *** Check for X cursor + if test "$ac_cv_header_X11_Xcursor_Xcursor_h" = "yes" + then + WINE_CHECK_SONAME(Xcursor,XcursorImageLoadCursor,,,[$X_LIBS -lXext -lX11 $X_EXTRA_LIBS]) + fi + dnl *** Check for X Shm extension if test "$ac_cv_header_X11_extensions_XShm_h" = "yes" then @@ -1148,7 +1154,6 @@ AC_DEFINE_UNQUOTED(SONAME_EXT,[".$LIBEXT"],[Define to the file extension of shar WINE_CHECK_SONAME(X11,XCreateWindow,,,[$X_LIBS $X_EXTRA_LIBS]) WINE_CHECK_SONAME(Xext,XextCreateExtension,,,[$X_LIBS -lX11 $X_EXTRA_LIBS]) WINE_CHECK_SONAME(Xi,XOpenDevice,,,[$X_LIBS -lXext -lX11 $X_EXTRA_LIBS]) -WINE_CHECK_SONAME(Xcursor,XcursorImageLoadCursor,,,[$X_LIBS -lX11 $X_EXTRA_LIBS]) WINE_CHECK_SONAME(freetype,FT_Init_FreeType,,,[$X_LIBS])
diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index b3e43d6..6ece664 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -25,18 +25,15 @@ #include <X11/Xlib.h> #include <stdarg.h>
-#ifdef HAVE_X11_XCURSOR_XCURSOR_H +#ifdef SONAME_LIBXCURSOR # include <X11/Xcursor/Xcursor.h> -# ifndef SONAME_LIBXCURSOR -# define SONAME_LIBXCURSOR "libXcursor" SONAME_EXT -# endif static void *xcursor_handle; # define MAKE_FUNCPTR(f) static typeof(f) * p##f MAKE_FUNCPTR(XcursorImageCreate); MAKE_FUNCPTR(XcursorImageDestroy); MAKE_FUNCPTR(XcursorImageLoadCursor); # undef MAKE_FUNCPTR -#endif /* HAVE_X11_XCURSOR_XCURSOR_H */ +#endif /* SONAME_LIBXCURSOR */
#define NONAMELESSUNION #define NONAMELESSSTRUCT @@ -99,7 +96,7 @@ BOOL X11DRV_SetCursorPos( INT x, INT y ); */ void X11DRV_Xcursor_Init(void) { -#ifdef HAVE_X11_XCURSOR_XCURSOR_H +#ifdef SONAME_LIBXCURSOR xcursor_handle = wine_dlopen(SONAME_LIBXCURSOR, RTLD_NOW, NULL, 0); if (!xcursor_handle) /* wine_dlopen failed. */ { @@ -113,7 +110,7 @@ void X11DRV_Xcursor_Init(void) LOAD_FUNCPTR(XcursorImageDestroy); LOAD_FUNCPTR(XcursorImageLoadCursor); #undef LOAD_FUNCPTR -#endif /* HAVE_X11_XCURSOR_XCURSOR_H */ +#endif /* SONAME_LIBXCURSOR */ }
@@ -394,7 +391,7 @@ void X11DRV_send_mouse_input( HWND hwnd, DWORD flags, DWORD x, DWORD y, }
-#ifdef HAVE_X11_XCURSOR_XCURSOR_H +#ifdef SONAME_LIBXCURSOR
/*********************************************************************** * create_cursor_image @@ -550,7 +547,7 @@ static Cursor create_xcursor_cursor( Display *display, CURSORICONINFO *ptr ) return cursor; }
-#endif /* HAVE_X11_XCURSOR_XCURSOR_H */ +#endif /* SONAME_LIBXCURSOR */
/*********************************************************************** @@ -566,7 +563,7 @@ static Cursor create_cursor( Display *display, CURSORICONINFO *ptr ) POINT hotspot; char *bitMask32 = NULL;
-#ifdef HAVE_X11_XCURSOR_XCURSOR_H +#ifdef SONAME_LIBXCURSOR if (pXcursorImageLoadCursor) return create_xcursor_cursor( display, ptr ); #endif