mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Disable firebird with --disable-database-connectivity.

Browse Source 
Change-Id: Ieed24db81ccbfdc3e2876ce74afdc13dee4371db
This commit is contained in:
Andrzej J.R. Hunt
2013-07-17 13:19:40 +02:00
parent 2c10d784de
commit 5c97e88cfa
1 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
configure.ac
View File

@@ -8085,7 +8085,6 @@ dnl Check for Firebird stuff
dnl =================================================================== dnl ===================================================================
ENABLE_FIREBIRD_SDBC="" ENABLE_FIREBIRD_SDBC=""
if test "x$enable_firebird_sdbc" = "xyes"; then if test "x$enable_firebird_sdbc" = "xyes"; then
SCPDEFS="$SCPDEFS -DWITH_FIREBIRD_SDBC" SCPDEFS="$SCPDEFS -DWITH_FIREBIRD_SDBC"
dnl =================================================================== dnl ===================================================================
@@ -8118,16 +8117,19 @@ if test "x$enable_firebird_sdbc" = "xyes"; then
AC_MSG_ERROR([Ensure firebird 2.5.x is installed]) AC_MSG_ERROR([Ensure firebird 2.5.x is installed])
fi fi
AC_MSG_RESULT([includes $FIREBIRD_CFLAGS, libraries $FIREBIRD_LIBS]) AC_MSG_RESULT([includes $FIREBIRD_CFLAGS, libraries $FIREBIRD_LIBS])
ENABLE_FIREBIRD_SDBC="TRUE"
elif test "$enable_database_connectivity" != yes; then
AC_MSG_RESULT([none])
else else
dnl =================================================================== dnl ===================================================================
dnl Check for system libatomic-ops dnl Check for system libatomic-ops
dnl =================================================================== dnl ===================================================================
libo_CHECK_SYSTEM_MODULE([libatomic_ops],[ATOMIC_OPS],[atomic_ops >= 0.7.2]) libo_CHECK_SYSTEM_MODULE([libatomic_ops],[ATOMIC_OPS],[atomic_ops >= 0.7.2])
if test "$with_system_libatomic_ops" = "yes"; then if test "$with_system_libatomic_ops" = "yes"; then
SYSTEM_LIBATOMIC_OPS=YES SYSTEM_LIBATOMIC_OPS=YES
AC_CHECK_HEADERS(atomic_ops.h, [], AC_CHECK_HEADERS(atomic_ops.h, [],
[AC_MSG_ERROR(atomic_ops.h not found. install libatomic-ops)], []) [AC_MSG_ERROR(atomic_ops.h not found. install libatomic-ops)], [])
fi fi
AC_MSG_RESULT([internal]) AC_MSG_RESULT([internal])
SYSTEM_FIREBIRD=NO SYSTEM_FIREBIRD=NO
@@ -8149,9 +8151,9 @@ if test "x$enable_firebird_sdbc" = "xyes"; then
dnl LIBS=$save_LIBS dnl LIBS=$save_LIBS
BUILD_TYPE="$BUILD_TYPE FIREBIRD" BUILD_TYPE="$BUILD_TYPE FIREBIRD"
ENABLE_FIREBIRD_SDBC="TRUE"
fi fi
ENABLE_FIREBIRD_SDBC="TRUE"
fi fi
AC_SUBST(ENABLE_FIREBIRD_SDBC) AC_SUBST(ENABLE_FIREBIRD_SDBC)
AC_SUBST(SYSTEM_FIREBIRD) AC_SUBST(SYSTEM_FIREBIRD)