X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=configure.ac;h=9f8f26f6deffcb8e84336261c9ed7ffe502f3fb0;hb=6d0c4d7fadd2d67760ef62e11385fd261ba6a3c4;hp=ee73919c830fc1a0ba8ef3a188d3002a6818bffd;hpb=5563e251c36a1fbda703cf4bc3c8c6ae543829bd;p=chaz%2Fopenbox

diff --git a/configure.ac b/configure.ac
index ee73919c..9f8f26f6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,14 +18,14 @@ RR_MINOR_VERSION=0
 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)
@@ -102,10 +102,6 @@ PKG_CHECK_MODULES(PANGO, [pango >= 1.8.0 pangoxft >= 1.8.0])
 AC_SUBST(PANGO_CFLAGS)
 AC_SUBST(PANGO_LIBS)
 
-PKG_CHECK_MODULES(XFT, [xft])
-AC_SUBST(XFT_CFLAGS)
-AC_SUBST(XFT_LIBS)
-
 PKG_CHECK_MODULES(XML, [libxml-2.0 >= 2.6.0])
 AC_SUBST(XML_CFLAGS)
 AC_SUBST(XML_LIBS)
@@ -180,7 +176,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])