X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fopenbox;a=blobdiff_plain;f=configure.ac;h=f751b287b148b89aa9c6c466242cd3cd4febdf97;hp=99b416a5e0b1788007187678f72922c0330919c1;hb=HEAD;hpb=0352abfa88892bc17bdff2022745e3c1b312edd0

diff --git a/configure.ac b/configure.ac
index 99b416a5..f751b287 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,8 +1,12 @@
 AC_PREREQ([2.54])
-AC_INIT([openbox], [3.5.0-rc1], [http://bugzilla.icculus.org])
-AM_INIT_AUTOMAKE
+AC_INIT([openbox], [3.5.2], [http://bugzilla.icculus.org])
 AC_CONFIG_SRCDIR([openbox/openbox.c])
 
+AM_INIT_AUTOMAKE([foreign])
+
+OB_VERSION=$PACKAGE_VERSION
+AC_SUBST(OB_VERSION)
+
 dnl Making releases:
 dnl   RR_MICRO_VERSION += 1;
 dnl   RR_INTERFACE_AGE += 1;
@@ -15,16 +19,16 @@ 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=27
-RR_INTERFACE_AGE=0
-RR_BINARY_AGE=0
+RR_MICRO_VERSION=30
+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=0
-OBT_INTERFACE_AGE=0
-OBT_BINARY_AGE=0
+OBT_MICRO_VERSION=3
+OBT_INTERFACE_AGE=1
+OBT_BINARY_AGE=1
 OBT_VERSION=$OBT_MAJOR_VERSION.$OBT_MINOR_VERSION
 
 AC_SUBST(RR_MAJOR_VERSION)
@@ -84,17 +88,20 @@ AC_PROG_INSTALL
 AM_GNU_GETTEXT_VERSION(0.15)
 AM_GNU_GETTEXT([external])
 
-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/socket.h sys/time.h)
-AC_CHECK_HEADERS(sys/wait.h)
-# AC_HEADER_TIME
-# AC_TYPE_SIGNAL
+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_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
 
+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
+
 PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.14.0])
 AC_SUBST(GLIB_CFLAGS)
 AC_SUBST(GLIB_LIBS)
@@ -110,7 +117,7 @@ AC_SUBST(XML_LIBS)
 AC_ARG_ENABLE(startup-notification,
   AC_HELP_STRING(
     [--disable-startup-notification],
-    [disable the startup notification library. [[default=enabled]]]
+    [disable the startup notification library. [default=enabled]]
   ),
   [enable_sn=$enableval],
   [enable_sn=yes]
@@ -135,7 +142,7 @@ fi
 AC_ARG_ENABLE(xcursor,
   AC_HELP_STRING(
     [--disable-xcursor],
-    [disable use of the X Cursor library. [[default=enabled]]]
+    [disable use of the X Cursor library. [default=enabled]]
   ),
   [enable_xcursor=$enableval],
   [enable_xcursor=yes]
@@ -160,9 +167,9 @@ fi
 AC_ARG_ENABLE(imlib2,
   AC_HELP_STRING(
     [--disable-imlib2],
-    [disable use of Imlib2 image library for loading icons. [[default=enabled]]]
+    [disable use of Imlib2 image library for loading icons. [default=enabled]]
   ),
-  [enable_imlib2=$enableeval],
+  [enable_imlib2=$enableval],
   [enable_imlib2=yes]
 )
 
@@ -172,6 +179,9 @@ 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
   ],
   [
@@ -184,6 +194,36 @@ fi
 
 AM_CONDITIONAL(USE_IMLIB2, [test $imlib2_found = yes])
 
+AC_ARG_ENABLE(librsvg,
+  AC_HELP_STRING(
+    [--disable-librsvg],
+    [disable use of SVG image files for loading icons. [default=enabled]]
+  ),
+  [enable_librsvg=$enableval],
+  [enable_librsvg=yes]
+)
+
+if test "$enable_librsvg" = yes; then
+PKG_CHECK_MODULES(LIBRSVG, [librsvg-2.0],
+  [
+    AC_DEFINE(USE_LIBRSVG, [1], [Use SVG image files])
+    AC_SUBST(LIBRSVG_CFLAGS)
+    AC_SUBST(LIBRSVG_LIBS)
+    # export it for the pkg-config file
+    PKG_CONFIG_LIBRSVG=librsvg-2.0
+    AC_SUBST(PKG_CONFIG_LIBRSVG)
+    librsvg_found=yes
+  ],
+  [
+    librsvg_found=no
+  ]
+)
+else
+  librsvg_found=no
+fi
+
+AM_CONDITIONAL(USE_LIBRSVG, [test $librsvg_found = yes])
+
 dnl Check for session management
 X11_SM
 
@@ -197,6 +237,7 @@ X11_EXT_XRANDR
 X11_EXT_SHAPE
 X11_EXT_XINERAMA
 X11_EXT_SYNC
+X11_EXT_AUTH
 
 AC_CONFIG_FILES([
   Makefile
@@ -206,6 +247,7 @@ AC_CONFIG_FILES([
   obt/obt-3.5.pc
   obrender/version.h
   obt/version.h
+  version.h
 ])
 AC_CONFIG_COMMANDS([doc],
                    [test -d doc || mkdir doc])
@@ -220,6 +262,7 @@ AC_MSG_RESULT([Compiling with these options:
                Startup Notification... $sn_found
                X Cursor Library... $xcursor_found
                Session Management... $SM
-               Imlib2 library... $imlib2_found
+               Imlib2 Library... $imlib2_found
+               SVG Support (librsvg)... $librsvg_found
                ])
 AC_MSG_RESULT([configure complete, now type "make"])