Tomas Hozza a01339
diff -up bind-9.9.1-P2/config.h.in.multlib-conflict bind-9.9.1-P2/config.h.in
Tomas Hozza a01339
--- bind-9.9.1-P2/config.h.in.multlib-conflict	2012-08-01 14:07:40.300605215 +0200
Tomas Hozza a01339
+++ bind-9.9.1-P2/config.h.in	2012-08-01 14:08:06.449526607 +0200
Tomas Hozza a01339
@@ -400,7 +400,7 @@ int sigwait(const unsigned int *set, int
Tomas Hozza a01339
 #undef PORT_NONBLOCK
Tomas Hozza a01339
 
Tomas Hozza a01339
 /* The size of `void *', as computed by sizeof. */
Tomas Hozza a01339
-#undef SIZEOF_VOID_P
Tomas Hozza a01339
+/* #undef SIZEOF_VOID_P */
Tomas Hozza a01339
 
Tomas Hozza a01339
 /* Define to 1 if you have the ANSI C header files. */
Tomas Hozza a01339
 #undef STDC_HEADERS
Tomas Hozza a01339
diff -up bind-9.9.1-P2/configure.in.multlib-conflict bind-9.9.1-P2/configure.in
Tomas Hozza a01339
--- bind-9.9.1-P2/configure.in.multlib-conflict	2012-08-01 13:25:04.871278041 +0200
Tomas Hozza a01339
+++ bind-9.9.1-P2/configure.in	2012-08-01 13:25:08.705266546 +0200
Tomas Hozza a01339
@@ -2102,7 +2102,9 @@ int getnameinfo(const struct sockaddr *,
Tomas Hozza a01339
                 size_t, char *, size_t, int);],
Tomas Hozza a01339
 [ return (0);],
Tomas Hozza a01339
 	[AC_MSG_RESULT(size_t for buflen; int for flags)
Tomas Hozza a01339
-	 AC_DEFINE(IRS_GETNAMEINFO_BUFLEN_T, size_t)
Tomas Hozza a01339
+	# Changed to solve multilib conflict on Fedora 
Tomas Hozza a01339
+	#AC_DEFINE(IRS_GETNAMEINFO_BUFLEN_T, size_t)
Tomas Hozza a01339
+	 AC_DEFINE(IRS_GETNAMEINFO_BUFLEN_T, socklen_t)
Tomas Hozza a01339
 	 AC_DEFINE(IRS_GETNAMEINFO_FLAGS_T, int)],
Tomas Hozza a01339
 [AC_MSG_RESULT(not match any subspecies; assume standard definition)
Tomas Hozza a01339
 AC_DEFINE(IRS_GETNAMEINFO_BUFLEN_T, socklen_t)
Tomas Hozza a01339
diff -up bind-9.9.1-P2/isc-config.sh.in.multlib-conflict bind-9.9.1-P2/isc-config.sh.in
Tomas Hozza a01339
--- bind-9.9.1-P2/isc-config.sh.in.multlib-conflict	2012-08-01 10:30:18.414494493 +0200
Tomas Hozza a01339
+++ bind-9.9.1-P2/isc-config.sh.in	2012-08-01 14:12:11.696789273 +0200
Tomas Hozza a01339
@@ -20,8 +20,19 @@
Tomas Hozza a01339
 prefix=@prefix@
Tomas Hozza a01339
 exec_prefix=@exec_prefix@
Tomas Hozza a01339
 exec_prefix_set=
Tomas Hozza a01339
-libdir=@libdir@
Tomas Hozza a01339
 includedir=@includedir@
Tomas Hozza a01339
+arch=$(uname -m)
Tomas Hozza a01339
+
Tomas Hozza a01339
+case $arch in
Tomas Hozza a01339
+	x86_64 | amd64 | sparc64 | s390x | ppc64)
Tomas Hozza a01339
+		libdir=/usr/lib64
Tomas Hozza a01339
+		sec_libdir=/usr/lib
Tomas Hozza a01339
+		;;
Tomas Hozza a01339
+	* )
Tomas Hozza a01339
+		libdir=/usr/lib
Tomas Hozza a01339
+		sec_libdir=/usr/lib64
Tomas Hozza a01339
+		;;
Tomas Hozza a01339
+esac
Tomas Hozza a01339
 
Tomas Hozza a01339
 usage()
Tomas Hozza a01339
 {
Tomas Hozza a01339
@@ -124,6 +135,16 @@ if test x"$echo_cflags" = x"true"; then
Tomas Hozza a01339
 	echo $includes
Tomas Hozza a01339
 fi
Tomas Hozza a01339
 if test x"$echo_libs" = x"true"; then
Tomas Hozza a01339
+	if [ ! -x $libdir/libisc.so ] ; then
Tomas Hozza a01339
+		if [ ! -x $sec_libdir/libisc.so ] ; then
Tomas Hozza a01339
+			echo "Error: ISC libs not found in $libdir"
Tomas Hozza a01339
+			if [ -d $sec_libdir ] ; then
Tomas Hozza a01339
+				echo "Error: ISC libs not found in $sec_libdir"
Tomas Hozza a01339
+			fi
Tomas Hozza a01339
+			exit 1
Tomas Hozza a01339
+		fi
Tomas Hozza a01339
+		libdir=$sec_libdir
Tomas Hozza a01339
+	fi
Tomas Hozza a01339
 	libs="-L${libdir}"
Tomas Hozza a01339
 	if test x"$liblwres" = x"true" ; then
Tomas Hozza a01339
 		libs="$libs -llwres"