X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=gui%2Fautoconf%2Fconfigure.in;h=9de83b09438a589dba5252202a05198139fb6936;hb=be0f0131c41d25b2c25918e5c9c69eea62f11157;hp=0bc4b1851346f5edf1e5a2e97b933706204786ef;hpb=89ccc0d2bbe63ed6ac3565cdef1459ef919368da;p=bacula%2Fbacula

diff --git a/gui/autoconf/configure.in b/gui/autoconf/configure.in
index 0bc4b18513..9de83b0943 100644
--- a/gui/autoconf/configure.in
+++ b/gui/autoconf/configure.in
@@ -14,6 +14,34 @@ dnl require a recent autoconf
 AC_PREREQ(2.13)
 
 
+# ------------------------------------------
+# Where to get Bacula source
+# ------------------------------------------
+AC_ARG_WITH(bacula,
+   [  --with-bacula=PATH    specify path to Bacula source],
+   [
+       if test "x$withval" != "xno" ; then     
+	  bacula=$withval
+       fi
+   ]
+)
+
+AC_SUBST(bacula)
+if test "x$bacula" = "x" ; then
+   AC_MSG_ERROR(The Bacula source directory must be specified. Use --with-bacula=<path>)
+fi
+
+dnl Bacula version
+VERSION=`sed -n -e 's/^.*VERSION.*"\(.*\)"$/\1/p' ${bacula}/src/version.h`
+DATE=`sed -n -e 's/^.*[ \t]*BDATE.*"\(.*\)"$/\1/p' ${bacula}/src/version.h`
+AC_SUBST(VERSION)dnl
+AC_SUBST(DATE)dnl
+if test "x$VERSION" = "x" ; then
+   AC_MSG_ERROR(Bacula version not found)
+fi
+echo "configuring for Bacula source $VERSION ($DATE)"
+
+
 dnl search for true and false programs.
 AC_PATH_PROGS(TRUEPRG, true, :)
 AC_PATH_PROGS(FALSEPRG, false, :)
@@ -34,14 +62,6 @@ THE_AWK=$AWK
 AC_PATH_PROG(AWK, $THE_AWK, $THE_AWK)
 
 
-dnl Bacula version
-#VERSION=`sed -n -e 's/^.*VERSION.*"\(.*\)"$/\1/p' ${srcdir}/version.h`
-#DATE=`sed -n -e 's/^.*[ \t]*BDATE.*"\(.*\)"$/\1/p' ${srcdir}/version.h`
-#AC_SUBST(VERSION)dnl 
-#AC_SUBST(DATE)dnl 
-#echo "configuring for Bacula $VERSION ($DATE)"
-
-
 dnl -------------------------------------------------------
 dnl# Check for programs.
 dnl ------------------------------------------------------
@@ -74,17 +94,6 @@ dnl# --------------------------------------------------------------------------
 dnl# CHECKING COMMAND LINE OPTIONS
 dnl# --------------------------------------------------------------------------
 
-# ------------------------------------------
-# Where to get Bacula source
-# ------------------------------------------
-AC_ARG_WITH(bacula,
-   [  --with-bacula=PATH    specify path to Bacula source],
-   [
-       if test "x$withval" != "xno" ; then     
-	  bacula=$withval
-       fi
-   ]
-)
 
 # -------------------------------------------------------------------------
 #  Set variables for bimagemgr installation
@@ -262,7 +271,7 @@ AC_OUTPUT([    \
 	   autoconf/Make.common \
 	   Makefile \
 	   bimagemgr/Makefile \
-	   bimagemgr/bacula-bimagemgr.spec \
+	   bacula-gui.spec \
 	   $PFILES ],  
 	  [ ]
 )
@@ -272,7 +281,6 @@ echo "
 Configuration on `date`:
 
   Host: 		      $host -- ${DISTNAME} ${DISTVER}
-  Bacula version:	      ${VERSION} (${DATE})
   Source code location:       ${bacula}
 
   " > config.out