Change WITH_ZOOM to ENABLE_ZOOM. Zoom related build tweaks.

SVN revision: 54066

configure.ac

@@ -210,18 +210,6 @@ if test "x$enable_xinerama" = "xyes"; then
 fi
 AC_SUBST(XINERAMA_LIBS)
 
-AC_ARG_ENABLE(zoom,
-  [  --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",
-    enable_zoom=no
-    AC_MSG_WARN([Zoom support was requested but not found]),
-    -lXext -lX11)
-fi
-
 AC_ARG_ENABLE(xsync,
   [  --enable-xsync          compile with SYNC support @<:@default=yes@:>@],,
   enable_xsync=yes)
@@ -291,6 +279,19 @@ if test "x$enable_composite" = "xyes"; then
 fi
 AM_CONDITIONAL(ENABLE_COMPOSITE, test "x$enable_composite" = "xyes")
 
+AC_ARG_ENABLE(zoom,
+  [  --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(ENABLE_ZOOM, 1, [Zoom Support])
+    E_X_LIBS="-lXxf86vm $E_X_LIBS",
+    enable_zoom=no
+    AC_MSG_WARN([Zoom support was requested but not found]),
+    -lXext -lX11)
+fi
+AM_CONDITIONAL(ENABLE_ZOOM, test "x$enable_zoom" != "xno")
+
 AC_ARG_ENABLE(dbus,
   [  --enable-dbus           compile with D-Bus support (experimental) @<:@default=no@:>@],,
   enable_dbus=no)

src/Makefile.am

@@ -1,12 +1,15 @@
 SUBDIRS =
 
-EXTRA_DIST = gnome.c eglx.c eglx.h glwin.c ecompmgr.c ecompmgr.h magwin.c snprintf.c
+EXTRA_DIST = gnome.c zoom.c eglx.c eglx.h glwin.c ecompmgr.c ecompmgr.h magwin.c snprintf.c
 
 bin_PROGRAMS = e16
 
 if ENABLE_GNOME
 SRCS_GNOME = gnome.c
 endif
+if ENABLE_ZOOM
+SRCS_ZOOM = zoom.c
+endif
 if ENABLE_GLX
 SRCS_GLX = eglx.c eglx.h glwin.c
 endif
@@ -109,9 +112,9 @@ e16_SOURCES = \
 	windowmatch.c   	windowmatch.h		\
 	x.c                     xwin.h			\
 	xtypes.h                \
-	zoom.c			\
 	$(MODULE_SRCS)		\
 	$(SRCS_GNOME) 		\
+	$(SRCS_ZOOM) 		\
 	$(SRCS_GLX) 		\
 	$(SRCS_ECOMPMGR)	\
 	$(SRCS_DBUS)		\

src/ewins.h

@@ -476,7 +476,7 @@ int                 EwinListStackIsRaised(const EWin * ewin);
 #define EwinListGetAll EwinListStackGet
 
 /* zoom.c */
-#if WITH_ZOOM
+#if ENABLE_ZOOM
 void                Zoom(EWin * ewin, int on);
 void                ReZoom(EWin * ewin);
 #else

src/zoom.c

@@ -22,12 +22,10 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 #include "E.h"
-#include "ewins.h"
-#include "hints.h"
-
-#ifdef WITH_ZOOM
 #include "borders.h"
+#include "ewins.h"
 #include "focus.h"
+#include "hints.h"
 #include "xwin.h"
 #if USE_XRANDR
 #include <X11/extensions/Xrandr.h>
@@ -280,5 +278,3 @@ ReZoom(EWin * ewin)
 	Zoom(ewin, 1);
      }
 }
-
-#endif /* WITH_ZOOM */