gnustep/libs-back
0
0
Fork 0
mirror of https://github.com/gnustep/libs-back.git synced 2025-04-22 23:42:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

* configure.ac: Add a configure test for Xcursor

Browse source 
* configure: regenerate
* config.h.in: regernate


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/back/trunk@33677 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Eric Wasylishen 2011-08-02 04:08:48 +00:00
parent 337ce46bba
commit 479d1a76ca
4 changed files with 66 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2011-08-01 Eric Wasylishen <ewasylishen@gmail.com>
* configure.ac: Add a configure test for Xcursor
* configure: regenerate
* config.h.in: regernate
2011-07-30 Eric Wasylishen <ewasylishen@gmail.com>
* Source/win32/WIN32Server.m (-resolutionForScreen:):
Scale the result by 0.75 so the Windows default of 96 DPI is

6
config.h.in
View file

@ -92,6 +92,9 @@
/* Define to 1 if you have the <X11/extensions/XShm.h> header file. */
#undef HAVE_X11_EXTENSIONS_XSHM_H
/* Define to enable Xcursor support */
#undef HAVE_XCURSOR
/* Define if you have a functional XFreeType installation, including libXft.
*/
#undef HAVE_XFT
@ -114,6 +117,9 @@
/* Define to the one symbol short name of this package. */
#undef PACKAGE_TARNAME
/* Define to the home page for this package. */
#undef PACKAGE_URL
/* Define to the version of this package. */
#undef PACKAGE_VERSION

47
configure vendored
View file

@ -4706,6 +4706,53 @@ $as_echo "$XMU_LIBS" >&6; }
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XcursorImageCreate in -lXcursor" >&5
$as_echo_n "checking for XcursorImageCreate in -lXcursor... " >&6; }
if test "${ac_cv_lib_Xcursor_XcursorImageCreate+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lXcursor $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* 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 XcursorImageCreate ();
int
main ()
{
return XcursorImageCreate ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_Xcursor_XcursorImageCreate=yes
else
ac_cv_lib_Xcursor_XcursorImageCreate=no
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xcursor_XcursorImageCreate" >&5
$as_echo "$ac_cv_lib_Xcursor_XcursorImageCreate" >&6; }
if test "x$ac_cv_lib_Xcursor_XcursorImageCreate" = x""yes; then :
LIBS="-lXcursor $LIBS"
$as_echo "#define HAVE_XCURSOR 1" >>confdefs.h
fi
LIBS="$X_LIBS $LIBS"
fi

7
configure.ac
View file

@ -152,6 +152,13 @@ if test $set_x_paths = yes; then
PKG_CHECK_MODULES([XMU], [xmu])
fi
AC_CHECK_LIB(Xcursor, XcursorImageCreate,
[
LIBS="-lXcursor $LIBS"
AC_DEFINE(HAVE_XCURSOR, 1, [Define to enable Xcursor support])
]
,)
LIBS="$X_LIBS $LIBS"
fi
AC_SUBST(X_PRE_LIBS)