X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fautoconf%2Fconfigure.in;h=75e849dc9ef37a0d6ff4049c94afcacacb6b64bf;hb=27cd56149945bbab7585c07b11486d8163077593;hp=ca1aa87c49502a75e69a0ddd99da53e4cd9ea188;hpb=9d7c5ccdc0c04d04f7265abcc840ede9f7850988;p=bacula%2Fbacula

diff --git a/bacula/autoconf/configure.in b/bacula/autoconf/configure.in
index ca1aa87c49..75e849dc9e 100644
--- a/bacula/autoconf/configure.in
+++ b/bacula/autoconf/configure.in
@@ -20,7 +20,6 @@ dnl search for true and false programs.
 AC_PATH_PROGS(TRUEPRG, true, :)
 AC_PATH_PROGS(FALSEPRG, false, :)
 
-#AC_CANONICAL_HOST
 
 dnl bacula version
 VERSION=`sed -n -e 's/^.*VERSION.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h`
@@ -75,6 +74,8 @@ AC_PATH_PROG(GROWISOFS, growisofs, growisofs)
 AC_PATH_PROG(DVDRWMEDIAINFO, dvd+rw-mediainfo, dvd+rw-mediainfo)
 AC_PATH_PROG(DVDRWFORMAT, dvd+rw-format, dvd+rw-format)
 AC_PATH_PROG(PKGCONFIG, pkg-config, pkg-config)
+AC_PATH_PROG(QMAKE, qmake, none)
+AC_PATH_PROG(QMAKEQT4, qmake-qt4, none)
 AC_ARG_VAR(WXCONFIG, [wx-config command. On some systems, you must set it to wx-config-2.6 to use wxWidgets 2.6.])
 if test "x$WXCONFIG" = x; then
   WXCONFIG=wx-config
@@ -98,6 +99,7 @@ fi
 THE_AWK=$AWK
 AC_PATH_PROG(AWK, $THE_AWK, $THE_AWK)
 
+
 test -n "$ARFLAG" || ARFLAGS="cr"
 AC_SUBST(ARFLAGS)
 
@@ -163,6 +165,7 @@ if test x$sbindir = x'${exec_prefix}/sbin' ; then
 fi
 sbindir=`eval echo ${sbindir}`
 
+
 # -------------------------------------------------------------------------
 #  If the user has not set --mandir, we default to /usr/share/man
 # -------------------------------------------------------------------------
@@ -171,12 +174,6 @@ if test x$mandir = x'${prefix}/man' ; then
 fi
 
 		      
-# ------------------------------------------------------------------
-# All list of languages for which a translation exist. Each
-#  language is separated by a space.
-# ------------------------------------------------------------------
-ALL_LINGUAS=""
-
 AC_PATH_PROGS(MSGFMT, msgfmt, no)
 if test "$MSGFMT" = "no"
 then
@@ -192,6 +189,7 @@ support_mysql=no
 support_sqlite=no
 support_sqlite3=no
 support_postgresql=no
+support_dbi=no
 support_smartalloc=yes
 support_readline=yes
 support_conio=yes
@@ -297,7 +295,7 @@ if test x$support_bat = xyes; then
 #
    if test x$QWT_INC = x; then
       for root in /usr /usr/local; do
-	 for ver in qwt qwt5; do
+	 for ver in qwt qwt5 qwt-qt4; do
 	    if test -f ${root}/include/${ver}/qwt.h; then
 	       QWT_INC="${root}/include/${ver}"
 	       if test -d ${root}/lib64/; then
@@ -923,12 +921,9 @@ AC_SUBST(OPENSSL_INC)
 
 
 # -----------------------------------------------------------
-# Python and OpenSSL are using dlopen
+# dlopen is needed for plugins
 # -----------------------------------------------------------
-
-if test "$support_python" = "yes" -o "$support_tls" = "yes"; then
-   AC_SEARCH_LIBS(dlopen, [dl])
-fi
+AC_SEARCH_LIBS(dlopen, [dl])
 
 # ------------------------------------------
 # Where to place working dir
@@ -945,6 +940,22 @@ AC_ARG_WITH(working-dir,
 
 AC_SUBST(working_dir)
 
+# ------------------------------------------------------------------
+# If the user has not set archivedir, we set our default as /tmp
+# ------------------------------------------------------------------
+archive_dir=/tmp
+AC_ARG_WITH(archivedir,
+   [  --with-archivedir=PATH	specify path of SD archive directory],
+   [
+       if test "x$withval" != "xno" ; then     
+	      archivedir=$withval
+       fi
+   ]
+)
+
+AC_SUBST(archivedir)
+
+
 
 # ------------------------------------------
 # Where to place scriptdir (script files)
@@ -1319,6 +1330,10 @@ BA_CHECK_SQLITE3_DB
 
 BA_CHECK_SQLITE_DB
 
+BA_CHECK_DBI_DB
+
+BA_CHECK_DBI_DRIVER
+
 AC_SUBST(cats)
 AC_SUBST(DB_TYPE)
 
@@ -1338,7 +1353,21 @@ if test $pkg = 0; then
        support_batch_insert=yes
      fi])
 fi
-							  
+	
+# Check if postgresql support batch mode	
+if test x$DB_TYPE = xpostgresql; then
+   A=`nm $SQL_LIB | grep PQputCopyData`
+   pkg=$?
+   if test $pkg != 0; then
+      support_batch_insert=no
+   fi
+fi
+
+if test x$DB_TYPE = xdbi; then
+   DB_TYPE=$DB_PROG
+   db_type=$DB_PROG
+fi
+
 if test $support_batch_insert = yes ; then
    AC_DEFINE(HAVE_BATCH_FILE_INSERT, 1, [Set if DB batch insert code enabled])
 fi
@@ -1381,6 +1410,7 @@ AC_CHECK_HEADERS( \
 	stdlib.h \
 	stdint.h \
 	string.h \
+	strings.h \
 	termios.h \
 	termcap.h \
 	term.h \
@@ -1389,9 +1419,11 @@ AC_CHECK_HEADERS( \
 	sys/byteorder.h \
 	sys/ioctl.h \
 	sys/select.h \
+	sys/socket.h \
 	sys/sockio.h \
+	sys/stat.h \
 	sys/time.h \
-	sys/socket.h \
+	sys/types.h \
 	arpa/nameser.h \
 	resolv.h \
 	mtio.h \
@@ -2219,10 +2251,23 @@ AC_OUTPUT([autoconf/Make.common \
 )
 
 if test "${support_bat}" = "yes" ; then
+  if test "x$QMAKE" = "xnone" && test "x$QMAKEQT4" = "xnone"; then
+  echo "Could not find qmake or qmake-qt4 in $PATH. Check your Qt installation"
+  exit 1
+  fi
+
+  QMAKEBIN="qmake"
+
+  if test "x$QMAKEQT4" != "xnone"; then
+    QMAKEBIN=qmake-qt4
+  fi
+
+
+  
   cd src/qt-console
   chmod 755 install_conf_file build-depkgs-qt-console
-  echo "Creating bat Makefile"	
-  qmake
+  echo "Creating bat Makefile"
+  $QMAKEBIN
   cd ${BUILD_DIR}
 fi
 
@@ -2297,7 +2342,7 @@ if test "x${db_type}" = "xInternal" ; then
    echo " "
    echo " "
    echo "You have not specified either --enable-client-only or one of the"
-   echo "  supported databases: MySQL, PostgreSQL, SQLite3 or SQLite."
+   echo "  supported databases: MySQL, PostgreSQL, SQLite3, SQLite or DBI."
    echo "  This is not permitted. Please reconfigure."
    echo " "
    echo "Aborting the configuration ..."
@@ -2315,6 +2360,7 @@ Configuration on `date`:
   Install binaries:	      ${sbindir}
   Install config files:       ${sysconfdir}
   Scripts directory:	      ${scriptdir}
+  Archive directory:	      ${archivedir}
   Working directory:	      ${working_dir}
   PID directory:	      ${piddir}
   Subsys directory:	      ${subsysdir}