Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore
Modified Files:
configure.in
Log Message:
xcursor support... note the comment in the Makefile.am.
i dont have enough expletives to describe what i think of libtool....
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ecore/configure.in,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -3 -r1.65 -r1.66
--- configure.in 27 Dec 2004 14:40:57 -0000 1.65
+++ configure.in 4 Jan 2005 10:26:16 -0000 1.66
@@ -242,9 +242,9 @@
BUILD_ECORE_X=1
x_dir="/usr/X11R6";
x_includes="";
- x_cflags="-I"$x_dir"/include"
- x_libs="-L"$x_dir"/lib -lX11 -lXext"
- x_ldflags="";
+ x_cflags="-I"$x_dir"/include";
+ x_libs="-L"$x_dir"/lib -lX11 -lXext";
+ x_ldflags=" "$ecore_x_libs;
ecore_x_libs="-lecore_x";
else
AM_CONDITIONAL(BUILD_ECORE_X, false)
@@ -258,6 +258,33 @@
AC_SUBST(x_ldflags)
AC_SUBST(x_libs)
+Xcursor_libs=""
+Xcursor_cflags=""
+use_Xcursor="no"
+AC_CHECK_HEADER(X11/Xcursor/Xcursor.h, [
+ AC_CHECK_LIB(Xcursor, XcursorImageLoadCursor, [
+ AC_DEFINE(ECORE_XCURSOR, 1, [Build support for Xcursor])
+ Xcursor_cflags=""
+ Xcursor_libs="-IXcursor"
+ use_Xcursor="yes"
+ ], [
+ Xcursor_cflags=""
+ Xcursor_libs=""
+ use_Xcursor="no"
+ ]
+ )
+ ], [
+ Xcursor_cflags=""
+ Xcursor_libs=""
+ use_Xcursor="no"
+ ], [
+ #include <X11/Xlib.h>
+ ]
+)
+
+AC_SUBST(Xcursor_cflags)
+AC_SUBST(Xcursor_libs)
+
AC_SUBST(ecore_x_cflags)
AC_SUBST(ecore_x_libs)
@@ -684,7 +711,7 @@
echo " Ecore_Job...............: $have_ecore_job"
echo " Ecore_Con...............: $have_ecore_con (OpenSSL: $use_openssl)"
echo " Ecore_Txt...............: $have_ecore_txt"
-echo " Ecore_X.................: $have_ecore_x"
+echo " Ecore_X.................: $have_ecore_x (Xcursor: $use_Xcursor)"
echo " Ecore_FB................: $have_ecore_fb"
echo " Ecore_Evas..............: $have_ecore_evas"
echo " Ecore_Evas GL Support...: $have_ecore_evas_gl"
-------------------------------------------------------
The SF.Net email is sponsored by: Beat the post-holiday blues
Get a FREE limited edition SourceForge.net t-shirt from ThinkGeek.
It's fun and FREE -- well, almost....http://www.thinkgeek.com/sfshirt
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
