Merge bzr://soup.haus/ Build: jenkins-Libmemcached-472

[awesomized/libmemcached] / configure.ac

diff --git a/configure.ac b/configure.ac
index 4d241ea7bb9f013559639f908fa2784ef4681912..b493172b43f5e5a3ae227182d7d2a3fb8b6e0d1c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -9,6 +9,7 @@
 # the COPYING file in this directory for full text.
 
 m4_include([version.m4])
+
 AC_PREREQ([2.61])
 AC_INIT([libmemcached],VERSION_NUMBER,[http://libmemcached.org/])
 
@@ -49,6 +50,7 @@ AC_SUBST([MEMCACHED_LIBRARY_VERSION])
 
 AX_HEX_VERSION([LIBMEMCACHED],[$VERSION])
 AX_HEX_VERSION([LIBHASHKIT],[1.0.0])
+AC_SUBST([RPM_RELEASE],[1])
 
 m4_include([libhashkit/include.m4])
 
@@ -122,6 +124,9 @@ AC_CHECK_PROGS([PERL],[perl])
 AC_CHECK_PROGS([VALGRIND],['valgrind'])
 AC_CHECK_PROGS([WINE],['wine'])
 AC_CHECK_PROGS([YACC],['bison --warnings=all'],[:])
+AC_CHECK_PROGS([RPMBUILD],[rpmbuild --nocheck])
+AC_CHECK_PROGS([RPMDEV_SETUPTREE],[rpmdev-setuptree])
+AC_CHECK_PROGS([RPM],[rpm])
 AC_PROG_AWK
 AC_PROG_MKDIR_P
 AC_PROG_SED
@@ -330,7 +335,7 @@ AX_HARDEN_COMPILER_FLAGS
 AX_AM_JOBSERVER([yes])
 
 AC_CONFIG_FILES([Makefile
-                 docs/conf.py
+                 docs/source/conf.py
                  libmemcached-1.0/configure.h
                  support/libmemcached.pc
                  support/libmemcached.spec