on reconfigure, save all of the open submenus instead of just one, and then reopen...

[chaz/openbox] / configure.in

diff --git a/configure.in b/configure.in
index f8bf80d382e9e971a1fdacb3b7cce2f957cb3567..1da34f1bac521738477a4f824cedad6a1f884f64 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
 dnl configure.in for Openbox
 dnl Initialize autoconf and automake
-AC_INIT(src/openbox.cc)
-AM_INIT_AUTOMAKE(openbox,1.1.0,no-define)
+AC_INIT(src/blackbox.cc)
+AM_INIT_AUTOMAKE(openbox,2.0.0,no-define)
 
 dnl Determine default prefix
 test x$prefix = "xNONE" && prefix="$ac_default_prefix"
@@ -15,15 +15,13 @@ AC_PROG_CC
 AC_PROG_CXX
 AC_PROG_INSTALL
 
-AC_LANG_CPLUSPLUS
-
 AC_CHECK_PROGS(regex_cmd, sed)
 if test x$regex_cmd = "x"; then
   AC_MSG_ERROR([error. sed is required to build the default menu file.])
 fi
 
 dnl Check for system header files
-AC_CHECK_HEADERS(ctype.h dirent.h fcntl.h libgen.h locale.h nl_types.h process.h signal.h stdarg.h stdio.h string.h stdlib.h time.h unistd.h sys/param.h sys/select.h sys/signal.h sys/stat.h sys/time.h sys/types.h sys/wait.h sstream)
+AC_CHECK_HEADERS(ctype.h dirent.h fcntl.h libgen.h locale.h nl_types.h process.h signal.h stdarg.h stdio.h string.h stdlib.h time.h unistd.h sys/param.h sys/select.h sys/signal.h sys/stat.h sys/time.h sys/types.h sys/wait.h)
 AC_HEADER_TIME
 
 dnl Check for existance of basename(), setlocale() and strftime()
@@ -74,16 +72,17 @@ if test x$enableval = "xyes"; then
 #include <X11/extensions/shape.h>
 , long foo = ShapeSet,
       AC_MSG_RESULT([yes])
-      SHAPE="-DSHAPE"; Xext_lib="-lXext",
+      SHAPE="yes",
       AC_MSG_RESULT([no])
     )
   )
 else
   AC_MSG_RESULT([no])
 fi
-AC_SUBST(SHAPE)
-
-LIBS="$LIBS $Xext_lib"
+if test x$SHAPE = "xyes"; then
+  LIBS="$LIBS -lXext"
+  AC_DEFINE(SHAPE,1,Enable support of the XShape extension)
+fi
 
 dnl Check for the Slit
 SLIT=""
@@ -92,48 +91,16 @@ AC_ARG_ENABLE(
   slit, [  --enable-slit           include code for the Slit [default=yes]],
   if test x$enableval = "xyes"; then
     AC_MSG_RESULT([yes])
-    SLIT="-DSLIT"
+    SLIT="yes"
   else
     AC_MSG_RESULT([no])
   fi,
   AC_MSG_RESULT([yes])
-  SLIT="-DSLIT"
+  SLIT="yes"
 )
-AC_SUBST(SLIT)
-
-dnl Check for the new WM Spec
-NEWWMSPEC=""
-AC_MSG_CHECKING([whether to include the new WM Spec (DOES NOTHING)])
-AC_ARG_ENABLE(
-  newspec,
-[  --enable-newspec        include code for the new WM Spec (DOES NOTHING)
-                          [default=no]],
-  if test x$enableval = "xyes"; then
-    AC_MSG_RESULT([yes])
-    NEWWMSPEC="-DNEWWMSPEC"   
-  else
-    AC_MSG_RESULT([no])
-  fi,
-  AC_MSG_RESULT([no])
-)
-AC_SUBST(NEWWMSPEC)
-
-
-dnl Check for Interlacing
-INTERLACE=""
-AC_MSG_CHECKING([whether to include interlacing image code])
-AC_ARG_ENABLE(
-  interlace, [  --enable-interlace      include code for image interlacing [default=yes]],
-  if test x$enableval = "xyes"; then
-    AC_MSG_RESULT([yes])
-    INTERLACE="-DINTERLACE"
-  else
-    AC_MSG_RESULT([no])
-  fi,
-  AC_MSG_RESULT([yes])
-  INTERLACE="-DINTERLACE"
-)
-AC_SUBST(INTERLACE)
+if test x$SLIT = "xyes"; then
+  AC_DEFINE(SLIT,1,Enable the Slit)
+fi
 
 dnl Check for ordered 8bpp dithering
 ORDEREDPSEUDO=""
@@ -143,13 +110,15 @@ AC_ARG_ENABLE(ordered-pseudo,
                           dithering [default=no]],
   if test x$enableval = "xyes"; then
     AC_MSG_RESULT([yes])
-    ORDEREDPSEUDO="-DORDEREDPSEUDO" 
+    ORDEREDPSEUDO="yes" 
   else
     AC_MSG_RESULT([no]) 
   fi,
   AC_MSG_RESULT([no])
 )
-AC_SUBST(ORDEREDPSEUDO)
+if test x$ORDEREDPSEUDO = "xyes"; then
+  AC_DEFINE(ORDEREDPSEUDO,1,Enable pseudocolor ordered dithering)
+fi
 
 dnl Check for event clobbering
 CLOBBER=""
@@ -159,13 +128,15 @@ AC_ARG_ENABLE(clobber,
                          or scroll lock are on [default=yes]],
   if test x$enableval = "xno"; then
     AC_MSG_RESULT([no])
-    CLOBBER="-DNOCLOBBER" 
+    CLOBBER="no"
   else
     AC_MSG_RESULT([yes]) 
   fi,
-  AC_MSG_RESULT([no])
+  AC_MSG_RESULT([yes])
 )
-AC_SUBST(CLOBBER)
+if test x$CLOBBER = "xno"; then
+  AC_DEFINE(NOCLOBBER,1,Disable grabbing of mouse events when num/scoll lock is pressed)
+fi
 
 dnl Check whether to include debugging code
 DEBUG=""
@@ -174,11 +145,13 @@ AC_ARG_ENABLE(debug,
   [  --enable-debug          include verbose debugging code [default=no]],
   if test x$enableval = "xyes"; then
     AC_MSG_RESULT([yes])
-    DEBUG="-DDEBUG"
+    DEBUG="-DDEBUG -Wall -W"
   else
     AC_MSG_RESULT([no])
+    DEBUG="-DNDEBUG"
   fi,
   AC_MSG_RESULT([no])
+  DEBUG="-DNDEBUG"
 )
 AC_SUBST(DEBUG)
 
@@ -189,14 +162,13 @@ AC_ARG_ENABLE(nls,
   [  --enable-nls            include natural language support [default=yes]],
   if test x$enableval = "xyes"; then
     AC_MSG_RESULT([yes])
-    NLS="-DNLS"
+    NLS="yes"
   else
     AC_MSG_RESULT([no])
   fi,
   AC_MSG_RESULT([yes])
-  NLS="-DNLS"
+  NLS="yes"
 )
-AC_SUBST(NLS)
 
 AC_CHECK_LIB(xpg4, setlocale, LIBS="$LIBS -lxpg4")
 
@@ -205,23 +177,29 @@ if test x$gencat_cmd = "x"; then
   NLS=""
 fi
 
+if test x$NLS = "xyes"; then
+  AC_DEFINE(NLS,1,Include natural language support)
+  AC_SUBST(NLS)
+fi
 
 dnl Check for new timed pixmap cache
 TIMEDCACHE=""
-AC_MSG_CHECKING([whether to use the new timed pixmap cache])
+AC_MSG_CHECKING([whether to use the timed pixmap cache])
 AC_ARG_ENABLE(
   timed-cache,
-[  --enable-timed-cache    use new timed pixmap cache [default=yes]],
+[  --enable-timed-cache    use timed pixmap cache [default=yes]],
   if test x$enableval = "xyes"; then
     AC_MSG_RESULT([yes])
-    TIMEDCACHE="-DTIMEDCACHE"
+    TIMEDCACHE="yes"
   else
     AC_MSG_RESULT([no])
   fi,
   AC_MSG_RESULT([yes])
-  TIMEDCACHE="-DTIMEDCACHE"
+  TIMEDCACHE="yes"
 )
-AC_SUBST(TIMEDCACHE)
+if test x$TIMEDCACHE = "xyes"; then
+  AC_DEFINE(TIMEDCACHE,1,Use timed pixmap cache)
+fi
 
 dnl Determine the return type of signal handlers
 AC_TYPE_SIGNAL
@@ -247,9 +225,6 @@ util/Makefile
 data/Makefile
 data/styles/Makefile
 doc/Makefile
-dnl doc/ja_JP/Makefile
-dnl doc/nl_NL/Makefile
-dnl doc/sl_SI/Makefile
 nls/Makefile
 nls/C/Makefile
 nls/da_DK/Makefile
@@ -257,6 +232,7 @@ nls/de_DE/Makefile
 nls/es_ES/Makefile
 nls/et_EE/Makefile
 nls/fr_FR/Makefile
+nls/hu_HU/Makefile
 nls/it_IT/Makefile
 nls/ja_JP/Makefile
 nls/nl_NL/Makefile
@@ -265,5 +241,7 @@ nls/ru_RU/Makefile
 nls/sl_SI/Makefile
 nls/sv_SE/Makefile
 nls/tr_TR/Makefile
+nls/uk_UA/Makefile
 nls/zh_CN/Makefile
+nls/zh_TW/Makefile
 version.h)