Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e
Modified Files:
configure.in
Log Message:
Initial imlib2 port.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/configure.in,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -3 -r1.69 -r1.70
--- configure.in 15 Nov 2003 14:16:55 -0000 1.69
+++ configure.in 15 Nov 2003 22:27:16 -0000 1.70
@@ -74,6 +74,9 @@
[ --enable-hints-ewmh compile with Extended Window Manager Hints support
[default=yes]],, enable_hints_ewmh=yes)
AC_ARG_ENABLE(hints-gnome,
[ --enable-hints-gnome compile with GNOME(<2.0) hints support [default=no]],,
enable_hints_gnome=no)
+AC_ARG_WITH(imlib2,
+ [ --with-imlib2 compile with Imlib2 support [default=no]],,
with_imlib2=no)
+
AC_ARG_WITH(fnlib,
[ --with-fnlib compile with Fnlib support [default=yes]],,
with_fnlib=yes)
@@ -108,14 +111,20 @@
echo "passed to your configure line."
fi
+LDFLAGS="$LDFLAGS -L$prefix/lib"
+LDFLAGS="$LDFLAGS -L$x_libraries"
+
+if test "x$with_imlib2" = "xyes"; then
+AC_CHECK_LIB(Imlib2, imlib_create_image, IMLIB_LIBS=-lImlib2, [
+echo "ERROR: Imlib2 support requested but not found (imlib2)."
+AC_MSG_ERROR([Fatal Error: no Imlib2 detected.])], -lm)
+AC_DEFINE(USE_IMLIB2, 1, [Imlib2 support])
+with_fnlib="no"
+else
AM_PATH_IMLIB(1.9.8, , [
echo "ERROR: Enlightenment needs a system with Imlib 1.9.8 or higher."
AC_MSG_ERROR([Fatal Error: no Imlib detected.])])
-
-LDFLAGS="$LDFLAGS -L$prefix/lib"
-LDFLAGS="$LDFLAGS `echo $IMLIB_LIBS | sed 's/\(.*\)-lImlib.*/\1/'`"
-LDFLAGS="$LDFLAGS `echo $IMLIB_LIBS | sed 's/.*-lImlib.*\(-L[[^ ]]*\).*$/\1/'`"
-XTST_LIBS=""
+fi
if test "x$with_fnlib" = "xyes"; then
# AC_CHECK_HEADER(Fnlib.h, ,AC_MSG_ERROR([Fatal Error: no Fnlib header detected.]))
@@ -151,8 +160,11 @@
AC_SUBST(DL_LIBS)
AC_CHECK_LIB(Xtst, XTestGrabControl, , , $X_LIBS)
+
+XTST_LIBS=""
AC_CHECK_LIB(Xtst, XTestQueryExtension, XTST_LIBS=-lXtst, , $X_LIBS)
AC_SUBST(XTST_LIBS)
+
AC_CHECK_LIB(Xext, XkbQueryExtension, AC_DEFINE(WITH_TARTY_WARP, 1, [Tarty Warp]), ,
$X_LIBS)
AC_CHECK_LIB(Xinerama, XineramaQueryExtension, AC_DEFINE(HAS_XINERAMA, 1, [Xinerama
support])
XINERAMA_LIBS=-lXinerama
-------------------------------------------------------
This SF. Net email is sponsored by: GoToMyPC
GoToMyPC is the fast, easy and secure way to access your computer from
any Web browser or wireless device. Click here to Try it Free!
https://www.gotomypc.com/tr/OSDN/AW/Q4_2003/t/g22lp?Target=mm/g22lp.tmpl
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
