fixes for build system. add themes to the install process. use the build/ dir for...

[dana/openbox.git] / m4 / openbox.m4

diff --git a/m4/openbox.m4 b/m4/openbox.m4
index 53da97c..fb75ecc 100644 (file)
--- a/m4/openbox.m4
+++ b/m4/openbox.m4
@@ -5,41 +5,41 @@
 # Sets the CVS environment variable when building CVS sources.
 AC_DEFUN([OB_DEBUG],
 [
-  AC_MSG_CHECKING([build type])
+    AC_MSG_CHECKING([build type])
 
-  AC_ARG_ENABLE([debug],
-  [  --enable-debug          build a debug version default=yes],
-  [DEBUG=$enableval], [DEBUG="yes"])
+    AC_ARG_ENABLE([debug],
+    [  --enable-debug          build a debug version default=yes],
+    [DEBUG=$enableval], [DEBUG="yes"])
 
-  AC_ARG_ENABLE([strict-ansi],
-  [  --enable-strict-ansi    Enable strict ANSI compliance build default=no],
-  [STRICT=$enableval], [STRICT="no"])
-  if test "$GCC" = "yes" && test "$STRICT" = "yes"; then
-    CFLAGS="$CFLAGS -ansi -pedantic -D_XOPEN_SOURCE"
-  fi
+    AC_ARG_ENABLE([strict-ansi],
+    [  --enable-strict-ansi    Enable strict ANSI compliance build default=no],
+    [STRICT=$enableval], [STRICT="no"])
+    if test "$GCC" = "yes" && test "$STRICT" = "yes"; then
+       CFLAGS="$CFLAGS -ansi -pedantic -D_XOPEN_SOURCE"
+    fi
 
   # cvs builds are always debug
-  CVS=""
-  test "${PACKAGE_VERSION%*cvs}" != "$PACKAGE_VERSION" && CVS="yes"
-  test "$CVS" = "yes" && DEBUG="yes"
+    CVS=""
+    test "${PACKAGE_VERSION%*cvs}" != "$PACKAGE_VERSION" && CVS="yes"
+    test "$CVS" = "yes" && DEBUG="yes"
 
-  if test "$DEBUG" = "yes"; then
-    MSG="DEBUG"
-  else
-    MSG="RELEASE"
-  fi
-  if test "$CVS" = "yes"; then
-    MSG="$MSG (CVS build)"
-  fi
-  if test "$STRICT" = "yes"; then
-    MSG="$MSG with strict ANSI compliance"
-  fi
-  AC_MSG_RESULT([$MSG])
-  
-  test "$DEBUG" = "yes" && \
-      AC_DEFINE([DEBUG], [1], [Creating a debug build])
+    if test "$DEBUG" = "yes"; then
+       MSG="DEBUG"
+    else
+       MSG="RELEASE"
+    fi
+    if test "$CVS" = "yes"; then
+       MSG="$MSG (CVS build)"
+    fi
+    if test "$STRICT" = "yes"; then
+       MSG="$MSG with strict ANSI compliance"
+    fi
+    AC_MSG_RESULT([$MSG])
+    
+    test "$DEBUG" = "yes" && \
+       AC_DEFINE([DEBUG], [1], [Creating a debug build])
 
-  AM_CONDITIONAL(CVS, test "$CVS" = "yes")
+    AM_CONDITIONAL(CVS, test "$CVS" = "yes")
 ])
 
 
@@ -50,27 +50,39 @@ AC_DEFUN([OB_DEBUG],
 # for debug builds.
 AC_DEFUN([OB_COMPILER_FLAGS],
 [
-  AC_REQUIRE([AC_PROG_CPP])
-  AC_REQUIRE([AC_PROG_CC])
+    AC_REQUIRE([AC_PROG_CPP])
+    AC_REQUIRE([AC_PROG_CC])
 
-  FLAGS=""
+    FLAGS=""
 
-  # Check what compiler we are using
-  AC_MSG_CHECKING([for GNU CC])
-  if test "$GCC" = "yes"; then
-    AC_MSG_RESULT([yes])
-    if test "$DEBUG" = "yes"; then
-      FLAGS="-g -fno-inline"
-      FLAGS="$FLAGS -Wall -Wsign-compare -Waggregate-return"
-      FLAGS="$FLAGS -Wcast-qual -Wbad-function-cast -Wpointer-arith"
-      # for Python.h
-      FLAGS="$FLAGS -Wno-long-long"
+    # Check what compiler we are using
+    AC_MSG_CHECKING([for GNU CC])
+    if test "$GCC" = "yes"; then
+       AC_MSG_RESULT([yes])
+       if test "$DEBUG" = "yes"; then
+           FLAGS="-g -fno-inline"
+           FLAGS="$FLAGS -Wall -Wsign-compare -Waggregate-return"
+           FLAGS="$FLAGS -Wcast-qual -Wbad-function-cast -Wpointer-arith"
+            # for Python.h
+           #FLAGS="$FLAGS -Wno-long-long"
+       fi
+       if test "$STRICT" = "yes"; then
+           FLAGS="$FLAGS -ansi -pedantic -D_XOPEN_SOURCE"
+       fi
     fi
-    if test "$STRICT" = "yes"; then
-      FLAGS="$FLAGS -ansi -pedantic -D_XOPEN_SOURCE"
+    AC_MSG_CHECKING([for compiler specific flags])
+    AC_MSG_RESULT([$FLAGS])
+    CFLAGS="$CFLAGS $FLAGS"
+])
+
+AC_DEFUN([OB_NLS],
+[
+    AC_ARG_ENABLE([nls],
+    [  --enable-nls            Enable NLS translations  default=yes],
+    [NLS=$enableval], [NLS="yes"])
+
+    if test "$NLS" = yes; then
+       CPPFLAGS="$CPPFLAGS -DENABLE_NLS"
     fi
-  fi
-  AC_MSG_CHECKING([for compiler specific flags])
-  AC_MSG_RESULT([$FLAGS])
-  CFLAGS="$CFLAGS $FLAGS"
 ])
+