Show
Ignore:
Timestamp:
2007-04-05 21:38:19 (21 months ago)
Author:
Michael Elkins <me@…>
Branch:
HEAD
Message:

Fixup to detect qdbm includes in /usr/include/qdbm.

Remove HAVE_QDBM_VILLA_H because it is redundant.

Files:
1 modified

Legend:

Unmodified
Added
Removed

  • configure.ac

    r5077 r5078  
    838838      if test -n "$with_qdbm" -a "$with_qdbm" != "yes" 
    839839      then 
    840         CPPFLAGS="$CPPFLAGS -I$with_qdbm/include" 
     840        if test -d $with_qdbm/include/qdbm; then 
     841          CPPFLAGS="$CPPFLAGS -I$with_qdbm/include/qdbm" 
     842        else 
     843          CPPFLAGS="$CPPFLAGS -I$with_qdbm/include" 
     844        fi 
    841845        LDFLAGS="$LDFLAGS -L$with_qdbm/lib" 
     846      else 
     847         if test -d /usr/include/qdbm; then 
     848           CPPFLAGS="$CPPFLAGS -I/usr/include/qdbm" 
     849         fi 
    842850      fi 
    843851 
    844852      saved_LIBS="$LIBS" 
    845       AC_CHECK_HEADERS(villa.h qdbm/villa.h) 
     853      AC_CHECK_HEADERS(villa.h) 
    846854      AC_CHECK_LIB(qdbm, vlopen, [MUTTLIBS="$MUTTLIBS -lqdbm"; use_qdbm=yes]) 
    847855      LIBS="$saved_LIBS"