Index: configure
--- configure.orig	2015-01-21 18:27:50.000000000 +0100
+++ configure	2015-05-15 19:43:06.865162402 +0200
@@ -2525,23 +2525,19 @@
   *i386)
     mybits="32"
     ;;
-  *86_64)
+  *86_64|*amd64*)
     mybits="64"
-    mybits_install="64"
     ;;
   *sparc*)
     mybits="64"
-    mybits_install="64"
     is_sparc="yes"
     ;;
   *aix*)
     mybits="64"
-    mybits_install="64"
     is_aix="yes"
     ;;
   *powerpc*)
     mybits="64"
-    mybits_install="64"
     is_aix="yes"
     ;;
   *)
@@ -15283,6 +15279,11 @@
 		enablemysql=no
 	fi
 
+   if [ "${enablemysql}" = "no" ] ; then
+       mysql_cflags=""
+       mysql_ldflags=""
+       mysql_ldadd=""
+   fi
    if ! [ "${enablemysql}" = "no" ] ; then
 
 
@@ -15457,6 +15458,11 @@
 		enablepg=no
 	fi
 
+   if [ "${enablepg}" = "no" ] ; then
+       pg_cflags=""
+       pg_ldflags=""
+       pg_ldadd=""
+   fi
    if ! [ "${enablepg}" = "no" ] ; then
 
 # Check whether --with-pg-prefix was given.
@@ -16278,7 +16284,7 @@
 
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Searching OpenSSL Version: $library_includes" >&5
 $as_echo "Searching OpenSSL Version: $library_includes" >&6; };
-		ver=`grep "#define SHLIB_VERSION_NUMBER" $library_includes | sed 's/[#_a-zA-Z" ]//g' | sed 's|\.|0|g'`;
+		ver=`grep "# define SHLIB_VERSION_NUMBER" $library_includes | sed 's/[#_a-zA-Z" ]//g' | sed 's|\.|0|g'`;
 		my_ver=`echo $_version | sed "s|\.|0|g"`;
 
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Detected Version: $ver (required > $my_ver )" >&5
Index: contrib/libpki.spec
Index: src/libpki/net/sock.h
--- src/libpki/net/sock.h.orig	2015-01-21 18:27:50.000000000 +0100
+++ src/libpki/net/sock.h	2015-05-15 19:39:35.085104462 +0200
@@ -15,12 +15,9 @@
 #ifndef __OPENCA_SOCK_WRAP_H
 #define __OPENCA_SOCK_WRAP_H
 
-#ifdef HAVE_SYS_SOCKET_H
 # include <sys/select.h>
-#else
 # include <sys/types.h>
 # include <sys/socket.h>
-#endif
 
 #include <netdb.h>
 
Index: src/net/dns.c
--- src/net/dns.c.orig	2015-01-21 18:27:50.000000000 +0100
+++ src/net/dns.c	2015-05-15 19:39:35.085104462 +0200
@@ -245,6 +245,7 @@
 
 #ifdef HAVE_LIBRESOLV
 
+#ifdef HAVE_LIBRESOLV
 	if (strncmp_nocase(str, "AAAA", 4) == 0) {
 		ret = T_AAAA;
 	} else if (strncmp_nocase(str, "A", 1) == 0) {
@@ -263,6 +264,9 @@
 		ret = T_CERT;
 	} else if (strncmp_nocase(str, "ANY", 3) == 0) {
 		ret = T_ANY;
+#else
+    if (0) {
+#endif
 	} else if (atoi(str) > 0) {
 		ret = atoi(str);
 	} else {