Magellan Linux

Contents of /trunk/cyrus-sasl/patches/cyrus-sasl-2.1.26-sql-rpath.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 2412 - (show annotations) (download)
Mon Mar 3 14:45:58 2014 UTC (10 years, 1 month ago) by niro
File size: 1440 byte(s)
-patches for cyrus-sasl-2.1.26
1 --- configure.in 2012-10-12 16:05:48.000000000 +0200
2 +++ configure.in 2013-05-11 18:48:59.021848013 +0200
3 @@ -861,9 +860,9 @@
4 notfound) AC_WARN([SQLite Library not found]); true;;
5 *)
6 if test -d ${with_sqlite}/lib; then
7 - LIB_SQLITE="-L${with_sqlite}/lib -R${with_sqlite}/lib"
8 + LIB_SQLITE="-L${with_sqlite}/lib"
9 else
10 - LIB_SQLITE="-L${with_sqlite} -R${with_sqlite}"
11 + LIB_SQLITE="-L${with_sqlite}"
12 fi
13
14 LIB_SQLITE_DIR=$LIB_SQLITE
15 @@ -913,9 +912,9 @@
16 notfound) AC_WARN([SQLite3 Library not found]); true;;
17 *)
18 if test -d ${with_sqlite3}/lib; then
19 - LIB_SQLITE3="-L${with_sqlite3}/lib -R${with_sqlite3}/lib"
20 + LIB_SQLITE3="-L${with_sqlite3}/lib"
21 else
22 - LIB_SQLITE3="-L${with_sqlite3} -R${with_sqlite3}"
23 + LIB_SQLITE3="-L${with_sqlite3}"
24 fi
25
26 LIB_SQLITE3_DIR=$LIB_SQLITE3
27 --- configure.in
28 +++ configure.in
29 @@ -674,7 +674,9 @@
30 LIB_PGSQL_DIR=$LIB_PGSQL
31 LIB_PGSQL="$LIB_PGSQL -lpq"
32
33 - if test -d ${with_pgsql}/include/pgsql; then
34 + if test -d ${with_pgsql}/include/postgresql/pgsql; then
35 + CPPFLAGS="${CPPFLAGS} -I${with_pgsql}/include/postgresql/pgsql"
36 + elif test -d ${with_pgsql}/include/pgsql; then
37 CPPFLAGS="${CPPFLAGS} -I${with_pgsql}/include/pgsql"
38 elif test -d ${with_pgsql}/pgsql/include; then
39 CPPFLAGS="${CPPFLAGS} -I${with_pgsql}/pgsql/include"