Rebuild configure.

bareos · Jun 24, 2015 · 6d0f036 · 6d0f036
1 parent 76cebc5
commit 6d0f036
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/configure b/configure
@@ -23626,7 +23626,7 @@ if test "x$support_crypto" != "xno" -o "x$support_tls" != "xno"; then
 
       saved_LIBS="${LIBS}"
       saved_CFLAGS="${CFLAGS}"
-      saved_CPPFLAGS="${CFLAGS}"
+      saved_CPPFLAGS="${CPPFLAGS}"
       LIBS="${saved_LIBS} ${OPENSSL_LIBS}"
       CFLAGS="${saved_CFLAGS} ${OPENSSL_INC}"
       CPPFLAGS="${saved_CPPFLAGS} ${OPENSSL_INC}"
@@ -23828,7 +23828,7 @@ if test "x$support_crypto" != "xno" -o "x$support_tls" != "xno"; then
 
       saved_LIBS="${LIBS}"
       saved_CFLAGS="${CFLAGS}"
-      saved_CPPFLAGS="${CFLAGS}"
+      saved_CPPFLAGS="${CPPFLAGS}"
       LIBS="${saved_LIBS} ${GNUTLS_LIBS}"
       CFLAGS="${saved_CFLAGS} ${GNUTLS_INC}"
       CPPFLAGS="${saved_CPPFLAGS} ${GNUTLS_INC}"
@@ -32668,7 +32668,9 @@ debian|ubuntu|univention)
             debian/univention-bareos-schema.postinst \
             debian/univention-bareos.install \
             debian/univention-bareos.postinst \
-            platforms/univention/Makefile"
+            platforms/univention/Makefile \
+            platforms/univention/AppCenter/univention-bareos.ini \
+            platforms/univention/AppCenter/LICENSE_AGREEMENT"
          ;;
    esac
 
@@ -35762,7 +35764,7 @@ if test "${support_bat}" = "yes" ; then
    touch bat
    chmod 755 bat
    rm -f Makefile
-   $QMAKE
+   $QMAKE QMAKE_CFLAGS_RELEASE="$CFLAGS $CPPFLAGS" QMAKE_CXXFLAGS_RELEASE="$CXXFLAGS $CPPFLAGS" QMAKE_LFLAGS_RELEASE="$LDFLAGS"
    ${MAKE:-make} clean
    cd ${BUILD_DIR}
 fi
@@ -35778,7 +35780,7 @@ if test "${support_traymonitor}" = "yes" ; then
    touch bareos-tray-monitor
    chmod 755 bareos-tray-monitor
    rm -f Makefile
-   $QMAKE
+   $QMAKE QMAKE_CFLAGS_RELEASE="$CFLAGS $CPPFLAGS" QMAKE_CXXFLAGS_RELEASE="$CXXFLAGS $CPPFLAGS" QMAKE_LFLAGS_RELEASE="$LDFLAGS"
    ${MAKE:-make} clean
    cd ${BUILD_DIR}
 fi