Update version

[bacula/rescue] / rescue / autoconf / configure.in

diff --git a/rescue/autoconf/configure.in b/rescue/autoconf/configure.in
index 8045980f64418a580d8bef5feed3c4b6e23bd4b5..6cd0b6e49d132f4ac47cd4594fe7339fd9b6345f 100644 (file)
--- a/rescue/autoconf/configure.in
+++ b/rescue/autoconf/configure.in
@@ -70,21 +70,37 @@ if test x${exec_prefix} = xNONE ; then
     exec_prefix=${prefix}
 fi
 
+# ------------------------------------------
+# What device to use
+# ------------------------------------------
+DEV=
+AC_ARG_WITH(dev,
+   [  --with-dev=DEVICE     specify device (e.g. /dev/hdc)],
+   [
+       if test "x$withval" != "xno" ; then     
+          DEV=$withval
+       fi
+   ]
+)
+
 # -------------------------------------------
-# check for cdrecord writer location
+# if no --with-dev given check for cdrecord writer location
 # get scsibus,target,lun
 # -------------------------------------------
-CDSTL="3,0,0"
-if test ! x$CDRECORD = x ; then
-   CDSTL=`${CDRECORD} -scanbus 2>/dev/null | grep CD-RW | ${AWK} '{print $1}'`
-   if test x${CDSTL} = x ; then
-      CDSTL=`${CDRECORD} -scanbus 2>/dev/null | grep CD+RW | ${AWK} '{print $1}'`
-   fi
-   if test x${CDSTL} = x ; then
-      CDSTL="3,0,0"
+if test x$DEV = x ; then
+   CDSTL="3,0,0"
+   if test ! x$CDRECORD = x ; then
+      CDSTL=`${CDRECORD} -scanbus 2>/dev/null | grep CD-RW | ${AWK} '{print $1}'`
+      if test x${CDSTL} = x ; then
+        CDSTL=`${CDRECORD} -scanbus 2>/dev/null | grep CD+RW | ${AWK} '{print $1}'`
+      fi
+      if test x${CDSTL} = x ; then
+        CDSTL="3,0,0"
+      fi
    fi
+   DEV="ATA:${CDSTL}"
 fi
-AC_SUBST(CDSTL)
+AC_SUBST(DEV)
 
 dnl# --------------------------------------------------------------------------
 dnl# CHECKING COMMAND LINE OPTIONS
@@ -96,7 +112,7 @@ where=
 # Where to get iso
 # ------------------------------------------
 AC_ARG_WITH(iso,
-   [  --with-iso=PATH   specify path to iso (not implemented)],
+   [  --with-iso=PATH   specify path to iso image],
    [
        if test "x$withval" != "xno" ; then     
           where=$withval
@@ -104,7 +120,8 @@ AC_ARG_WITH(iso,
        fi
    ]
 )
-AC_SUBST(iso)
+AC_SUBST(where)
+AC_SUBST(type)
 
 # ------------------------------------------
 # Where to get cdrom
@@ -164,6 +181,36 @@ AC_ARG_WITH(static-fd,
 )
 AC_SUBST(STATIC_FD)
 
+BACULA_BIN=
+# ------------------------------------------
+# Where to get Bacula binaries
+# ------------------------------------------
+AC_ARG_WITH(bacula-bin,
+   [  --with-bacula-bin=PATH   specify path to bacula binaries (NOT IMPLEMENTED)],
+   [
+       if test "x$withval" != "xno" ; then     
+         BACULA_BIN=$withval
+       fi
+   ]
+)
+AC_SUBST(BACULA_BIN)
+
+BACULA_SCRIPTS=
+# ------------------------------------------
+# Where to get Bacula scripts
+# ------------------------------------------
+AC_ARG_WITH(bacula-scripts,
+   [  --with-bacula-scripts=PATH    specify path to bacula scripts],
+   [
+       if test "x$withval" != "xno" ; then     
+         BACULA_SCRIPTS=$withval
+       fi
+   ]
+)
+AC_SUBST(BACULA_SCRIPTS)
+
+
+
 if test x${bacula} = x -a x${STATIC_FD} = x ; then
    AC_MSG_ERROR(You must specify either --with-bacula=PATH or --with-static-fd=PATH)
 fi
@@ -282,15 +329,18 @@ AC_OUTPUT([    \
          [ ]
 )
 
+  
 
 echo "
 Configuration on `date`:
 
   Host:                      $host -- ${DISTNAME} ${DISTVER}
   Rescue version:            ${VERSION} (${DATE})
+  Bacula scripts location:    ${BACULA_SCRIPTS}
   Source code location:       ${bacula}
   Static FD location:        ${STATIC_FD}
   Specific kernel version:    ${KERNEL}
+  CDROM device:              ${DEV}
 
   " > config.out