|
 |
2e2c49 |
diff --git a/config.h.in b/config.h.in
|
|
|
2e2c49 |
index 0c340db..dbeecd7 100644
|
|
|
2e2c49 |
--- a/config.h.in
|
|
|
2e2c49 |
+++ b/config.h.in
|
|
|
2e2c49 |
@@ -520,7 +520,7 @@ int sigwait(const unsigned int *set, int *sig);
|
|
|
2e2c49 |
#undef PREFER_GOSTASN1
|
|
|
2e2c49 |
|
|
|
2e2c49 |
/* The size of `void *', as computed by sizeof. */
|
|
|
2e2c49 |
-#undef SIZEOF_VOID_P
|
|
|
2e2c49 |
+/* #undef SIZEOF_VOID_P */
|
|
|
2e2c49 |
|
|
|
2e2c49 |
/* Define to 1 if you have the ANSI C header files. */
|
|
|
2e2c49 |
#undef STDC_HEADERS
|
|
|
2e2c49 |
diff --git a/configure.in b/configure.in
|
|
|
2e2c49 |
index 6b875ba..c39477c 100644
|
|
|
2e2c49 |
--- a/configure.in
|
|
|
2e2c49 |
+++ b/configure.in
|
|
|
2e2c49 |
@@ -3065,8 +3065,11 @@ int getnameinfo(const struct sockaddr *, size_t, char *,
|
|
|
2e2c49 |
size_t, char *, size_t, int);],
|
|
|
2e2c49 |
[ return (0);],
|
|
|
2e2c49 |
[AC_MSG_RESULT(size_t for buflen; int for flags)
|
|
|
2e2c49 |
- AC_DEFINE(IRS_GETNAMEINFO_SOCKLEN_T, size_t)
|
|
|
2e2c49 |
- AC_DEFINE(IRS_GETNAMEINFO_BUFLEN_T, size_t)
|
|
|
2e2c49 |
+ # Changed to solve multilib conflict on Fedora
|
|
|
2e2c49 |
+ # AC_DEFINE(IRS_GETNAMEINFO_SOCKLEN_T, size_t)
|
|
|
2e2c49 |
+ # AC_DEFINE(IRS_GETNAMEINFO_BUFLEN_T, size_t)
|
|
|
2e2c49 |
+ AC_DEFINE(IRS_GETNAMEINFO_SOCKLEN_T, socklen_t)
|
|
|
2e2c49 |
+ AC_DEFINE(IRS_GETNAMEINFO_BUFLEN_T, socklen_t)
|
|
|
2e2c49 |
AC_DEFINE(IRS_GETNAMEINFO_FLAGS_T, int)],
|
|
|
2e2c49 |
[AC_MSG_RESULT(not match any subspecies; assume standard definition)
|
|
|
2e2c49 |
AC_DEFINE(IRS_GETNAMEINFO_SOCKLEN_T, socklen_t)
|
|
|
2e2c49 |
diff --git a/isc-config.sh.in b/isc-config.sh.in
|
|
|
2e2c49 |
index 04a9e5c..67400d8 100644
|
|
|
2e2c49 |
--- a/isc-config.sh.in
|
|
|
2e2c49 |
+++ b/isc-config.sh.in
|
|
|
2e2c49 |
@@ -21,7 +21,18 @@ prefix=@prefix@
|
|
|
2e2c49 |
exec_prefix=@exec_prefix@
|
|
|
2e2c49 |
exec_prefix_set=
|
|
|
2e2c49 |
includedir=@includedir@
|
|
|
2e2c49 |
-libdir=@libdir@
|
|
|
2e2c49 |
+arch=$(uname -m)
|
|
|
2e2c49 |
+
|
|
|
2e2c49 |
+case $arch in
|
|
|
2e2c49 |
+ x86_64 | amd64 | sparc64 | s390x | ppc64)
|
|
|
2e2c49 |
+ libdir=/usr/lib64
|
|
|
2e2c49 |
+ sec_libdir=/usr/lib
|
|
|
2e2c49 |
+ ;;
|
|
|
2e2c49 |
+ * )
|
|
|
2e2c49 |
+ libdir=/usr/lib
|
|
|
2e2c49 |
+ sec_libdir=/usr/lib64
|
|
|
2e2c49 |
+ ;;
|
|
|
2e2c49 |
+esac
|
|
|
2e2c49 |
|
|
|
2e2c49 |
usage()
|
|
|
2e2c49 |
{
|
|
|
2e2c49 |
@@ -140,6 +151,16 @@ if test x"$echo_libs" = x"true"; then
|
|
|
2e2c49 |
if test x"${exec_prefix_set}" = x"true"; then
|
|
|
2e2c49 |
libs="-L${exec_prefix}/lib"
|
|
|
2e2c49 |
else
|
|
|
2e2c49 |
+ if [ ! -x $libdir/libisc.so ] ; then
|
|
|
2e2c49 |
+ if [ ! -x $sec_libdir/libisc.so ] ; then
|
|
|
2e2c49 |
+ echo "Error: ISC libs not found in $libdir"
|
|
|
2e2c49 |
+ if [ -d $sec_libdir ] ; then
|
|
|
2e2c49 |
+ echo "Error: ISC libs not found in $sec_libdir"
|
|
|
2e2c49 |
+ fi
|
|
|
2e2c49 |
+ exit 1
|
|
|
2e2c49 |
+ fi
|
|
|
2e2c49 |
+ libdir=$sec_libdir
|
|
|
2e2c49 |
+ fi
|
|
|
2e2c49 |
libs="-L${libdir}"
|
|
|
2e2c49 |
fi
|
|
|
2e2c49 |
if test x"$libirs" = x"true" ; then
|