Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e
Modified Files:
Tag: branch-exp
configure.in
Log Message:
Fix things when composite is not available/enabled. Cleanups.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/configure.in,v
retrieving revision 1.99.2.9
retrieving revision 1.99.2.10
diff -u -3 -r1.99.2.9 -r1.99.2.10
--- configure.in 17 Sep 2004 16:13:40 -0000 1.99.2.9
+++ configure.in 27 Sep 2004 22:09:23 -0000 1.99.2.10
@@ -27,7 +27,7 @@
AC_DEFINE_UNQUOTED(ENLIGHTENMENT_MICRO, "$ENLIGHTENMENT_MICRO", [Micro Version])
AC_SUBST(ENLIGHTENMENT_MICRO)
if test "x$ENLIGHTENMENT_RELEASE" != "x"; then
-AC_DEFINE_UNQUOTED(ENLIGHTENMENT_RELEASE, "$ENLIGHTENMENT_RELEASE", [Release])
+ AC_DEFINE_UNQUOTED(ENLIGHTENMENT_RELEASE, "$ENLIGHTENMENT_RELEASE", [Release])
fi
ALL_LINGUAS="bg bs da de en_US es fr hu ko nl no ru sv pt pl pt_BR tr ja"
@@ -71,25 +71,27 @@
fi
AC_ARG_ENABLE(fsstd,
- [ --enable-fsstd install files following FSSTD [default=no]],
,enable_fsstd=no)
+ [ --enable-fsstd install files following FSSTD [default=no]],,
+ enable_fsstd=no)
AC_ARG_ENABLE(sound,
- [ --enable-sound compile with sound support [default=yes]],
,enable_sound=yes)
+ [ --enable-sound compile with sound support [default=yes]],,
+ enable_sound=yes)
AC_ARG_ENABLE(hints-ewmh,
- [ --enable-hints-ewmh compile with Extended Window Manager Hints support
[default=yes]],, enable_hints_ewmh=yes)
+ [ --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)
+ [ --enable-hints-gnome compile with GNOME(<2.0) hints support [default=no]],,
+ enable_hints_gnome=no)
AC_ARG_ENABLE(config-edb,
[ --enable-config-edb use edb for configuration [default=yes]],,
- enable_config_edb=yes
-)
+ enable_config_edb=yes)
AC_ARG_ENABLE(ecore-x,
[ --enable-ecore-x use ecore-x interface to X11 [default=no]],,
- enable_ecore_x=no
-)
+ enable_ecore_x=no)
if test "x$enable_hints_ewmh" = "xyes"; then
AC_DEFINE(ENABLE_EWMH, 1, [Extended Window Manager Hints])
@@ -124,16 +126,16 @@
AC_DEFINE_UNQUOTED(LOCALEDIR, "$LOCALEDIR", [The installation locale directory])
if test "x$enable_sound" = "xyes"; then
-AM_PATH_ESD(0.2.17,AC_DEFINE(HAVE_LIBESD, 1, [libesd.so]),[
-echo "WARNING: Enlightenment needs a system with libesd.so (esound)"
-echo "0.2.17 or higher to use sound support."
-echo "Enlightenment can use EsounD (ESD) to be installed to compile."
-echo "Sound will be disabled in this binary. If you ever want sound"
-echo "You will need to get and install EsounD then recompile Enlightenment."
-AC_MSG_WARN([Warning: no EsounD detected.])])
+ AM_PATH_ESD(0.2.17,AC_DEFINE(HAVE_LIBESD, 1, [libesd.so]),[
+ echo "WARNING: Enlightenment needs a system with libesd.so (esound)"
+ echo "0.2.17 or higher to use sound support."
+ echo "Enlightenment can use EsounD (ESD) to be installed to compile."
+ echo "Sound will be disabled in this binary. If you ever want sound"
+ echo "You will need to get and install EsounD then recompile Enlightenment."
+ AC_MSG_WARN([Warning: no EsounD detected.])])
else
-echo "Sound support has been turned off, per the --enable-sound=no"
-echo "passed to your configure line."
+ echo "Sound support has been turned off, per the --enable-sound=no"
+ echo "passed to your configure line."
fi
LDFLAGS="$LDFLAGS -L$prefix/lib"
@@ -143,92 +145,89 @@
AC_SUBST(IMLIB_LIBS)
AC_SUBST(IMLIB_CFLAGS)
AC_CHECK_LIB(Imlib2, imlib_create_image,
- AC_DEFINE(USE_IMLIB2, 1, [Imlib2 support]),
- AC_MSG_ERROR([Fatal Error: no Imlib2 detected.]),
- $IMLIB_LIBS)
+ AC_DEFINE(USE_IMLIB2, 1, [Imlib2 support]),
+ AC_MSG_ERROR([Fatal Error: no Imlib2 detected.]),
+ $IMLIB_LIBS)
if test "x$enable_ecore_x" = "xyes"; then
-AC_CHECK_LIB(ecore_x, ecore_x_init, [
- AC_DEFINE(USE_ECORE_X, 1, [Ecore_x support])
- AC_SUBST(ecore_libs)
- AC_SUBST(ecore_cflags) ],
- AC_MSG_ERROR(Cannot find ecore: Is ecore-config in path?))
-ecore_libs=`ecore-config --libs`
-ecore_cflags=`ecore-config --cflags`
-AC_SUBST(ecore_libs)
-AC_SUBST(ecore_cflags)
-fi
-
-AC_CHECK_LIB(dl, dlopen, DL_LIBS=-ldl , [
-echo "Warning: Enlightenment requires the dl (dynamic loader) library"
-echo "to be supported on your platform for module support. Modules"
-echo "have been disabled (this will affect functionality)"
-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 -lX11)
+ AC_CHECK_LIB(ecore_x, ecore_x_init,
+ [
+ AC_DEFINE(USE_ECORE_X, 1, [Ecore_x support])
+ AC_SUBST(ecore_libs)
+ AC_SUBST(ecore_cflags)
+ ],[
+ AC_MSG_ERROR(Cannot find ecore: Is ecore-config in path?)
+ ])
+ ecore_libs=`ecore-config --libs`
+ ecore_cflags=`ecore-config --cflags`
+ AC_SUBST(ecore_libs)
+ AC_SUBST(ecore_cflags)
+fi
AC_CHECK_LIB(Xext, XShapeQueryExtension,
- E_X_LIBS="-lXext $E_X_LIBS", , $X_LIBS -lX11)
+ 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 -lXext -lX11)
+ AC_DEFINE(HAS_XINERAMA, 1, [Xinerama support])
+ XINERAMA_LIBS="-lXinerama", , $X_LIBS -lXext -lX11)
AC_SUBST(XINERAMA_LIBS)
AC_ARG_ENABLE(zoom,
- [ --enable-zoom compile with zoom support [default=yes]],
,enable_zoom=yes)
+ [ --enable-zoom compile with zoom support [default=yes]],,
+ enable_zoom=yes)
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 -lXext -lX11)
+ AC_CHECK_LIB(Xxf86vm, XF86VidModeQueryExtension,
+ AC_DEFINE(WITH_ZOOM, 1, [Zoom Support])
+ E_X_LIBS="-lXxf86vm $E_X_LIBS", , $X_LIBS -lXext -lX11)
else
-echo "zoom has been turned off by request at compiletime"
+ echo "zoom has been turned off by request at compiletime"
fi
AC_CHECK_HEADER(Edb.h,
-[
-# have_edb="yes"
- edb_cflags=`edb-config --cflags`
- edb_libs=`edb-config --libs`
-],
-[
- AC_MSG_ERROR([Aarrgh ... no edb])
-])
+ [
+ # have_edb="yes"
+ edb_cflags=`edb-config --cflags`
+ edb_libs=`edb-config --libs`
+ ],[
+ AC_MSG_ERROR([Aarrgh ... no edb])
+ ])
AC_SUBST(edb_cflags)
AC_SUBST(edb_libs)
AC_ARG_ENABLE(xrandr,
- [ --enable-xrandr compile with RandR support [default=no]],
,enable_xrandr=no)
+ [ --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])
- E_X_LIBS="-lXrandr -lXrender $E_X_LIBS", , $X_LIBS -lXrender -lXext
-lX11)
-AC_CHECK_HEADERS(X11/extensions/Xrandr.h,,,[#include <X11/Xlib.h>])
+ AC_DEFINE(HAS_XRANDR, 1, [RandR support])
+ E_X_LIBS="-lXrandr -lXrender $E_X_LIBS", , $X_LIBS -lXrender -lXext -lX11)
+ AC_CHECK_HEADERS(X11/extensions/Xrandr.h,,,[#include <X11/Xlib.h>])
fi
# FIXME - Do this properly
AC_ARG_ENABLE(composite,
- [ --enable-composite compile with Composite support [default=no]],
,enable_composite=no)
+ [ --enable-composite compile with Composite support [default=no]],,
+ enable_composite=no)
if test "x$enable_composite" = "xyes"; then
-AC_CHECK_LIB(Xcomposite, XCompositeQueryExtension,
- AC_DEFINE(HAS_COMPOSITE, 1, [Composite support])
- E_X_LIBS="-lXcomposite -lXdamage -lXfixes $E_X_LIBS", , $X_LIBS -lXext
-lX11)
-AC_CHECK_HEADERS(X11/extensions/Xcomposite.h ,,,[#include <X11/Xlib.h>])
-AC_CHECK_HEADERS(X11/extensions/Xdamage.h ,,,[#include <X11/Xlib.h>])
-AC_CHECK_HEADERS(X11/extensions/Xfixes.h ,,,[#include <X11/Xlib.h>])
-AC_CHECK_HEADERS(X11/extensions/Xrender.h ,,,[#include <X11/Xlib.h>])
+ AC_CHECK_LIB(Xcomposite, XCompositeQueryExtension,
+ AC_DEFINE(HAS_COMPOSITE, 1, [Composite support])
+ E_X_LIBS="-lXcomposite -lXdamage -lXfixes -lXrender $E_X_LIBS", , $X_LIBS
-lXext -lX11,
+ enable_composite=no)
+ AC_CHECK_HEADERS(X11/extensions/Xcomposite.h ,,,[#include <X11/Xlib.h>])
+ AC_CHECK_HEADERS(X11/extensions/Xdamage.h ,,,[#include <X11/Xlib.h>])
+ AC_CHECK_HEADERS(X11/extensions/Xfixes.h ,,,[#include <X11/Xlib.h>])
+ AC_CHECK_HEADERS(X11/extensions/Xrender.h ,,,[#include <X11/Xlib.h>])
fi
+AM_CONDITIONAL(HAS_COMPOSITE, test "x$enable_composite" = "xyes")
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."
-echo " We highly suggest that you rectify this situation immediately."
+AC_CHECK_LIB(Fridge,mass_quantities_of_any_ale,, [
+ echo "Warning: No ales were found in your refrigerator."
+ echo " We highly suggest that you rectify this situation immediately."
])
AC_ARG_ENABLE(gcc-warnings,
- [ --enable-gcc-warnings enable GCC compiler warnings [default=no]], ,
+ [ --enable-gcc-warnings enable GCC compiler warnings [default=no]],,
enable_gcc_warnings=no)
if test "x$enable_gcc_warnings" = "xyes"; then
CFLAGS="$CFLAGS -W -Wall -Wmissing-prototypes -Wmissing-declarations
-Wstrict-prototypes -Waggregate-return -Wcast-align -Wpointer-arith -Wshadow
-Wwrite-strings #-Wunreachable-code"
-------------------------------------------------------
This SF.Net email is sponsored by: YOU BE THE JUDGE. Be one of 170
Project Admins to receive an Apple iPod Mini FREE for your judgement on
who ports your project to Linux PPC the best. Sponsored by IBM.
Deadline: Sept. 24. Go here: http://sf.net/ppc_contest.php
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
