Merge branch 'bareos-15.2'

bareos · Dec 4, 2015 · b088441 · b088441
2 parents fc47037 + fb77502
commit b088441
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/autoconf/configure.in b/autoconf/configure.in
@@ -3129,7 +3129,7 @@ if test "x${with_jansson_directory}" != "xyes" && test x"${with_jansson_director
 else
    if test x$with_jansson_directory = xyes || test x"${with_jansson_directory}" = "x" && $PKGCONFIG jansson; then
       have_jansson=yes
-      JANSSON_INC=`$PKGCONFIG --cflags janson`
+      JANSSON_INC=`$PKGCONFIG --cflags jansson`
       JANSSON_LIBS=`$PKGCONFIG --libs jansson`
    fi
 fi

diff --git a/configure b/configure
@@ -30684,7 +30684,7 @@ if test "x${with_jansson_directory}" != "xyes" && test x"${with_jansson_director
 else
    if test x$with_jansson_directory = xyes || test x"${with_jansson_directory}" = "x" && $PKGCONFIG jansson; then
       have_jansson=yes
-      JANSSON_INC=`$PKGCONFIG --cflags janson`
+      JANSSON_INC=`$PKGCONFIG --cflags jansson`
       JANSSON_LIBS=`$PKGCONFIG --libs jansson`
    fi
 fi

diff --git a/src/cats/update_bareos_tables.in b/src/cats/update_bareos_tables.in
@@ -170,7 +170,7 @@ do
 
    if [ ${retval} != 0 ]; then
       echo "Failed to upgrade database schema from version ${start_version} to ${end_version}"
-      break;
+      exit ${retval}
    fi
 done