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

configure.ac: working firebird version check with manual FIREBIRD_C/LDFLAGS

Browse Source 
Change-Id: I511eb8bfcfab2d42073f43660518e1e8be0d5788
This commit is contained in:
Lionel Elie Mamane
2013-07-23 10:06:54 +02:00
parent 61eed5f1b9
commit 19a6c484c3
1 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
configure.ac
View File

@@ -8159,7 +8159,9 @@ if test "x$enable_firebird_sdbc" = "xyes"; then
FIREBIRD_CFLAGS=`$FIREBIRDCONFIG --cflags` FIREBIRD_CFLAGS=`$FIREBIRDCONFIG --cflags`
FIREBIRD_LIBS=`$FIREBIRDCONFIG --embedlibs` FIREBIRD_LIBS=`$FIREBIRDCONFIG --embedlibs`
fi fi
AC_MSG_RESULT([includes `$FIREBIRD_CFLAGS', libraries `$FIREBIRD_LIBS'])
AC_MSG_CHECKING([Firebird version]) AC_MSG_CHECKING([Firebird version])
if test -n "${FIREBIRD_VERSION}"; then
FIREBIRD_MAJOR=`echo $FIREBIRD_VERSION | cut -d"." -f1` FIREBIRD_MAJOR=`echo $FIREBIRD_VERSION | cut -d"." -f1`
FIREBIRD_MINOR=`echo $FIREBIRD_VERSION | cut -d"." -f2` FIREBIRD_MINOR=`echo $FIREBIRD_VERSION | cut -d"." -f2`
if test "$FIREBIRD_MAJOR" -eq "2" -a "$FIREBIRD_MINOR" -eq "5"; then if test "$FIREBIRD_MAJOR" -eq "2" -a "$FIREBIRD_MINOR" -eq "5"; then
@@ -8167,7 +8169,16 @@ if test "x$enable_firebird_sdbc" = "xyes"; then
else else
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]) else
__save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} ${FIREBIRD_CFLAGS}"
AC_COMPILE_IFELSE([AC_LANG_SOURCE([[#include <ibase.h>
#if defined(FB_API_VER) && FB_API_VER == 25
#else
#error "Wrong Firebird API version"
#endif]])],AC_MSG_RESULT([OK]),AC_MSG_ERROR([Ensure firebird 2.5.x is installed]))
CFLAGS="${__save_CFLAGS}"
fi
ENABLE_FIREBIRD_SDBC="TRUE" ENABLE_FIREBIRD_SDBC="TRUE"
elif test "$enable_database_connectivity" != yes; then elif test "$enable_database_connectivity" != yes; then
AC_MSG_RESULT([none]) AC_MSG_RESULT([none])