cb2172301b
Remove merged upstream patches Signed-off-by: Petr Menšík <pemensik@redhat.com> Update new so names
113 lines
2.7 KiB
Diff
113 lines
2.7 KiB
Diff
diff --git a/contrib/dlz/config.dlz.in b/contrib/dlz/config.dlz.in
|
|
index 5d65a85..2677b26 100644
|
|
--- a/contrib/dlz/config.dlz.in
|
|
+++ b/contrib/dlz/config.dlz.in
|
|
@@ -17,6 +17,13 @@
|
|
#
|
|
dlzdir='${DLZ_DRIVER_DIR}'
|
|
|
|
+AC_MSG_CHECKING([for target libdir])
|
|
+AC_RUN_IFELSE([int main(void) {exit((sizeof(void *) == 8) ? 0 : 1);}],
|
|
+ [target_lib=lib64],
|
|
+ [target_lib=lib],
|
|
+)
|
|
+AC_MSG_RESULT(["$target_lib"])
|
|
+
|
|
#
|
|
# Private autoconf macro to simplify configuring drivers:
|
|
#
|
|
@@ -152,23 +159,11 @@ then
|
|
then
|
|
use_dlz_mysql=$d
|
|
mysql_include=$d/include/mysql
|
|
- if test -d $d/lib/mysql
|
|
- then
|
|
- mysql_lib=$d/lib/mysql
|
|
- else
|
|
- mysql_lib=$d/lib
|
|
- fi
|
|
break
|
|
elif test -f $d/include/mysql.h
|
|
then
|
|
use_dlz_mysql=$d
|
|
mysql_include=$d/include
|
|
- if test -d $d/lib/mysql
|
|
- then
|
|
- mysql_lib=$d/lib/mysql
|
|
- else
|
|
- mysql_lib=$d/lib
|
|
- fi
|
|
break
|
|
fi
|
|
done
|
|
@@ -179,21 +174,9 @@ then
|
|
if test -f $d/include/mysql/mysql.h
|
|
then
|
|
mysql_include=$d/include/mysql
|
|
- if test -d $d/lib/mysql
|
|
- then
|
|
- mysql_lib=$d/lib/mysql
|
|
- else
|
|
- mysql_lib=$d/lib
|
|
- fi
|
|
elif test -f $d/include/mysql.h
|
|
then
|
|
mysql_include=$d/include
|
|
- if test -d $d/lib/mysql
|
|
- then
|
|
- mysql_lib=$d/lib/mysql
|
|
- else
|
|
- mysql_lib=$d/lib
|
|
- fi
|
|
fi
|
|
fi
|
|
|
|
@@ -217,6 +200,12 @@ case "$use_dlz_mysql" in
|
|
[using mysql with libs ${mysql_lib} and includes ${mysql_include}])
|
|
;;
|
|
*)
|
|
+ if test -d $use_dlz_mysql/${target_lib}/mysql
|
|
+ then
|
|
+ mysql_lib=$use_dlz_mysql/${target_lib}/mysql
|
|
+ else
|
|
+ mysql_lib=$use_dlz_mysql/${target_lib}
|
|
+ fi
|
|
DLZ_ADD_DRIVER(MYSQL, dlz_mysql_driver,
|
|
[-I${mysql_include}],
|
|
[-L${mysql_lib} -lmysqlclient -lz -lcrypt -lm])
|
|
@@ -310,9 +299,9 @@ case "$use_dlz_bdb" in
|
|
then
|
|
break
|
|
fi
|
|
- elif test -f "$dd/lib/lib${d}.so"
|
|
+ elif test -f "$dd/${target_lib}/lib${d}.so"
|
|
then
|
|
- dlz_bdb_libs="-L${dd}/lib -l${d}"
|
|
+ dlz_bdb_libs="-L${dd}/${target_lib} -l${d}"
|
|
break
|
|
fi
|
|
done
|
|
@@ -414,7 +403,7 @@ case "$use_dlz_ldap" in
|
|
*)
|
|
DLZ_ADD_DRIVER(LDAP, dlz_ldap_driver,
|
|
[-I$use_dlz_ldap/include],
|
|
- [-L$use_dlz_ldap/lib -lldap -llber])
|
|
+ [-L$use_dlz_ldap/${target_lib} -lldap -llber])
|
|
|
|
AC_MSG_RESULT(
|
|
[using LDAP from $use_dlz_ldap/lib and $use_dlz_ldap/include])
|
|
@@ -450,11 +439,11 @@ then
|
|
odbcdirs="/usr /usr/local /usr/pkg"
|
|
for d in $odbcdirs
|
|
do
|
|
- if test -f $d/include/sql.h -a -f $d/lib/libodbc.a
|
|
+ if test -f $d/include/sql.h -a -f $d/${target_lib}/libodbc.a
|
|
then
|
|
use_dlz_odbc=$d
|
|
dlz_odbc_include="-I$use_dlz_odbc/include"
|
|
- dlz_odbc_libs="-L$use_dlz_odbc/lib -lodbc"
|
|
+ dlz_odbc_libs="-L$use_dlz_odbc/${target_lib} -lodbc"
|
|
break
|
|
fi
|
|
done
|