X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=configure.ac;h=6b5537e62d1e32be21453d8078e18cfd6be0188d;hb=7df3b620e21777dbefa24f381c1a95fafed1c16e;hp=ae460597aa7851561b9d3793c24782492cf6190e;hpb=7ca4d98726f40fe6ec5b1335ee02d05ba0c18e57;p=chaz%2Fopenbox

diff --git a/configure.ac b/configure.ac
index ae460597..6b5537e6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,234 +1,248 @@
-dnl configure.in for Openbox
-dnl Initialize autoconf and automake
-AC_INIT(src/blackbox.cc)
-AM_INIT_AUTOMAKE(openbox,2.0.0,no-define)
-AC_CONFIG_HEADERS(config.h)
+AC_INIT([src/main.cc])
+AM_CONFIG_HEADER(config.h)
+AM_INIT_AUTOMAKE([openbox], [2.90.0cvs])
 
-dnl Determine default prefix
-test x$prefix = "xNONE" && prefix="$ac_default_prefix"
+AC_PREREQ([2.50])
 
-dnl Check for various flavors of UNIX(r)
-dnl AC_AIX
-dnl AC_ISC_POSIX
+AC_PATH_PROG([regex_cmd], [sed])
+test -z $regex_cmd && AC_MSG_ERROR([sed not found])
 
-dnl Locate required external software
 AC_PROG_CC
 AC_PROG_CXX
+AC_PROG_LIBTOOL
+LIBTOOL="$LIBTOOL --silent"
 AC_PROG_INSTALL
 
-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.])
+ALL_LINGUAS=""
+AM_GNU_GETTEXT
+
+AC_LANG(C++)
+	
+dnl Check what compiler we are using
+AC_MSG_CHECKING([for GCC])
+if test "$GCC" = "yes"; then
+  AC_MSG_RESULT([yes])
+  CPPFLAGS="$CPPFLAGS -Wall -W -pedantic"
+else
+  AC_MSG_RESULT([no, trying other compilers])
+  AC_MSG_CHECKING(for MIPSpro)
+  mips_pro_ver=`$CXX -version 2>&1 | grep -i mipspro | cut -f4 -d ' '`
+  if test -z "$mips_pro_ver"; then
+    AC_MSG_RESULT([no])
+  else
+    AC_MSG_RESULT([yes, version $mips_pro_ver.])
+    AC_MSG_CHECKING(for -LANG:std in CPPFLAGS)
+    lang_std_not_set=`echo $CPPFLAGS | grep "\-LANG:std"`
+    if test "x$lang_std_not_set" = "x"; then
+      AC_MSG_RESULT([not set, setting.])
+      CPPFLAGS="${CPPFLAGS} -LANG:std"
+    else
+      AC_MSG_RESULT([already set.])
+    fi
+  fi
 fi
 
+dnl Determine if maintainer portions of the Makefiles should be included.
+AM_MAINTAINER_MODE
+
 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)
+AC_CHECK_HEADERS(ctype.h dirent.h fcntl.h libgen.h locale.h nl_types.h process.h signal.h stdarg.h stdio.h stdlib.h string.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()
-AC_CHECK_FUNCS(basename, , AC_CHECK_LIB(gen, basename,
-			  AC_DEFINE(HAVE_BASENAME) LIBS="$LIBS -lgen"))
-AC_CHECK_FUNCS(getpid setlocale sigaction strftime strcasestr snprintf vsnprintf catopen catgets catclose)
-AC_CHECK_LIB(nsl, t_open, LIBS="$LIBS -lnsl")
-AC_CHECK_LIB(socket, socket, LIBS="$LIBS -lsocket")
+dnl Determine the return type of signal handlers
+AC_TYPE_SIGNAL
+
+dnl Check whether to include debugging code
+DEBUG=""
+AC_MSG_CHECKING([whether to include verbose debugging code])
+AC_ARG_ENABLE([debug],
+  [  --enable-debug          include verbose debugging code @<:@default=no@:>@],
+  if test "$enableval" = "yes"; then
+    AC_MSG_RESULT([yes])
+    if test "$GCC" = "yes"; then
+       DEBUG="-DDEBUG -fno-inline -g"
+    else
+       DEBUG="-DDEBUG"
+    fi
+  else
+    AC_MSG_RESULT([no])
+    DEBUG="-DNDEBUG"
+  fi,
+  AC_MSG_RESULT([no])
+  DEBUG="-DNDEBUG"
+)
+CPPFLAGS="$CPPFLAGS $DEBUG"
 
 dnl Check for X headers and libraries
 AC_PATH_X
 AC_PATH_XTRA
-
-test x$no_x = "xyes" && AC_MSG_ERROR([Openbox requires the X Window System libraries and headers.])
-
-test x$x_includes = "x" && x_includes="/usr/include"
-test x$x_libraries = "x" && x_libraries="/usr/lib"
-
-CFLAGS="$CFLAGS $X_CFLAGS"
-CXXFLAGS="$CXXFLAGS $X_CFLAGS"
-LIBS="$LIBS $X_LIBS"
-LDFLAGS="$LDFLAGS $LIBS $X_PRE_LIBS"
+test "$no_x" = "yes" && AC_MSG_ERROR([No Xlibs found.])
+test -z "$x_includes" && x_includes="/usr/include"
+test -z "$x_libraries" && x_libraries="/usr/lib"
+     
+CPPFLAGS="$CPPFLAGS $X_CPPFLAGS"
+LIBS="$LIBS $X_LIBS $X_EXTRA_LIBS"
+LDFLAGS="$LDFLAGS $X_PRE_LIBS $LIBS $X_EXTRA_LIBS"
 
 dnl Check for required functions in -lX11
-AC_CHECK_LIB(X11, XOpenDisplay,
-  LIBS="$LIBS -lX11",
+AC_CHECK_LIB([X11], [XOpenDisplay],
+  ,
   AC_MSG_ERROR([Could not find XOpenDisplay in -lX11.])
 )
 
-LIBS="$LIBS $X_EXTRA_LIBS"
-
-Xext_lib=""
-
-dnl Check for XShape extension support and proper library files.
-SHAPE=""
-AC_MSG_CHECKING([whether to build support for the XShape extension])
-AC_ARG_ENABLE(
-  shape, [  --enable-shape          enable support of the XShape extension [default=yes]])
 
-: ${enableval="yes"}
-if test x$enableval = "xyes"; then
+dnl Check for Xft2
+AC_MSG_CHECKING([for Xft version 2])
+dnl Store these
+OLDLIBS=$LIBS
+OLDCPPFLAGS=$CPPFLAGS
+XFT2=""
+XFT_CFLAGS=""
+XFT_LIBS=""
+if pkg-config xft; then
   AC_MSG_RESULT([yes])
-  AC_CHECK_LIB(Xext, XShapeCombineShape,
-    AC_MSG_CHECKING([for X11/extensions/shape.h])
-    AC_TRY_LINK(
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-#include <X11/extensions/shape.h>
-, long foo = ShapeSet,
-      AC_MSG_RESULT([yes])
-      SHAPE="-DSHAPE"; Xext_lib="-lXext",
-      AC_MSG_RESULT([no])
-    )
-  )
+  XFT_CFLAGS="`pkg-config --cflags xft`"
+  XFT_LIBS="`pkg-config --libs xft`"
+
+  dnl Set these for checking with the tests below. They'll be restored after
+  LIBS="$LIBS $XFT_LIBS"
+  CPPFLAGS="$XFT_CFLAGS $CPPFLAGS"
 else
+  dnl This is for Xft version 1
+  XFT_LIBS="-lXft"
   AC_MSG_RESULT([no])
 fi
-AC_SUBST(SHAPE)
-
-LIBS="$LIBS $Xext_lib"
 
-dnl Check for the Slit
-SLIT=""
-AC_MSG_CHECKING([whether to include the Slit])
-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"
-  else
-    AC_MSG_RESULT([no])
-  fi,
-  AC_MSG_RESULT([yes])
-  SLIT="-DSLIT"
+AC_CHECK_LIB([Xft], [XftFontOpenXlfd],
+  AC_MSG_CHECKING([for X11/Xft/Xft.h])
+  AC_TRY_LINK(
+    [
+      #include <X11/Xlib.h>
+      #include <X11/Xft/Xft.h>
+    ],
+    [
+      XftFont foo
+    ],
+    [
+      AC_MSG_RESULT([yes])
+    ],
+    [ 
+      AC_MSG_RESULT([no])
+      AC_MSG_ERROR([Openbox requires the Xft font library.
+See http://www.fontconfig.org/
+])
+    ]
+  )
 )
-AC_SUBST(SLIT)
-
-dnl Check for ordered 8bpp dithering
-ORDEREDPSEUDO=""
-AC_MSG_CHECKING([whether to include Pseudocolor ordered dithering code])
-AC_ARG_ENABLE(ordered-pseudo,
-[  --enable-ordered-pseudo include code for ordered pseudocolor (8bpp)
-                          dithering [default=no]],
-  if test x$enableval = "xyes"; then
-    AC_MSG_RESULT([yes])
-    ORDEREDPSEUDO="-DORDEREDPSEUDO" 
-  else
-    AC_MSG_RESULT([no]) 
-  fi,
-  AC_MSG_RESULT([no])
+dnl Restore the old values. Use XFT_CFLAGS and XFT_LIBS in the Makefile.am's
+LIBS=$OLDLIBS
+CPPFLAGS=$OLDCPPFLAGS
+
+AC_SUBST([XFT_CFLAGS])
+AC_SUBST([XFT_LIBS])
+
+dnl Check for XShape extension support
+AC_CHECK_LIB([Xext], [XShapeCombineShape],
+  AC_MSG_CHECKING([for X11/extensions/shape.h])
+  AC_TRY_LINK(
+    [
+      #include <X11/Xlib.h>
+      #include <X11/Xutil.h>
+      #include <X11/extensions/shape.h>
+    ],
+    [
+      long foo = ShapeSet
+    ],
+    [
+      AC_MSG_RESULT([yes])
+      SHAPE="yes"
+      AC_DEFINE([SHAPE], [1], [Found the XShape extension])
+      LIBS="$LIBS -lXext"
+    ],
+    [ 
+      AC_MSG_RESULT([no])
+      SHAPE="no"
+    ]
+  )
 )
-AC_SUBST(ORDEREDPSEUDO)
-
-dnl Check for event clobbering
-CLOBBER=""
-AC_MSG_CHECKING([whether to intercept mouse events to clients])
-AC_ARG_ENABLE(clobber,
-[  --enable-clobber        intercept mouse events to clients when num lock 
-			  or scroll lock are on [default=yes]],
-  if test x$enableval = "xno"; then
-    AC_MSG_RESULT([no])
-    CLOBBER="-DNOCLOBBER" 
-  else
-    AC_MSG_RESULT([yes]) 
-  fi,
+AC_MSG_CHECKING([for the XShape extension])
+if test "$SHAPE" = "yes"; then
+  AC_MSG_RESULT([yes])
+else
   AC_MSG_RESULT([no])
-)
-AC_SUBST(CLOBBER)
+fi
 
-dnl Check whether to include debugging code
-DEBUG=""
-AC_MSG_CHECKING([whether to include verbose debugging code])
-AC_ARG_ENABLE(debug,
-  [  --enable-debug          include verbose debugging code [default=no]],
-  if test x$enableval = "xyes"; then
-    AC_MSG_RESULT([yes])
-    DEBUG="-DDEBUG -Wall -W"
+dnl Check for Xinerama extension support
+AC_MSG_CHECKING([whether to build support for the Xinerama extension])
+XINERAMA="no"
+AC_ARG_ENABLE([xinerama],
+[  --enable-xinerama       enable support of the Xinerama extension @<:@default=no@:>@],
+  if test "$enableval" = "yes"; then
+	AC_MSG_RESULT([yes])
+
+	AC_CHECK_LIB([Xinerama], [XineramaQueryExtension],
+	  [
+	    AC_MSG_CHECKING([for X11/extensions/Xinerama.h])
+	    AC_TRY_LINK(
+	      [
+                #include <X11/Xlib.h>
+                #include <X11/extensions/Xinerama.h>
+	      ],
+	      [
+                XineramaScreenInfo foo
+	      ],
+	      [
+	        AC_MSG_RESULT([yes])
+	        XINERAMA="yes"
+	        AC_DEFINE([XINERAMA], [1],
+	                  [Enable support of the Xinerama extension])
+	        LIBS="$LIBS -lXinerama"
+	      ],
+	      [
+	        AC_MSG_RESULT([no])
+	      ]
+	    )
+	  ]
+	)
+
+    AC_MSG_CHECKING([for the Xinerama extension])
+    if test "$XINRERAMA" = "yes"; then
+      AC_MSG_RESULT([yes])
+    else
+      AC_MSG_RESULT([no])
+    fi
   else
-    AC_MSG_RESULT([no])
+	AC_MSG_RESULT([no])
   fi,
   AC_MSG_RESULT([no])
 )
-AC_SUBST(DEBUG)
-
-dnl Check whether to include natural language support (i18n)
-NLS=""
-AC_MSG_CHECKING([whether to include NLS support])
-AC_ARG_ENABLE(nls,
-  [  --enable-nls            include natural language support [default=yes]],
-  if test x$enableval = "xyes"; then
-    AC_MSG_RESULT([yes])
-    NLS="-DNLS"
-  else
-    AC_MSG_RESULT([no])
-  fi,
-  AC_MSG_RESULT([yes])
-  NLS="-DNLS"
-)
-AC_SUBST(NLS)
 
-AC_CHECK_LIB(xpg4, setlocale, LIBS="$LIBS -lxpg4")
 
-AC_CHECK_PROGS(gencat_cmd, gencat)
-if test x$gencat_cmd = "x"; then
-  NLS=""
-fi
-
-
-dnl Check for new timed pixmap cache
-TIMEDCACHE=""
-AC_MSG_CHECKING([whether to use the new timed pixmap cache])
-AC_ARG_ENABLE(
-  timed-cache,
-[  --enable-timed-cache    use new timed pixmap cache [default=yes]],
-  if test x$enableval = "xyes"; then
-    AC_MSG_RESULT([yes])
-    TIMEDCACHE="-DTIMEDCACHE"
-  else
-    AC_MSG_RESULT([no])
-  fi,
-  AC_MSG_RESULT([yes])
-  TIMEDCACHE="-DTIMEDCACHE"
-)
-AC_SUBST(TIMEDCACHE)
 
-dnl Determine the return type of signal handlers
-AC_TYPE_SIGNAL
+AC_CONFIG_FILES([Makefile
+		m4/Makefile 
+		po/Makefile.in
+		intl/Makefile
+		otk/Makefile
+		src/Makefile
+		util/Makefile
+		util/epist/Makefile
+		doc/Makefile
+		doc/doxygen/Makefile
+		data/Makefile
+		data/styles/Makefile
+		version.h
+		])
+AC_OUTPUT
 
-dnl Determine if maintainer portions of the Makefiles should be included.
-AM_MAINTAINER_MODE
+AC_MSG_RESULT
+AC_MSG_RESULT([$PACKAGE version $VERSION configured successfully.])
 
-dnl Print results
-AC_MSG_RESULT([])
-AC_MSG_RESULT([	$PACKAGE version $VERSION configured successfully.])
-AC_MSG_RESULT([])
+AC_MSG_RESULT
 AC_MSG_RESULT([Using '$prefix' for installation.])
 AC_MSG_RESULT([Using '$CXX' for C++ compiler.])
-AC_MSG_RESULT([Building with '$CXXFLAGS' for C++ compiler flags.])
+AC_MSG_RESULT([Building with '$CPPFLAGS' for C++ compiler flags.])
 AC_MSG_RESULT([Building with '$LIBS' for linker flags.])
-AC_MSG_RESULT([])
-
-dnl Output files
-AM_CONFIG_HEADER(config.h)
-AC_OUTPUT(Makefile
-src/Makefile
-util/Makefile
-data/Makefile
-data/styles/Makefile
-doc/Makefile
-nls/Makefile
-nls/C/Makefile
-nls/da_DK/Makefile
-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
-nls/pt_BR/Makefile
-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)
+AC_MSG_RESULT
+AC_MSG_RESULT([configure complete, now type \"make\"])
+AC_MSG_RESULT
\ No newline at end of file