Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e
Modified Files:
configure.in
Log Message:
Fix X library configuration some more.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/configure.in,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -3 -r1.89 -r1.90
--- configure.in 24 Apr 2004 13:16:28 -0000 1.89
+++ configure.in 27 Apr 2004 18:59:53 -0000 1.90
@@ -163,15 +163,15 @@
AC_MSG_WARN([Module Support Disabled (no dynamic loader)])], -lm)
AC_SUBST(DL_LIBS)
-AC_CHECK_LIB(Xtst, XTestQueryExtension,
- E_X_LIBS="-lXtst $E_X_LIBS", , $X_LIBS)
+#AC_CHECK_LIB(Xtst, XTestQueryExtension,
+# E_X_LIBS="-lXtst $E_X_LIBS", , $X_LIBS -lX11)
-AC_CHECK_LIB(Xext, XkbQueryExtension,
- AC_DEFINE(WITH_TARTY_WARP, 1, [Tarty Warp]), , $X_LIBS)
+AC_CHECK_LIB(Xext, XShapeQueryExtension,
+ E_X_LIBS="-lXext $E_X_LIBS", , $X_LIBS -lX11)
AC_CHECK_LIB(Xinerama, XineramaQueryExtension,
AC_DEFINE(HAS_XINERAMA, 1, [Xinerama support])
- XINERAMA_LIBS="-lXinerama", ,$X_LIBS)
+ XINERAMA_LIBS="-lXinerama", , $X_LIBS -lXext -lX11)
AC_SUBST(XINERAMA_LIBS)
AC_ARG_ENABLE(zoom,
@@ -179,7 +179,7 @@
if test "x$enable_zoom" = "xyes"; then
AC_CHECK_LIB(Xxf86vm, XF86VidModeQueryExtension,
AC_DEFINE(WITH_ZOOM, 1, [Zoom Support])
- E_X_LIBS="-lXxf86vm $E_X_LIBS", , $X_LIBS)
+ E_X_LIBS="-lXxf86vm $E_X_LIBS", , $X_LIBS -lXext -lX11)
else
echo "zoom has been turned off by request at compiletime"
fi
@@ -189,7 +189,7 @@
if test "x$enable_xrandr" = "xyes"; then
AC_CHECK_LIB(Xrandr, XRRQueryExtension,
AC_DEFINE(HAS_XRANDR, 1, [RandR support])
- E_X_LIBS="-lXrandr $E_X_LIBS", ,$X_LIBS)
+ E_X_LIBS="-lXrandr $E_X_LIBS", , $X_LIBS -lXext -lX11)
AC_CHECK_HEADERS(X11/extensions/Xrandr.h,,,[#include <X11/Xlib.h>])
fi
@@ -206,6 +206,8 @@
CFLAGS="$CFLAGS -W -Wall -Wmissing-prototypes -Wmissing-declarations
-Wstrict-prototypes -Waggregate-return -Wcast-align -Wpointer-arith -Wshadow
-Wwrite-strings #-Wunreachable-code"
fi
+AC_DEFINE(WITH_TARTY_WARP, 1, [Tarty Warp])
+
AC_SUBST(E_X_LIBS)
AC_OUTPUT([
-------------------------------------------------------
This SF.net email is sponsored by: The Robotic Monkeys at ThinkGeek
For a limited time only, get FREE Ground shipping on all orders of $35
or more. Hurry up and shop folks, this offer expires April 30th!
http://www.thinkgeek.com/freeshipping/?cpg=12297
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
