Changeset 1022

Show
Ignore:
Timestamp:
04/09/07 13:55:28 (2 years ago)
Author:
ahu
Message:

fix sqlite comments in configure.in, fix static compilation of postgresql

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/pdns/build-scripts/rpm-build-instruction

    r1007 r1022  
    11#!/bin/sh 
     2LIBS="-lkrb5 -lk5crypto -lpgport -lgssapi_krb5 -lkrb5support -lgssapi_krb5 -lcom_err -lnsl -lresolv" \ 
    23CC="ccache gcc" CXX="ccache g++" ./configure \ 
    34                --with-modules="mysql gmysql gpgsql gsqlite gsqlite3 pipe pdns geo" \ 
    4                 --with-pgsql-lib=/opt/postgresql/lib/ \ 
    5                 --with-pgsql-includes=/opt/postgresql/include/ \ 
    65        --with-dynmodules="" \ 
    76        --enable-static-binaries \ 

  • trunk/pdns/configure.in

    r998 r1022  
    3535# Check for libdl 
    3636 
    37 LIBS=-lz 
     37LIBS= $LIBS -lz 
    3838 
    3939my_save_LIBS="$LIBS" 
    …… 
    420420then 
    421421        AC_ARG_WITH(sqlite3, 
    422             [  --with-sqlite3=<path>     root directory path of SQLite installation], 
     422            [  --with-sqlite3=<path>     root directory path of SQLite3 installation], 
    423423            [SQLITE3_lib_check="$withval/lib/sqlite3 $with_sqlite3/lib" 
    424424             SQLITE3_inc_check="$withval/include/sqlite3"], 
    …… 
    426426             SQLITE3_inc_check="/usr/local/sqlite3/include/sqlite3 /usr/local/include/sqlite3/ /usr/local/include /opt/sqlite3/include/sqlite3 /opt/sqlite3/include /usr/include/ /usr/include/sqlite3"]) 
    427427        AC_ARG_WITH(sqlite3-lib, 
    428             [  --with-sqlite3-lib=<path> directory path of SQLite library installation], 
     428            [  --with-sqlite3-lib=<path> directory path of SQLite3 library installation], 
    429429            [SQLITE3_lib_check="$withval/lib/sqlite3 $withval/sqlite3 $withval"]) 
    430430        AC_ARG_WITH(sqlite3-includes, 
    431             [  --with-sqlite3-includes=<path> directory path of SQLite header installation], 
     431            [  --with-sqlite3-includes=<path> directory path of SQLite3 header installation], 
    432432            [SQLITE3_inc_check="$withval/include/sqlite3 $withval/sqlite3 $withval"]) 
    433         AC_MSG_CHECKING([for SQLite library directory]) 
     433        AC_MSG_CHECKING([for SQLite3 library directory]) 
    434434        SQLITE3_libdir= 
    435435        for m in $SQLITE3_lib_check; do 
    …… 
    449449               LDFLAGS="$SQLITE3_lib $LDFLAGS" 
    450450               ;; 
    451           * )  AC_MSG_ERROR([The SQLite library directory ($SQLITE3_libdir) must be an absolute path.]) ;; 
     451          * )  AC_MSG_ERROR([The SQLite3 library directory ($SQLITE3_libdir) must be an absolute path.]) ;; 
    452452        esac 
    453453 
    454454        AC_SUBST(SQLITE3_lib) 
    455455        AC_MSG_RESULT([$SQLITE3_libdir]) 
    456         AC_MSG_CHECKING([for SQLite include directory]) 
     456        AC_MSG_CHECKING([for SQLite3 include directory]) 
    457457        SQLITE3_incdir= 
    458458        for m in $SQLITE3_inc_check; do 
    …… 
    464464        done 
    465465                if test -z "$SQLITE3_incdir"; then 
    466                 AC_MSG_ERROR([Didn't find the SQLite include dir in '$SQLITE3_inc_check']) 
     466                AC_MSG_ERROR([Didn't find the SQLite3 include dir in '$SQLITE3_inc_check']) 
    467467        fi 
    468468        case "$SQLITE3_incdir" in 
    469469          /* ) ;; 
    470           * )  AC_MSG_ERROR([The SQLite include directory ($SQLITE3_incdir) must be an absolute path.]) ;; 
     470          * )  AC_MSG_ERROR([The SQLite3 include directory ($SQLITE3_incdir) must be an absolute path.]) ;; 
    471471        esac 
    472472        AC_SUBST(SQLITE3_incdir)