Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/imlib2
Dir : e17/libs/imlib2
Modified Files:
configure.in
Log Message:
fix x detect
===================================================================
RCS file: /cvs/e/e17/libs/imlib2/configure.in,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -3 -r1.130 -r1.131
--- configure.in 28 Jun 2006 07:20:17 -0000 1.130
+++ configure.in 2 Sep 2006 11:08:57 -0000 1.131
@@ -174,8 +174,10 @@
freetype_cflags=`$FREETYPE_CONFIG --cflags`
freetype_libs=`$FREETYPE_CONFIG --libs`
-AC_PATH_X([X11], [X11/Xlib.h], [XOpenDisplay(NULL)])
-
+AC_CHECK_HEADER(X11/X.h,
+ [ have_x="yes" ],
+ [ have_x="no" ])
+
if test "x$have_x" = "xno"; then
# If --without-x was passed, this will be "disabled" instead of "no" --
# so always treat "no" as an error
@@ -185,14 +187,10 @@
fi
if test "x$have_x" = "xyes"; then
- if test "x$x_includes" != "x"; then
- x_cflags="-I$x_includes"
- fi
- if test "x$x_libraries" != "x"; then
- x_libs="-L$x_libraries -lX11 -lXext"
- else
- x_libs="-lX11 -lXext"
- fi
+ AC_PATH_XTRA
+ x_dir=${x_dir:-/usr/X11R6}
+ x_cflags=${x_cflags:--I${x_includes:-$x_dir/include}}
+ x_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} -lX11 -lXext"
AM_CONDITIONAL(BUILD_X11, true)
AC_DEFINE(BUILD_X11, 1, [enabling X11 support])
else
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
