X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=configure.ac;h=a18330907ad6b61609d3742d5b08655a303556b6;hb=6eb740cf119b14903afa3028e108dd98c57ff926;hp=3b4a21d8dddc4ed8ac443bcada5583e997d21be5;hpb=bca71305271412280e963bf6eb09c31ce83fc765;p=chaz%2Fopenbox

diff --git a/configure.ac b/configure.ac
index 3b4a21d8..a1833090 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,179 +1,238 @@
-AC_INIT(src/blackbox.cc)
-AM_INIT_AUTOMAKE(openbox, 2.90.0, no-define)
+AC_PREREQ([2.54])
+AC_INIT([openbox], [3.5.0], [http://bugzilla.icculus.org])
+AC_CONFIG_SRCDIR([openbox/openbox.c])
+
+AM_INIT_AUTOMAKE([foreign])
+AM_SILENT_RULES([yes])
+
+OB_VERSION=$PACKAGE_VERSION
+AC_SUBST(OB_VERSION)
+
+dnl Making releases:
+dnl   RR_MICRO_VERSION += 1;
+dnl   RR_INTERFACE_AGE += 1;
+dnl   R_BINARY_AGE += 1;
+dnl if any functions have been added, set RR_INTERFACE_AGE to 0.
+dnl if backwards compatibility has been broken,
+dnl set RR_BINARY_AGE and RR_INTERFACE_AGE to 0.
+dnl
+dnl if MAJOR or MINOR version changes, be sure to change AC_INIT above to match
+dnl
+RR_MAJOR_VERSION=3
+RR_MINOR_VERSION=5
+RR_MICRO_VERSION=28
+RR_INTERFACE_AGE=1
+RR_BINARY_AGE=1
+RR_VERSION=$RR_MAJOR_VERSION.$RR_MINOR_VERSION
+
+OBT_MAJOR_VERSION=3
+OBT_MINOR_VERSION=5
+OBT_MICRO_VERSION=1
+OBT_INTERFACE_AGE=1
+OBT_BINARY_AGE=1
+OBT_VERSION=$OBT_MAJOR_VERSION.$OBT_MINOR_VERSION
+
+AC_SUBST(RR_MAJOR_VERSION)
+AC_SUBST(RR_MINOR_VERSION)
+AC_SUBST(RR_MICRO_VERSION)
+AC_SUBST(RR_INTERFACE_AGE)
+AC_SUBST(RR_BINARY_AGE)
+AC_SUBST(RR_VERSION)
+AC_SUBST(OBT_MAJOR_VERSION)
+AC_SUBST(OBT_MINOR_VERSION)
+AC_SUBST(OBT_MICRO_VERSION)
+AC_SUBST(OBT_INTERFACE_AGE)
+AC_SUBST(OBT_BINARY_AGE)
+AC_SUBST(OBT_VERSION)
+
+dnl Libtool versioning
+RR_RELEASE=$RR_MAJOR_VERSION.$RR_MINOR_VERSION
+RR_CURRENT=`expr $RR_MICRO_VERSION - $RR_INTERFACE_AGE`
+RR_REVISION=$RR_INTERFACE_AGE
+RR_AGE=`expr $RR_BINARY_AGE - $RR_INTERFACE_AGE`
+RR_CURRENT_MINUS_AGE=`expr $RR_CURRENT - $RR_AGE`
+
+OBT_RELEASE=$OBT_MAJOR_VERSION.$OBT_MINOR_VERSION
+OBT_CURRENT=`expr $OBT_MICRO_VERSION - $OBT_INTERFACE_AGE`
+OBT_REVISION=$OBT_INTERFACE_AGE
+OBT_AGE=`expr $OBT_BINARY_AGE - $OBT_INTERFACE_AGE`
+OBT_CURRENT_MINUS_AGE=`expr $OBT_CURRENT - $OBT_AGE`
+
+AC_SUBST(RR_RELEASE)
+AC_SUBST(RR_CURRENT)
+AC_SUBST(RR_REVISION)
+AC_SUBST(RR_AGE)
+AC_SUBST(RR_CURRENT_MINUS_AGE)
+AC_SUBST(OBT_RELEASE)
+AC_SUBST(OBT_CURRENT)
+AC_SUBST(OBT_REVISION)
+AC_SUBST(OBT_AGE)
+AC_SUBST(OBT_CURRENT_MINUS_AGE)
+
+AC_PREFIX_DEFAULT([/usr/local])
+test "$prefix" = "NONE" && prefix=$ac_default_prefix
+
+dnl Determine build target
+OB_DEBUG
+dnl Pick compiler specific/build target flags, and set $CVS
+AM_PROG_CC_C_O
+OB_COMPILER_FLAGS
+AC_C_CONST
+AC_C_INLINE
 
-dnl Check for check
-AM_PATH_CHECK
+AC_PROG_LIBTOOL
+AC_SUBST(LIBTOOL_DEPS)
+LIBTOOL="$LIBTOOL --silent"
 
-dnl Determine default prefix
-test "$prefix" = "NONE" && prefix="$ac_default_prefix"
+AC_PROG_INSTALL
 
-dnl We're in the C++ world
-AC_LANG(C++)
+AM_GNU_GETTEXT_VERSION(0.15)
+AM_GNU_GETTEXT([external])
 
-AC_PROG_CC
-AC_PROG_CXX
-AC_PROG_INSTALL
-AC_PROG_LIBTOOL
+AC_CHECK_HEADERS(ctype.h dirent.h errno.h fcntl.h grp.h locale.h pwd.h)
+AC_CHECK_HEADERS(signal.h string.h stdio.h stdlib.h unistd.h sys/stat.h)
+AC_CHECK_HEADERS(sys/select.h sys/socket.h sys/time.h sys/types.h sys/wait.h)
 
-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.])
+AC_PATH_PROG([SED], [sed], [no])
+if test "$SED" = "no"; then
+  AC_MSG_ERROR([The program "sed" is not available. This program is required to build Openbox.])
 fi
 
-dnl Check what compiler we are using
-AC_MSG_CHECKING(for GCC)
-if test "$GCC" = "yes"; then
-  AC_MSG_RESULT([yes])
-  CXXFLAGS="$CXXFLAGS -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 CXXFLAGS)
-    lang_std_not_set=`echo $CXXFLAGS | grep "\-LANG:std"`
-    if test "x$lang_std_not_set" = "x"; then
-      AC_MSG_RESULT([not set, setting.])
-      CXXFLAGS="${CXXFLAGS} -LANG:std"
-    else
-      AC_MSG_RESULT([already set.])
-    fi
-  fi
+AC_PATH_PROG([DIRNAME], [dirname], [no])
+if test "$DIRNAME" = "no"; then
+  AC_MSG_ERROR([The program "dirname" is not available. This program is required to build Openbox.])
 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 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 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"
+PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.14.0])
+AC_SUBST(GLIB_CFLAGS)
+AC_SUBST(GLIB_LIBS)
+
+PKG_CHECK_MODULES(PANGO, [pango >= 1.8.0 pangoxft >= 1.8.0])
+AC_SUBST(PANGO_CFLAGS)
+AC_SUBST(PANGO_LIBS)
+
+PKG_CHECK_MODULES(XML, [libxml-2.0 >= 2.6.0])
+AC_SUBST(XML_CFLAGS)
+AC_SUBST(XML_LIBS)
+
+AC_ARG_ENABLE(startup-notification,
+  AC_HELP_STRING(
+    [--disable-startup-notification],
+    [disable the startup notification library. [default=enabled]]
+  ),
+  [enable_sn=$enableval],
+  [enable_sn=yes]
 )
-CXXFLAGS="$CXXFLAGS $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"
-     
-CXXFLAGS="$CXXFLAGS $X_CXXFLAGS"
-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.])
+
+if test "$enable_sn" = yes; then
+PKG_CHECK_MODULES(LIBSN, [libstartup-notification-1.0 >= 0.8],
+  [
+    AC_DEFINE(USE_LIBSN, [1], [Use startup-notification])
+    AC_SUBST(LIBSN_CFLAGS)
+    AC_SUBST(LIBSN_LIBS)
+    sn_found=yes
+  ],
+  [
+    sn_found=no
+  ]
+)
+else
+  sn_found=no
+fi
+
+AC_ARG_ENABLE(xcursor,
+  AC_HELP_STRING(
+    [--disable-xcursor],
+    [disable use of the X Cursor library. [default=enabled]]
+  ),
+  [enable_xcursor=$enableval],
+  [enable_xcursor=yes]
 )
 
-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(HAVE_SHAPE,1,Found the XShape extension)
-    LIBS="$LIBS -lXext",
-  
-    AC_MSG_RESULT([no])
-    SHAPE="no"
-  )
+if test "$enable_xcursor" = yes; then
+PKG_CHECK_MODULES(XCURSOR, [xcursor],
+  [
+    AC_DEFINE(USE_XCURSOR, [1], [Use X Cursor library])
+    AC_SUBST(XCURSOR_CFLAGS)
+    AC_SUBST(XCURSOR_LIBS)
+    xcursor_found=yes
+  ],
+  [
+    xcursor_found=no
+  ]
 )
-AC_MSG_CHECKING([for the XShape extension])
-if test "$SHAPE" = "yes"; then
-  AC_MSG_RESULT([yes])
 else
-  AC_MSG_RESULT([no])
+  xcursor_found=no
 fi
 
-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])
-  fi,
-  AC_MSG_RESULT([no])
+AC_ARG_ENABLE(imlib2,
+  AC_HELP_STRING(
+    [--disable-imlib2],
+    [disable use of Imlib2 image library for loading icons. [default=enabled]]
+  ),
+  [enable_imlib2=$enableval],
+  [enable_imlib2=yes]
 )
 
-dnl Print results
-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 '$CXXFLAGS' for C++ compiler flags.])
-AC_MSG_RESULT([Building with '$LIBS' for linker flags.])
-AC_MSG_RESULT([])
+if test "$enable_imlib2" = yes; then
+PKG_CHECK_MODULES(IMLIB2, [imlib2],
+  [
+    AC_DEFINE(USE_IMLIB2, [1], [Use Imlib2 image library])
+    AC_SUBST(IMLIB2_CFLAGS)
+    AC_SUBST(IMLIB2_LIBS)
+    # export it for the pkg-config file
+    PKG_CONFIG_IMLIB=imlib2
+    AC_SUBST(PKG_CONFIG_IMLIB)
+    imlib2_found=yes
+  ],
+  [
+    imlib2_found=no
+  ]
+)
+else
+  imlib2_found=no
+fi
 
+AM_CONDITIONAL(USE_IMLIB2, [test $imlib2_found = yes])
 
-dnl Output files
-AM_CONFIG_HEADER(config.h)
-AC_OUTPUT(
-  version.h
+dnl Check for session management
+X11_SM
+
+#EFENCE_LIBS=-lefence
+EFENCE_LIBS=""
+AC_SUBST(EFENCE_LIBS)
+
+dnl Check for X11 extensions
+X11_EXT_XKB
+X11_EXT_XRANDR
+X11_EXT_SHAPE
+X11_EXT_XINERAMA
+X11_EXT_SYNC
+X11_EXT_AUTH
+
+AC_CONFIG_FILES([
   Makefile
-  otk/Makefile
-  src/Makefile
-  util/Makefile
-  util/epist/Makefile
-  doc/Makefile
-  data/Makefile
-  data/styles/Makefile
-)
+  m4/Makefile
+  po/Makefile.in
+  obrender/obrender-3.5.pc
+  obt/obt-3.5.pc
+  obrender/version.h
+  obt/version.h
+  version.h
+])
+AC_CONFIG_COMMANDS([doc],
+                   [test -d doc || mkdir doc])
+AC_CONFIG_COMMANDS([data],
+                   [test -d data || mkdir data])
+AC_CONFIG_COMMANDS([data/xsession],
+                   [test -d data/xsession || mkdir data/xsession])
+AC_OUTPUT
+
+AC_MSG_RESULT
+AC_MSG_RESULT([Compiling with these options:
+               Startup Notification... $sn_found
+               X Cursor Library... $xcursor_found
+               Session Management... $SM
+               Imlib2 library... $imlib2_found
+               ])
+AC_MSG_RESULT([configure complete, now type "make"])