]>
Commit | Line | Data |
---|---|---|
65df70ab JB |
1 | --- bacula-2.2.6/autoconf/bacula-macros/db.m4.orig 2008-01-05 20:59:42.130439587 +0100 |
2 | +++ bacula-2.2.6/autoconf/bacula-macros/db.m4 2008-01-05 20:58:25.513191191 +0100 | |
3 | @@ -94,7 +94,7 @@ | |
4 | AC_DEFINE(HAVE_THREAD_SAFE_MYSQL) | |
5 | fi | |
6 | SQL_BINDIR=$MYSQL_BINDIR | |
7 | - SQL_LIB=$MYSQL_LIBDIR/libmysqlclient_r.a | |
8 | + SQL_LIB=$MYSQL_LIBDIR/libmysqlclient_r.so | |
9 | ||
10 | AC_DEFINE(HAVE_MYSQL) | |
11 | AC_MSG_RESULT(yes) | |
12 | @@ -271,7 +271,7 @@ | |
13 | SQL_INCLUDE=-I$SQLITE_INCDIR | |
14 | SQL_LFLAGS="-L$SQLITE_LIBDIR -lsqlite" | |
15 | SQL_BINDIR=$SQLITE_BINDIR | |
16 | - SQL_LIB=$SQLITE_LIBDIR/libsqlite.a | |
17 | + SQL_LIB=$SQLITE_LIBDIR/libsqlite.so | |
18 | ||
19 | AC_DEFINE(HAVE_SQLITE) | |
20 | AC_MSG_RESULT(yes) | |
21 | @@ -353,7 +353,7 @@ | |
22 | SQL_INCLUDE=-I$SQLITE_INCDIR | |
23 | SQL_LFLAGS="-L$SQLITE_LIBDIR -lsqlite3" | |
24 | SQL_BINDIR=$SQLITE_BINDIR | |
25 | - SQL_LIB=$SQLITE_LIBDIR/libsqlite3.a | |
26 | + SQL_LIB=$SQLITE_LIBDIR/libsqlite3.so | |
27 | ||
28 | AC_DEFINE(HAVE_SQLITE3) | |
29 | AC_MSG_RESULT(yes) | |
30 | @@ -452,7 +452,7 @@ | |
31 | SQL_INCLUDE=-I$POSTGRESQL_INCDIR | |
32 | SQL_LFLAGS=$POSTGRESQL_LFLAGS | |
33 | SQL_BINDIR=$POSTGRESQL_BINDIR | |
34 | - SQL_LIB=$POSTGRESQL_LIBDIR/libpq.a | |
35 | + SQL_LIB=$POSTGRESQL_LIBDIR/libpq.so | |
36 | ||
37 | AC_DEFINE(HAVE_POSTGRESQL) | |
38 | AC_MSG_RESULT(yes) | |
39 | --- bacula-2.2.6/autoconf/configure.in.orig 2008-01-05 20:47:52.624185000 +0100 | |
40 | +++ bacula-2.2.6/autoconf/configure.in 2008-01-05 20:59:28.983101104 +0100 | |
41 | @@ -1331,7 +1331,7 @@ | |
42 | # enable batch attribute DB insert (default on) | |
43 | # ------------------------------------------- | |
44 | support_batch_insert=no | |
45 | -A=`nm $SQL_LIB | grep pthread_mutex_lock` | |
46 | +A=`objdump -tT $SQL_LIB 2>/dev/null| grep pthread_mutex_lock` | |
47 | pkg=$? | |
48 | if test $pkg = 0; then | |
49 | support_batch_insert=yes | |
50 | @@ -1346,7 +1346,7 @@ | |
51 | ||
52 | # Check if postgresql support batch mode | |
53 | if test x$DB_TYPE = xpostgresql; then | |
54 | - A=`nm $SQL_LIB | grep PQputCopyData` | |
55 | + A=`objdump -tT $SQL_LIB 2>/dev/null| grep PQputCopyData` | |
56 | pkg=$? | |
57 | if test $pkg != 0; then | |
58 | support_batch_insert=no |