Merge branch 'backport' into work

[chaz/openbox] / configure.ac

diff --git a/configure.ac b/configure.ac
index 8e01ca14d66519e1168b513c348b5b9daf95b926..463e7fb352ac31e7885bc336b249e6f740b38992 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -15,17 +15,17 @@ dnl if MAJOR or MINOR version changes, be sure to change AC_INIT above to match
 dnl
 RR_MAJOR_VERSION=4
 RR_MINOR_VERSION=0
-RR_MICRO_VERSION=16
+RR_MICRO_VERSION=17
 RR_INTERFACE_AGE=0
 RR_BINARY_AGE=0
-RR_VERSION=$OB_MAJOR_VERSION.$OB_MINOR_VERSION
+RR_VERSION=$RR_MAJOR_VERSION.$RR_MINOR_VERSION
 
 OBT_MAJOR_VERSION=4
 OBT_MINOR_VERSION=0
 OBT_MICRO_VERSION=0
 OBT_INTERFACE_AGE=0
 OBT_BINARY_AGE=0
-OBT_VERSION=$OB_MAJOR_VERSION.$OB_MINOR_VERSION
+OBT_VERSION=$OBT_MAJOR_VERSION.$OBT_MINOR_VERSION
 
 AC_SUBST(RR_MAJOR_VERSION)
 AC_SUBST(RR_MINOR_VERSION)
@@ -180,7 +180,8 @@ AC_CONFIG_FILES([
   po/Makefile.in
   render/obrender-4.0.pc
   obt/obt-4.0.pc
-  version.h
+  render/version.h
+  obt/version.h
 ])
 AC_CONFIG_COMMANDS([doc],
                    [test -d doc || mkdir doc])