Update version in configure.ac to 3.5.2

[dana/openbox.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 82c627f..33fc6d9 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,8 +1,10 @@
 AC_PREREQ([2.54])
-AC_INIT([openbox], [3.5.0], [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])
+AM_SILENT_RULES([yes])
+
 OB_VERSION=$PACKAGE_VERSION
 AC_SUBST(OB_VERSION)
 
@@ -18,14 +20,14 @@ 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_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=1
+OBT_MICRO_VERSION=3
 OBT_INTERFACE_AGE=1
 OBT_BINARY_AGE=1
 OBT_VERSION=$OBT_MAJOR_VERSION.$OBT_MINOR_VERSION
@@ -168,7 +170,7 @@ AC_ARG_ENABLE(imlib2,
     [--disable-imlib2],
     [disable use of Imlib2 image library for loading icons. [default=enabled]]
   ),
-  [enable_imlib2=$enableeval],
+  [enable_imlib2=$enableval],
   [enable_imlib2=yes]
 )
 
@@ -193,6 +195,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
 
@@ -231,6 +263,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"])