diff --git a/configure.ac b/configure.ac
index 351e678..07e5769 100644
--- a/configure.ac
+++ b/configure.ac
@@ -330,10 +330,7 @@ AC_DEFINE_UNQUOTED(SBUILD_HOST_CPU, ["$host_cpu"])
 
 
 # Checks for libraries.
-PKG_CHECK_MODULES([UUID], [uuid],
-                  [AC_DEFINE(HAVE_UUID)
-		   HAVE_UUID=yes],
-                  [HAVE_UUID=no])
+PKG_CHECK_EXISTS([uuid], [HAVE_UUID=yes], [HAVE_UUID=no])
 
 AM_PATH_CPPUNIT([1.10.0], [HAVE_CPPUNIT=yes])
 AM_CONDITIONAL([USE_UNIT_TESTS], [test -n "$HAVE_CPPUNIT"])
@@ -378,11 +375,8 @@ AC_CHECK_HEADERS([security/pam_appl.h],
 
 # Checks for library functions.
 AC_CHECK_LIB([pam], [pam_authenticate],
-             [PAM_LIBS="-lpam"
-	      PAM_FUNC="yes"],
-	     [PAM_LIBS=""
-	      PAM_FUNC="no"])
-AC_SUBST([PAM_LIBS])
+	     [PAM_FUNC="yes"],
+	     [PAM_FUNC="no"])
 
 AC_CHECK_LIB([lockdev], [dev_lock],
              [LOCKDEV_LIBS="-llockdev"
@@ -418,7 +412,7 @@ fi
 
 AC_MSG_CHECKING([whether to build UUID support])
 BUILD_UUID="yes"
-if test "$enable_uuid" = "yes"; then
+if test "$enable_uuid" = "no"; then
   BUILD_UUID="no"
 fi
 if test "$HAVE_UUID" = "no"; then
@@ -428,6 +422,7 @@ AC_MSG_RESULT([$BUILD_UUID])
 
 AH_TEMPLATE(HAVE_UUID, [Set if UUID support is available])
 if test "$BUILD_UUID" = "yes"; then
+  PKG_CHECK_MODULES([UUID], [uuid])
   AC_DEFINE(HAVE_UUID, 1)
 fi
 
@@ -452,6 +447,10 @@ elif test "$enable_pam" = "auto"; then
     BUILD_PAM="no"
   fi
 fi
+if test "$BUILD_PAM" = "yes"; then
+  PAM_LIBS="-lpam"
+  AC_SUBST([PAM_LIBS])
+fi
 AC_MSG_RESULT([$BUILD_PAM])
 
 AM_CONDITIONAL([BUILD_PAM], [test "$BUILD_PAM" = "yes"])