Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e
Modified Files:
configure.in
Log Message:
Cleanups, HAS_...->HAVE_...
===================================================================
RCS file: /cvs/e/e16/e/configure.in,v
retrieving revision 1.186
retrieving revision 1.187
diff -u -3 -r1.186 -r1.187
--- configure.in 24 Dec 2006 10:21:52 -0000 1.186
+++ configure.in 27 Dec 2006 16:34:47 -0000 1.187
@@ -155,15 +155,13 @@
[
AC_DEFINE(USE_ECORE, 1, [Ecore list support])
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?])
+ AC_MSG_ERROR([Cannot find ecore libraries])
])
- ecore_libs=`ecore-config --libs-x`
- ecore_cflags=`ecore-config --cflags`
- AC_SUBST(ecore_libs)
- AC_SUBST(ecore_cflags)
+ ECORE_LIBS=`ecore-config --libs-x`
+ ECORE_CFLAGS=`ecore-config --cflags`
+ AC_SUBST(ECORE_LIBS)
+ AC_SUBST(ECORE_CFLAGS)
fi
AC_CHECK_LIB(Xext, XShapeQueryExtension,
@@ -176,7 +174,7 @@
enable_xinerama=yes)
if test "x$enable_xinerama" = "xyes"; then
AC_CHECK_LIB(Xinerama, XineramaQueryExtension,
- AC_DEFINE(HAS_XINERAMA, 1, [Xinerama support])
+ AC_DEFINE(HAVE_XINERAMA, 1, [Xinerama support])
XINERAMA_LIBS="-lXinerama",
enable_xinerama=no
AC_MSG_WARN([Xinerama support was requested but not found]),
@@ -201,7 +199,7 @@
enable_xsync=yes)
if test "x$enable_xsync" = "xyes"; then
AC_CHECK_LIB(Xext, XSyncQueryExtension,
- AC_DEFINE(HAS_XSYNC, 1, [SYNC support]),
+ AC_DEFINE(HAVE_XSYNC, 1, [SYNC support]),
enable_xsync=no
AC_MSG_WARN([Sync support was requested but not found]),
$X_LIBS -lX11)
@@ -212,7 +210,7 @@
enable_xscrnsaver=no)
if test "x$enable_xscrnsaver" = "xyes"; then
AC_CHECK_LIB(Xss, XScreenSaverQueryExtension,
- AC_DEFINE(HAS_XSCREENSAVER, 1, [ScreenSaver support])
+ AC_DEFINE(HAVE_XSCREENSAVER, 1, [ScreenSaver support])
E_X_LIBS="-lXss $E_X_LIBS",
enable_xscrnsaver=no
AC_MSG_WARN([ScreenSaver support was requested but not found]),
@@ -224,7 +222,7 @@
enable_xrandr=yes)
if test "x$enable_xrandr" = "xyes"; then
AC_CHECK_LIB(Xrandr, XRRQueryExtension,
- AC_DEFINE(HAS_XRANDR, 1, [RandR support])
+ AC_DEFINE(HAVE_XRANDR, 1, [RandR support])
E_X_LIBS="-lXrandr -lXrender $E_X_LIBS",
enable_xrandr=no
AC_MSG_WARN([RandR support was requested but not found]),
@@ -238,7 +236,7 @@
enable_composite=yes)
if test "x$enable_composite" = "xyes"; then
AC_CHECK_LIB(Xcomposite, XCompositeQueryExtension,
- AC_DEFINE(HAS_COMPOSITE, 1, [Composite support])
+ AC_DEFINE(HAVE_COMPOSITE, 1, [Composite support])
E_X_LIBS="-lXcomposite -lXdamage -lXfixes -lXrender $E_X_LIBS",
enable_composite=no,
$X_LIBS -lXext -lX11)
@@ -250,7 +248,7 @@
AC_MSG_WARN([Composite support was requested but required component was
not found])
fi
fi
-AM_CONDITIONAL(HAS_COMPOSITE, test "x$enable_composite" = "xyes")
+AM_CONDITIONAL(HAVE_COMPOSITE, test "x$enable_composite" = "xyes")
AC_CHECK_LIB(Fridge,mass_quantities_of_bass_ale)
AC_CHECK_LIB(Fridge,mass_quantities_of_any_ale,, [
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
