Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore
Modified Files:
configure.in
Log Message:
better x detect
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ecore/configure.in,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -3 -r1.93 -r1.94
--- configure.in 17 Jun 2005 23:52:32 -0000 1.93
+++ configure.in 18 Jun 2005 00:41:28 -0000 1.94
@@ -241,15 +241,22 @@
fi
if test "x$have_ecore_x" = "xyes"; then
- AM_CONDITIONAL(BUILD_ECORE_X, true)
- AC_DEFINE(BUILD_ECORE_X, 1, [Build Ecore_X Module])
- 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=" "$ecore_x_libs;
- ecore_x_libs="-lecore_x";
+ AC_PATH_XTRA
+ AC_CHECK_HEADER(X11/X.h,
+ [
+ AM_CONDITIONAL(BUILD_ECORE_X, true)
+ AC_DEFINE(BUILD_ECORE_X, 1, [Build Ecore_X Module])
+ BUILD_ECORE_X=1
+ 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"
+ x_ldflags=" "$ecore_x_libs;
+ ecore_x_libs="-lecore_x";
+ ],[
+ AM_CONDITIONAL(BUILD_ECORE_X, false)
+ BUILD_ECORE_X=0
+ ]
+ )
else
AM_CONDITIONAL(BUILD_ECORE_X, false)
BUILD_ECORE_X=0
-------------------------------------------------------
SF.Net email is sponsored by: Discover Easy Linux Migration Strategies
from IBM. Find simple to follow Roadmaps, straightforward articles,
informative Webcasts and more! Get everything you need to get up to
speed, fast. http://ads.osdn.com/?ad_id=7477&alloc_id=16492&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
