Cleanups, HAS_...->HAVE_...

SVN revision: 27575
2006-12-27 16:34:48 +00:00 · 2006-12-27 16:34:48 +00:00 · e893fd6223
parent 67882e6394
commit e893fd6223
7 changed files with 34 additions and 35 deletions
--- a/configure.in
+++ b/configure.in
@ -155,15 +155,13 @@ if test "x$enable_ecore" = "xyes"; then
    [
      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 @@ AC_ARG_ENABLE(xinerama,
  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 @@ AC_ARG_ENABLE(xsync,
  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 @@ AC_ARG_ENABLE(xscrnsaver,
  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 @@ AC_ARG_ENABLE(xrandr,
  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 @@ AC_ARG_ENABLE(composite,
  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 @@ if test "x$enable_composite" = "xyes"; then
    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,, [
--- a/dox/dox.c
+++ b/dox/dox.c
@ -30,7 +30,7 @@
 #include <X11/keysym.h>
 #include <X11/Xatom.h>

-#ifdef HAS_XINERAMA
+#ifdef HAVE_XINERAMA
 #include <X11/extensions/Xinerama.h>
 #endif

@ -337,7 +337,7 @@ main(int argc, char **argv)
   t = 16;
   wx = (VRoot.w - w) / 2;
   wy = (VRoot.h - (h + t)) / 2;
-#ifdef HAS_XINERAMA
+#ifdef HAVE_XINERAMA
   {
      if (XineramaIsActive(disp))
 	{
--- a/src/E.h
+++ b/src/E.h
@ -37,21 +37,21 @@
 #include <X11/Xlib.h>
 #include <X11/extensions/shape.h>

-#ifdef HAS_XSYNC
+#ifdef HAVE_XSYNC
 #define USE_XSYNC 1		/* Experimental */
 #endif

-#ifdef HAS_XSCREENSAVER
+#ifdef HAVE_XSCREENSAVER
 #define USE_XSCREENSAVER 1	/* Experimental */
 #endif

-#ifdef HAS_XRANDR
+#ifdef HAVE_XRANDR
 #ifdef HAVE_X11_EXTENSIONS_XRANDR_H
 #define USE_XRANDR 1
 #endif
 #endif

-#ifdef HAS_COMPOSITE
+#ifdef HAVE_COMPOSITE
 #define USE_COMPOSITE 1
 #endif

@ -343,7 +343,7 @@ typedef struct
      int                 slidespeedcleanup;
      char                ignore_struts;
      char                raise_fullscreen;
-#ifdef HAS_XINERAMA
+#ifdef HAVE_XINERAMA
      char                extra_head;	/* Not used */
 #endif
   } place;
@ -438,7 +438,7 @@ typedef struct
   {
      char               *name;
      int                 screens;
-#ifdef HAS_XINERAMA
+#ifdef HAVE_XINERAMA
      char                xinerama_active;
 #endif
 #if USE_XSYNC
--- a/src/Makefile.am
+++ b/src/Makefile.am
@ -7,12 +7,13 @@ bin_PROGRAMS = e16
 if ENABLE_GNOME
 SRCS_GNOME = gnome.c
 endif
+if HAVE_COMPOSITE
+SRCS_ECOMPMGR = ecompmgr.c ecompmgr.h
+endif
 if USE_ESNPRINTF
 SRCS_SNPRINTF = snprintf.c
 endif
-if HAS_COMPOSITE
-SRCS_ECOMPMGR = ecompmgr.c ecompmgr.h
-endif
+
 e16_SOURCES = \
 	E.h			\
 	about.c			\
@ -108,7 +109,7 @@ e16_SOURCES = \
 LDADD = \
 	$(LTLIBINTL)		\
 	$(LTLIBICONV)		\
-	@ecore_libs@		\
+	$(ECORE_LIBS)		\
 	$(ESD_LIBS) 		\
 	$(IMLIB2_LIBS) 		\
 	$(XFT_LIBS) 		\
@ -119,7 +120,7 @@ LDADD = \
 	$(E_X_LIBS) 		\
 	-lX11 -lm

-INCLUDES = -I$(top_builddir) -I$(top_srcdir) -I$(top_srcdir)/intl @ecore_cflags@ $(ESD_CFLAGS) $(IMLIB2_CFLAGS) $(XFT_CFLAGS) $(X_CFLAGS)
+INCLUDES = -I$(top_builddir) -I$(top_srcdir) -I$(top_srcdir)/intl $(ECORE_CFLAGS) $(ESD_CFLAGS) $(IMLIB2_CFLAGS) $(XFT_CFLAGS) $(X_CFLAGS)

 install-data-local:
 	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(ENLIGHTENMENT_ROOT)/themes
--- a/src/menus.c
+++ b/src/menus.c
@ -1380,7 +1380,7 @@ MenusHandleMotion(void)

 		  if (Mode_menus.current_depth)
 		    {
-#ifdef HAS_XINERAMA
+#ifdef HAVE_XINERAMA
 		       ewin = Mode_menus.list[0]->ewin;
 		       if (ewin->head == head_num)
 			 {
@ -1407,7 +1407,7 @@ MenusHandleMotion(void)
 			    if (((xdist != 0) || (ydist != 0))
 				&& (Conf.menus.warp))
 			       EXWarpPointer(None, xdist, ydist);
-#ifdef HAS_XINERAMA
+#ifdef HAVE_XINERAMA
 			 }
 #endif
 		    }
--- a/src/screen.c
+++ b/src/screen.c
@ -25,7 +25,7 @@
 #include "ewins.h"
 #include "screen.h"
 #include "xwin.h"
-#ifdef HAS_XINERAMA
+#ifdef HAVE_XINERAMA
 #include <X11/extensions/Xinerama.h>
 #endif

@ -60,7 +60,7 @@ ScreenAdd(int type, int head, int x, int y, unsigned int w, unsigned int h)
 void
 ScreenInit(void)
 {
-#ifdef HAS_XINERAMA
+#ifdef HAVE_XINERAMA
   XineramaScreenInfo *screens = NULL;
   int                 num_screens = 0;
   int                 i;
@ -83,7 +83,7 @@ ScreenShowInfo(const char *prm __UNUSED__)
 {
   int                 i;

-#ifdef HAS_XINERAMA
+#ifdef HAVE_XINERAMA
   if (XineramaIsActive(disp))
     {
 	XineramaScreenInfo *scrns;
--- a/src/settings.c
+++ b/src/settings.c
@ -194,7 +194,7 @@ static int          tmp_shade_speed;
 static char         tmp_place_ignore_struts;
 static char         tmp_raise_fullscreen;

-#ifdef HAS_XINERAMA
+#ifdef HAVE_XINERAMA
 static char         tmp_extra_head;
 #endif

@ -220,7 +220,7 @@ CB_ConfigurePlacement(Dialog * d __UNUSED__, int val, void *data __UNUSED__)

 	Conf.place.ignore_struts = tmp_place_ignore_struts;
 	Conf.place.raise_fullscreen = tmp_raise_fullscreen;
-#ifdef HAS_XINERAMA
+#ifdef HAVE_XINERAMA
 	if (Mode.display.xinerama_active)
 	   Conf.place.extra_head = tmp_extra_head;
 #endif
@ -251,7 +251,7 @@ _DlgFillPlacement(Dialog * d __UNUSED__, DItem * table, void *data __UNUSED__)
   tmp_place_ignore_struts = Conf.place.ignore_struts;
   tmp_raise_fullscreen = Conf.place.raise_fullscreen;

-#ifdef HAS_XINERAMA
+#ifdef HAVE_XINERAMA
   tmp_extra_head = Conf.place.extra_head;
 #endif

@ -376,7 +376,7 @@ _DlgFillPlacement(Dialog * d __UNUSED__, DItem * table, void *data __UNUSED__)
   DialogItemSetText(di, _("Raise fullscreen windows"));
   DialogItemCheckButtonSetPtr(di, &tmp_raise_fullscreen);

-#ifdef HAS_XINERAMA_no		/* Not implemented */
+#ifdef HAVE_XINERAMA_no		/* Not implemented */
   if (Mode.display.xinerama_active)
     {
 	di = DialogAddItem(table, DITEM_CHECKBUTTON);