Changeset 2204

Show
Ignore:
Timestamp:
06/03/11 13:22:52 (2 years ago)
Author:
ahu
Message:

Ruben van Staveren fixed our failure to detect libraries in lib64 on certain platforms for gsqlite3 and gpgsqlite, thanks!

Files:
1 modified

Legend:

Unmodified
Added
Removed

  • trunk/pdns/configure.ac

    r2165 r2204  
    374374            [PGSQL_lib_check="$withval/lib/pgsql $with_pgsql/lib" 
    375375        PGSQL_inc_check="$withval/include/pgsql"], 
    376             [PGSQL_lib_check="/usr/local/pgsql/lib/pgsql /usr/local/lib/pgsql /opt/pgsql/lib/pgsql /usr/lib/pgsql /usr/local/pgsql/lib /usr/local/lib /opt/pgsql/lib /usr/lib" 
     376            [PGSQL_lib_check="/usr/local/pgsql/lib/pgsql /usr/local/lib/pgsql /opt/pgsql/lib/pgsql /usr/lib/pgsql /usr/local/pgsql/lib /usr/local/lib /opt/pgsql/lib /usr/lib /usr/lib64" 
    377377        PGSQL_inc_check="/usr/local/pgsql/include/pgsql /usr/include /usr/local/include/postgresql/ /usr/local/include /opt/pgsql/include/pgsql /opt/pgsql/include /usr/include/pgsql/ /usr/include/postgresql"]) 
    378378                AC_ARG_WITH(pgsql-lib, 
    … …  
    397397        fi 
    398398        case "$PGSQL_libdir" in 
    399            /usr/lib ) PGSQL_lib="" ;; 
     399          /usr/lib ) PGSQL_lib="" ;; 
     400          /usr/lib64 ) PGSQL_lib="" ;; 
    400401          /* ) PGSQL_lib="-L$PGSQL_libdir -Wl,-rpath,$PGSQL_libdir"  
    401402               LDFLAGS="$PGSQL_lib $LDFLAGS" 
    … …  
    435436            [SQLITE_lib_check="$withval/lib/sqlite $with_sqlite/lib" 
    436437        SQLITE_inc_check="$withval/include/sqlite"], 
    437             [SQLITE_lib_check="/usr/local/sqlite/lib/sqlite /usr/local/lib/sqlite /opt/pgsql/lib/sqlite /usr/lib/sqlite /usr/local/sqlite/lib /usr/local/lib /opt/sqlite/lib /usr/lib" 
     438            [SQLITE_lib_check="/usr/local/sqlite/lib/sqlite /usr/local/lib/sqlite /opt/pgsql/lib/sqlite /usr/lib/sqlite /usr/local/sqlite/lib /usr/local/lib /opt/sqlite/lib /usr/lib /usr/lib64" 
    438439        SQLITE_inc_check="/usr/local/sqlite/include/sqlite /usr/local/include/sqlite/ /usr/local/include /opt/sqlite/include/sqlite /opt/sqlite/include /usr/include/ /usr/include/sqlite"]) 
    439440                AC_ARG_WITH(sqlite-lib, 
    … …  
    458459        fi 
    459460        case "$SQLITE_libdir" in 
    460            /usr/lib ) SQLITE_lib="" ;; 
     461          /usr/lib ) SQLITE_lib="" ;; 
     462          /usr/lib64 ) SQLITE_lib="" ;; 
    461463          /* ) SQLITE_lib="-L$SQLITE_libdir -Wl,-rpath,$SQLITE_libdir" 
    462464               LDFLAGS="$SQLITE_lib $LDFLAGS"