[Libreoffice-commits] core.git: configure.ac

[Lionel Elie Mamane]

 configure.ac |    5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

New commits:
commit 2ea2648bdc63a9f3b29b2ff4f377aedb45cc45fd
Author: Lionel Elie Mamane <lionel at mamane.lu>
Date:   Fri Jul 19 03:55:53 2013 +0200

    configure.ac properly use pkg-config
    
    Change-Id: Ib45d9defd94c8c61250aa249daa1c3312574a684

diff --git a/configure.ac b/configure.ac
index 6de7893..a5180a1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8097,10 +8097,7 @@ if test "x$enable_firebird_sdbc" = "xyes"; then
         AC_PATH_PROG(FIREBIRDCONFIG, [fb_config])
         if test -z "$FIREBIRDCONFIG"; then
             AC_MSG_NOTICE([No fb_config -- using pkg-config])
-            FIREBIRD_VERSION=`pkg-config --modversion fbembed`
-            AC_MSG_CHECKING([for Firebird Client library])
-            FIREBIRD_CFLAGS=`pkg-config --cflags fbembed`
-            FIREBIRD_LIBS=`pkg-config --libs fbembed`
+            PKG_CHECK_MODULES(FIREBIRD, fbembed)
         else
             AC_MSG_NOTICE([fb_config found])
             FIREBIRD_VERSION=`$FIREBIRDCONFIG --version`