← Back to branch summary

~ubuntu-branches/ubuntu/precise/libdbi-drivers/precise

« back to all changes in this revision

Viewing changes to acinclude.m4

  • Committer: Stefano Rivera
  • Date: 2010-08-07 14:06:29 UTC
  • mfrom: (5.1.1 libdbi-drivers)
  • Revision ID: stefanor@ubuntu.com-20100807140629-dshfwn5j6v34pqrd
Tags: 0.8.3-1-0ubuntu1
New upstream release. -- Fixes ABORT problems with sqlite3+rrdtool

Show diffs side-by-side

added added

removed removed

Lines of Context:
acinclude.m4
450
450
                firebird_incdirs="/opt/firebird/include /usr/include /usr/local/include /usr/include/firebird /usr/local/include/firebird /usr/local/firebird/include /opt/firebird/include"
451
451
                AC_FIND_FILE(ibase.h, $firebird_incdirs, ac_firebird_incdir)
452
452
                firebird_libdirs="/opt/firebird/lib /usr/lib /usr/local/lib /usr/lib/firebird /usr/local/lib/firebird /usr/local/firebird/lib /opt/firebird/lib"
453
 
                AC_FIND_FILE(libfbclient.so, $firebird_libdirs, ac_firebird_libdir)
 
453
dnl             AC_FIND_FILE(libfbclient.so, $firebird_libdirs, ac_firebird_libdir)
 
454
                AC_FIND_FILE(libfbembed.so, $firebird_libdirs, ac_firebird_libdir)
454
455
                if test "$ac_firebird_incdir" = "no"; then
455
456
                        AC_MSG_RESULT(no)
456
457
                        AC_MSG_ERROR([Invalid Firebird/Interbase directory - include files not found.])
465
466
        
466
467
        dnl libfbclient needs pthreads
467
468
        AC_SEARCH_LIBS(pthread_create, c_r pthread,,)
468
 
 
469
 
        FIREBIRD_LIBS="-lfbclient"
 
469
        CFLAGS="$CFLAGS -I$ac_firebird_incdir"
 
470
 
 
471
        dnl firebird versions prior to 2.0 do not define ISC_SCHAR
 
472
        AC_MSG_CHECKING(for ISC_SCHAR type definition)
 
473
        AC_COMPILE_IFELSE(AC_LANG_PROGRAM(
 
474
        [[#include <ibase.h>]],
 
475
        [[ISC_SCHAR c;]]),
 
476
 
 
477
        [AC_DEFINE([HAVE_ISC_SCHAR], ["1"], [Define to 1 if ibase.h defines ISC_SCHAR])
 
478
        SCHAR_MSG="yes"],
 
479
        [SCHAR_MSG="no"])
 
480
        AC_MSG_RESULT([$SCHAR_MSG])
 
481
 
 
482
dnl     FIREBIRD_LIBS="-lfbclient"
 
483
        FIREBIRD_LIBS="-lfbembed"
470
484
        FIREBIRD_INCLUDE="-I$ac_firebird_incdir"
471
 
        FIREBIRD_LDFLAGS=-L$ac_firebird_libdir
 
485
        FIREBIRD_LDFLAGS="-L$ac_firebird_libdir"
472
486
        
473
487
        AC_SUBST(FIREBIRD_LIBS)
474
488
        AC_SUBST(FIREBIRD_INCLUDE)