Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/imlib2
Dir : e17/libs/imlib2
Modified Files:
configure.in
Log Message:
imlib2 configure.in patch
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/imlib2/configure.in,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -3 -r1.89 -r1.90
--- configure.in 21 Feb 2005 09:35:28 -0000 1.89
+++ configure.in 23 Feb 2005 03:27:41 -0000 1.90
@@ -144,35 +144,28 @@
freetype_cflags=`$FREETYPE_CONFIG --cflags`
freetype_libs=`$FREETYPE_CONFIG --libs`
-x11=no
-AC_ARG_ENABLE(x11,[ --disable-x11 attempt to build with X11 support
[default=yes]],
-[
- if test x$enableval = xyes; then
- have_x=yes
- else
- have_x=no
- fi
-],
-[
- AC_CHECK_HEADER(X11/X.h,
- [ have_x="yes" ],
- [ have_x="no" ]
- )
-]
-)
-AC_MSG_CHECKING(whether X11 support is to be enabled)
+AC_PATH_X([X], [X11/Xlib.h], [XOpenDisplay(NULL)])
+
+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
+ AC_MSG_ERROR(
+[no X support found. Use --x-includes and --x-libraries to specify the X
+path on your system, or --without-x to disable X support.])
+fi
+
if test "x$have_x" = "xyes"; then
- x_dir="/usr/X11R6";
- x_cflags="-I"$x_dir"/include"
- x_libs="-L"$x_dir"/lib -lX11 -lXext"
- AC_MSG_RESULT(enabling X11 support)
+ 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"
+ fi
AM_CONDITIONAL(BUILD_X11, true)
AC_DEFINE(BUILD_X11, 1, [enabling X11 support])
else
- x_dir=""
x_cflags=""
x_libs=""
- AC_MSG_RESULT(disabling X11 support)
AM_CONDITIONAL(BUILD_X11, false)
fi
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
