From: Ben Walton <bwalton@artsci.utoronto.ca>
Date: Wed, 13 Apr 2011 19:06:13 +0000 (-0400)
Subject: Update AC_INIT use to make configure handle docdir properly
X-Git-Tag: Release-5.2.1~469
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=cf48ba8b98604c0f79a1cc6e8ef4c292761932f4;p=bacula%2Fbacula

Update AC_INIT use to make configure handle docdir properly

This patch allows AC_INIT to properly set the PACKAGE variables in the
Makefiles.  In turn, this allows docdir use to work correctly.  With
the new behaviour, things placed in docdir go to share/doc/bacula.
Previously the would end up in share/doc.

We move the detection of the source directory to a separate
AC_CONFIG_SRCDIR macro call.

Signed-off-by: Ben Walton <bwalton@artsci.utoronto.ca>
---

diff --git a/bacula/autoconf/configure.in b/bacula/autoconf/configure.in
index 1a5e861e35..bbcd0e2f04 100644
--- a/bacula/autoconf/configure.in
+++ b/bacula/autoconf/configure.in
@@ -4,7 +4,9 @@ dnl Process this file with autoconf to produce a configure script.
 dnl
 dnl require a recent autoconf
 AC_PREREQ(2.61)
-AC_INIT(src/version.h)
+AC_INIT([bacula], m4_esyscmd([sed -n -e 's/^.*VERSION.*"\(.*\)"$/\1/p' ../src/version.h src/version.h 2> /dev/null | tr -d '\n']))
+AC_CONFIG_SRCDIR(src/version.h)
+
 BUILD_DIR=`pwd`
 cd ..
 TOP_DIR=`pwd`