build fixes for finding Xlibs and for setting vars based on found Xlib info and Xiner...

[chaz/openbox] / m4 / openbox.m4

diff --git a/m4/openbox.m4 b/m4/openbox.m4
index fb75eccd2efba1d2976635d7ec2e4699fa924fae..84044f36005809be0e4e4a8a40f850a27ff5c907 100644 (file)
--- a/m4/openbox.m4
+++ b/m4/openbox.m4
@@ -38,8 +38,6 @@ AC_DEFUN([OB_DEBUG],
     
     test "$DEBUG" = "yes" && \
        AC_DEFINE([DEBUG], [1], [Creating a debug build])
-
-    AM_CONDITIONAL(CVS, test "$CVS" = "yes")
 ])
 
 
@@ -82,7 +80,7 @@ AC_DEFUN([OB_NLS],
     [NLS=$enableval], [NLS="yes"])
 
     if test "$NLS" = yes; then
-       CPPFLAGS="$CPPFLAGS -DENABLE_NLS"
+       DEFS="$DEFS -DENABLE_NLS"
     fi
 ])