X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=configure.ac;h=811de5de5f989a61929310e8fd7c28dfd3d867b1;hb=f54e8c9ba0a0b4e78a1038a3d3a9644288c6cb4c;hp=70b66445596f7068274c42787c223b52e4b80795;hpb=f4e2fc32743309dae8663f9e47a4e2f4d941d1b5;p=chaz%2Fopenbox

diff --git a/configure.ac b/configure.ac
index 70b66445..811de5de 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,300 +1,96 @@
-AC_INIT([src/main.cc])
-AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE([openbox], [2.90.0cvs])
-
 AC_PREREQ([2.50])
+AC_INIT([openbox], [2.90.0cvs], [http://bugzilla.icculus.org])
+AM_INIT_AUTOMAKE
+AC_CONFIG_SRCDIR([kernel/openbox.c])
 
-AC_PATH_PROG([regex_cmd], [sed])
-test -z $regex_cmd && AC_MSG_ERROR([sed not found])
-
-AC_PROG_CC
-AC_PROG_CXX
-AC_PROG_LIBTOOL
-LIBTOOL="$LIBTOOL --silent"
-AC_PROG_INSTALL
-
-ALL_LINGUAS=""
-AM_GNU_GETTEXT
+AC_PREFIX_DEFAULT([/usr/local])
+test "$prefix" = "NONE" && prefix=$ac_default_prefix
 
-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
+AC_PATH_PROG([SED], [sed])
+test "$SED" || AC_MSG_ERROR([sed not found])
 
-dnl Determine if maintainer portions of the Makefiles should be included.
-AM_MAINTAINER_MODE
+# Determine build target
+OB_DEBUG
+# Pick compiler specific/build target flags, and set $CVS
+OB_COMPILER_FLAGS
+AC_C_CONST
+AC_C_INLINE
 
-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 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
+if test "$CVS" = "yes"; then
+    AC_PATH_PROG([FLEX], [flex])
+    test "$FLEX" || AC_MSG_ERROR([flex not found])
 
-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 "$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],
-  ,
-  AC_MSG_ERROR([Could not find XOpenDisplay in -lX11.])
-)
-
-
-dnl Check for Xft >= 2
-XFT_MIN_MAJOR=2
-XFT_MIN_MINOR=0
-XFT_MIN_REVISION=0
-XFT_MIN=$XFT_MIN_MAJOR.$XFT_MIN_MINOR.$XFT_MIN_REVISION
-AC_MSG_CHECKING([for Xft version >= $XFT_MIN])
-if ! pkg-config --atleast-version $XFT_MIN xft; then
-  AC_MSG_RESULT([no])
-  AC_MSG_ERROR([Openbox requires the Xft version >= $XFT_MIN font library.
-See http://www.fontconfig.org/
-])
+    AC_PATH_PROG([BISON], [bison])
+    test "BISON" || AC_MSG_ERROR([bison not found])
 fi
 
-AC_MSG_RESULT([yes])
-
-dnl Store these
-OLDLIBS=$LIBS
-OLDCPPFLAGS=$CPPFLAGS
-
-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"
-
-AC_CHECK_LIB([Xft], [XftFontOpenName],
-  AC_MSG_CHECKING([for X11/Xft/Xft.h for Xft >= $XFT_MIN])
-  AC_TRY_COMPILE(
-    [
-      #include <X11/Xlib.h>
-      #include <X11/Xft/Xft.h>
-    ],
-    [
-      #if !defined(XFT_MAJOR)
-      # error Xft.h is too old
-      #endif
-      #if XFT_MAJOR < $XFT_MIN_MAJOR
-      # error Xft.h is too old
-      #endif
-      #if XFT_MAJOR == $XFT_MIN_MAJOR
-      # if XFT_MINOR < $XFT_MIN_MINOR
-      #  error Xft.h is too old
-      # endif
-      #endif
-      #if XFT_MAJOR == $XFT_MIN_MAJOR
-      # if XFT_MAJOR == $XFT_MIN_MINOR
-      #  if XFT_REVISION < $XFT_MIN_REVISION
-      #   error Xft.h is too old
-      #  endif
-      # endif
-      #endif
-      
-      int i = XFT_MAJOR;
-      XftFont foo;
-    ],
-    [
-      AC_MSG_RESULT([yes])
-    ],
-    [
-      AC_MSG_RESULT([no])
-      AC_MSG_ERROR([Openbox requires the Xft version >= $XFT_MIN font library.
-See http://www.fontconfig.org/
-])
-    ]
-  )
-
-  AC_MSG_CHECKING([if we can compile with Xft])
-  AC_TRY_LINK(
-    [
-      #include <X11/Xlib.h>
-      #include <X11/Xft/Xft.h>
-    ],
-    [
-      int i = XFT_MAJOR;
-      XftFont foo
-    ],
-    [
-      AC_MSG_RESULT([yes])
-    ],
-    [ 
-      AC_MSG_RESULT([no])
-      AC_MSG_ERROR([Unable to compile with the Xft library.
-])
-    ]
-  )
-)
-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])
+AC_DISABLE_STATIC
+AC_LIBTOOL_DLOPEN
+AC_PROG_LIBTOOL
+AC_SUBST(LIBTOOL_DEPS)
+LIBTOOL="$LIBTOOL --silent"
 
-dnl Check for Guile
-GUILE_FLAGS
-if ! test "$GUILE_CFLAGS" && ! test "$GUILE_LDFLAGS"; then
-  AC_MSG_ERROR([Openbox requires the Guile language to be installed.
-See http://www.gnu.org/software/guile/ .
-])
-fi
-		
-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_MSG_CHECKING([for the XShape extension])
-if test "$SHAPE" = "yes"; then
-  AC_MSG_RESULT([yes])
-else
-  AC_MSG_RESULT([no])
-fi
+AC_PROG_INSTALL
 
-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])
+ALL_LINGUAS=""
+AM_GNU_GETTEXT_VERSION(0.11.5)
+AM_GNU_GETTEXT([external])
 
-	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_CHECK_HEADERS(ctype.h fcntl.h locale.h signal.h string.h stdio.h stdlib.h)
+AC_CHECK_HEADERS(unistd.h sys/stat.h sys/select.h sys/time.h sys/wait.h)
+# AC_HEADER_TIME
+# AC_TYPE_SIGNAL
 
-    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])
-  fi,
-  AC_MSG_RESULT([no])
+PKG_CHECK_MODULES([GLIB], [glib-2.0])
+AC_SUBST(GLIB_CFLAGS)
+AC_SUBST(GLIB_LIBS)
+	
+PKG_CHECK_MODULES([GMODULE], [gmodule-2.0])
+AC_SUBST(GMODULE_CFLAGS)
+AC_SUBST(GMODULE_LIBS)
+
+PKG_CHECK_MODULES(XFT, [xft])
+AC_SUBST(XFT_CFLAGS)
+AC_SUBST(XFT_LIBS)
+
+PKG_CHECK_MODULES(LIBSN, [libstartup-notification-1.0],
+  [
+    AC_DEFINE(USE_LIBSN)
+    AC_SUBST(LIBSN_CFLAGS)
+    AC_SUBST(LIBSN_LIBS)
+  ],
+  [
+    no_such_luck=yes
+  ]
 )
 
+# Check for X11 extensions
+X11_EXT_XKB
+X11_EXT_XRANDR
+X11_EXT_VIDMODE
+X11_EXT_SHAPE
+X11_EXT_XINERAMA
 
+GL_OPTION
 
 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
-		])
+                 po/Makefile.in
+                 themes/Makefile
+		 data/Makefile
+                 render/Makefile
+                 kernel/Makefile
+		 plugins/Makefile
+		 plugins/placement/Makefile
+		 plugins/mouse/Makefile
+		 plugins/keyboard/Makefile
+		 plugins/menu/Makefile])
 AC_OUTPUT
 
 AC_MSG_RESULT
-AC_MSG_RESULT([$PACKAGE version $VERSION configured successfully.])
-
-AC_MSG_RESULT
-AC_MSG_RESULT([Using '$prefix' for installation.])
-AC_MSG_RESULT([Using '$CXX' for C++ compiler.])
-AC_MSG_RESULT([Building with '$CPPFLAGS' for C++ compiler flags.])
-AC_MSG_RESULT([Building with '$LIBS' for linker flags.])
+if test "$DEBUG" = "yes"; then
+  AC_MSG_RESULT([Creating a DEBUG build.])
+else
+  AC_MSG_RESULT([Creating a RELEASE build.])
+fi
 AC_MSG_RESULT
 AC_MSG_RESULT([configure complete, now type \"make\"])
-AC_MSG_RESULT