Tomas Hozza 574dc4
diff -up bind-9.9.3rc2/config.h.in.multlib-conflict bind-9.9.3rc2/config.h.in
Tomas Hozza 574dc4
--- bind-9.9.3rc2/config.h.in.multlib-conflict	2013-04-30 08:38:46.000000000 +0200
Tomas Hozza 574dc4
+++ bind-9.9.3rc2/config.h.in	2013-05-13 12:10:22.514870894 +0200
Tomas Hozza 574dc4
@@ -416,7 +416,7 @@ int sigwait(const unsigned int *set, int
Tomas Hozza bec773
 #undef PORT_NONBLOCK
Tomas Hozza bec773
 
Tomas Hozza bec773
 /* The size of `void *', as computed by sizeof. */
Tomas Hozza bec773
-#undef SIZEOF_VOID_P
Tomas Hozza bec773
+/* #undef SIZEOF_VOID_P */
Tomas Hozza bec773
 
Tomas Hozza bec773
 /* Define to 1 if you have the ANSI C header files. */
Tomas Hozza bec773
 #undef STDC_HEADERS
Tomas Hozza 574dc4
diff -up bind-9.9.3rc2/configure.in.multlib-conflict bind-9.9.3rc2/configure.in
Tomas Hozza 574dc4
--- bind-9.9.3rc2/configure.in.multlib-conflict	2013-05-13 12:10:22.481870901 +0200
Tomas Hozza 574dc4
+++ bind-9.9.3rc2/configure.in	2013-05-13 12:10:22.515870894 +0200
Tomas Hozza 574dc4
@@ -2251,7 +2251,9 @@ int getnameinfo(const struct sockaddr *,
Tomas Hozza bec773
                 size_t, char *, size_t, int);],
Tomas Hozza bec773
 [ return (0);],
Tomas Hozza bec773
 	[AC_MSG_RESULT(size_t for buflen; int for flags)
Tomas Hozza bec773
-	 AC_DEFINE(IRS_GETNAMEINFO_BUFLEN_T, size_t)
Tomas Hozza bec773
+	# Changed to solve multilib conflict on Fedora 
Tomas Hozza bec773
+	#AC_DEFINE(IRS_GETNAMEINFO_BUFLEN_T, size_t)
Tomas Hozza bec773
+	 AC_DEFINE(IRS_GETNAMEINFO_BUFLEN_T, socklen_t)
Tomas Hozza bec773
 	 AC_DEFINE(IRS_GETNAMEINFO_FLAGS_T, int)],
Tomas Hozza bec773
 [AC_MSG_RESULT(not match any subspecies; assume standard definition)
Tomas Hozza bec773
 AC_DEFINE(IRS_GETNAMEINFO_BUFLEN_T, socklen_t)
Tomas Hozza 574dc4
diff -up bind-9.9.3rc2/isc-config.sh.in.multlib-conflict bind-9.9.3rc2/isc-config.sh.in
Tomas Hozza 574dc4
--- bind-9.9.3rc2/isc-config.sh.in.multlib-conflict	2013-04-30 08:38:46.000000000 +0200
Tomas Hozza 574dc4
+++ bind-9.9.3rc2/isc-config.sh.in	2013-05-13 12:26:40.258698745 +0200
Tomas Hozza 574dc4
@@ -21,7 +21,18 @@ prefix=@prefix@
Tomas Hozza bec773
 exec_prefix=@exec_prefix@
Tomas Hozza bec773
 exec_prefix_set=
Tomas Hozza bec773
 includedir=@includedir@
Tomas Hozza 574dc4
-libdir=@libdir@
Tomas Hozza bec773
+arch=$(uname -m)
Tomas Hozza bec773
+
Tomas Hozza bec773
+case $arch in
Tomas Hozza bec773
+	x86_64 | amd64 | sparc64 | s390x | ppc64)
Tomas Hozza bec773
+		libdir=/usr/lib64
Tomas Hozza bec773
+		sec_libdir=/usr/lib
Tomas Hozza bec773
+		;;
Tomas Hozza bec773
+	* )
Tomas Hozza bec773
+		libdir=/usr/lib
Tomas Hozza bec773
+		sec_libdir=/usr/lib64
Tomas Hozza bec773
+		;;
Tomas Hozza bec773
+esac
Tomas Hozza bec773
 
Tomas Hozza bec773
 usage()
Tomas Hozza bec773
 {
Tomas Hozza 574dc4
@@ -133,6 +144,16 @@ if test x"$echo_libs" = x"true"; then
Tomas Hozza 574dc4
 	if test x"${exec_prefix_set}" = x"true"; then
Tomas Hozza 574dc4
 		includes="-L${exec_prefix}/lib"
Tomas Hozza 574dc4
 	else
Tomas Hozza 574dc4
+		if [ ! -x $libdir/libisc.so ] ; then
Tomas Hozza 574dc4
+			if [ ! -x $sec_libdir/libisc.so ] ; then
Tomas Hozza 574dc4
+				echo "Error: ISC libs not found in $libdir"
Tomas Hozza 574dc4
+				if [ -d $sec_libdir ] ; then
Tomas Hozza 574dc4
+					echo "Error: ISC libs not found in $sec_libdir"
Tomas Hozza 574dc4
+				fi
Tomas Hozza 574dc4
+				exit 1
Tomas Hozza bec773
+			fi
Tomas Hozza 574dc4
+			libdir=$sec_libdir
Tomas Hozza bec773
+		fi
Tomas Hozza 574dc4
 		libs="-L${libdir}"
Tomas Hozza 574dc4
 	fi
Tomas Hozza bec773
 	if test x"$liblwres" = x"true" ; then