Fix CLANG warning messages -- fixes bug #2090

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

diff --git a/bacula/autoconf/configure.in b/bacula/autoconf/configure.in
index db86e4dd6f0889353cd602b8afa97f5b4d9eeaaa..0ee1bb63c955a9b18a6a91b49a3bca4178ec6446 100644 (file)
--- a/bacula/autoconf/configure.in
+++ b/bacula/autoconf/configure.in
@@ -1452,6 +1452,20 @@ AC_ARG_WITH(db_port,
 )
 AC_SUBST(db_port)
 
+dnl
+dnl Pickup MySQL SSL options for database user connection 
+dnl
+db_ssl_options=
+AC_ARG_WITH(db_ssl_options,
+   AC_HELP_STRING([--with-db-ssl-options=DBSSLOPTIONS], [specify SSL options for database user connection @<:@default=null@:>@]),
+   [
+       if test "x$withval" != "x" ; then
+        db_ssl_options=$withval
+       fi
+   ]
+)
+AC_SUBST(db_ssl_options)
+
 #
 # Handle users and groups for each daemon
 #
@@ -2479,7 +2493,7 @@ if test x$support_lzo = xyes; then
             AC_CHECK_HEADER(${with_lzo}/lzo/lzoconf.h,
                [
                    AC_DEFINE(HAVE_LZO, 1, [Define to 1 if you have LZO compression])
-                   LZO_LIBS="${LZO_LDFLAGS} -lzo2"
+                   LZO_LIBS="${LZO_LDFLAGS} -llzo2"
                    have_lzo="yes"      
                ], [
                    echo " "
@@ -2887,7 +2901,7 @@ CFLAGS=${CFLAGS--O}
 
 if test x$have_gcc = xyes ; then
    CPPFLAGS="$CPPFLAGS -fno-strict-aliasing -fno-exceptions -fno-rtti"
-   CFLAGS="$CFLAGS -fno-strict-aliasing -fno-exceptions -fno-rtti"
+   CFLAGS="$CFLAGS -x c++ -fno-strict-aliasing -fno-exceptions -fno-rtti"
 fi
 LDFLAGS=${LDFLAGS--O}
 CPPFLAGS="$CPPFLAGS"
@@ -3294,6 +3308,8 @@ AC_OUTPUT([autoconf/Make.common \
           src/qt-console/bat.pro.mingw32 \
           src/qt-console/bat.pro.mingw64 \
           src/qt-console/install_conf_file \
+          src/qt-console/tray-monitor/tray-monitor.conf \
+          src/qt-console/tray-monitor/tray-monitor.pro \
           src/qt-console/tray-monitor/tray-monitor.pro.mingw32 \
           src/qt-console/tray-monitor/tray-monitor.pro.mingw64 \
           src/dird/Makefile \
@@ -3488,6 +3504,7 @@ Configuration on `date`:
    Database port:           ${db_port}
    Database name:           ${db_name}
    Database user:           ${db_user}
+   Database SSL options:     ${db_ssl_options}
 
    Job Output Email:        ${job_email}
    Traceback Email:         ${dump_email}