Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e
Modified Files:
configure.in
Log Message:
Portability fixes and auto* cleanups.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/configure.in,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -3 -r1.88 -r1.89
--- configure.in 21 Mar 2004 01:45:32 -0000 1.88
+++ configure.in 24 Apr 2004 13:16:28 -0000 1.89
@@ -99,11 +99,11 @@
dnl ${DATADIRNAME} being defined.
if test "x$enable_fsstd" = "xyes"; then
- LOCALEDIR=${prefix}/${DATADIRNAME}/locale
+ LOCALEDIR=${prefix}/${DATADIRNAME}/locale
else
- datadir=${prefix}
- exec_prefix=${prefix}/enlightenment
- LOCALEDIR=${prefix}/enlightenment/locale
+ datadir=${prefix}
+ exec_prefix=${prefix}/enlightenment
+ LOCALEDIR=${prefix}/enlightenment/locale
fi
ENLIGHTENMENT_ROOT=`eval echo ${datadir}/enlightenment`
ENLIGHTENMENT_BIN=`eval echo ${bindir}`
@@ -122,7 +122,6 @@
fi
LDFLAGS="$LDFLAGS -L$prefix/lib"
-LDFLAGS="$LDFLAGS -L$x_libraries"
if test "x$with_imlib2" = "xyes"; then
# Use Imlib2
@@ -164,16 +163,15 @@
AC_MSG_WARN([Module Support Disabled (no dynamic loader)])], -lm)
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(Xtst, XTestQueryExtension,
+ E_X_LIBS="-lXtst $E_X_LIBS", , $X_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,
,$X_LIBS)
+ AC_DEFINE(HAS_XINERAMA, 1, [Xinerama support])
+ XINERAMA_LIBS="-lXinerama", ,$X_LIBS)
AC_SUBST(XINERAMA_LIBS)
AC_ARG_ENABLE(zoom,
@@ -181,23 +179,20 @@
if test "x$enable_zoom" = "xyes"; then
AC_CHECK_LIB(Xxf86vm, XF86VidModeQueryExtension,
AC_DEFINE(WITH_ZOOM, 1, [Zoom Support])
- XVM_LIBS=-lXxf86vm, , $X_LIBS)
+ E_X_LIBS="-lXxf86vm $E_X_LIBS", , $X_LIBS)
else
echo "zoom has been turned off by request at compiletime"
fi
-AC_SUBST(XVM_LIBS)
AC_ARG_ENABLE(xrandr,
[ --enable-xrandr compile with RandR support [default=no]],
,enable_xrandr=no)
if test "x$enable_xrandr" = "xyes"; then
AC_CHECK_LIB(Xrandr, XRRQueryExtension,
- AC_DEFINE(HAS_XRANDR, 1, [RandR support]) XRANDR_LIBS=-lXrandr, ,$X_LIBS)
+ AC_DEFINE(HAS_XRANDR, 1, [RandR support])
+ E_X_LIBS="-lXrandr $E_X_LIBS", ,$X_LIBS)
AC_CHECK_HEADERS(X11/extensions/Xrandr.h,,,[#include <X11/Xlib.h>])
-LIBS="$XRANDR_LIBS $LIBS"
fi
-AC_SUBST(XKB)
-
AC_CHECK_LIB(Fridge,mass_quantities_of_bass_ale)
AC_CHECK_LIB(Fridge,mass_quantities_of_any_ale, , [
echo "Warning: No ales were found in your refrigerator."
@@ -211,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_SUBST(E_X_LIBS)
+
AC_OUTPUT([
Makefile
src/Makefile
-------------------------------------------------------
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
