diff -ur voms-1.9.8.1.orig/project/acinclude.m4 voms-1.9.8.1/project/acinclude.m4
--- voms-1.9.8.1.orig/project/acinclude.m4	2009-04-07 11:05:28.000000000 +0200
+++ voms-1.9.8.1/project/acinclude.m4	2009-06-30 09:04:36.933377506 +0200
@@ -66,11 +66,6 @@
 # ---------------------------------------------
 AC_DEFUN([AC_OPENSSL],
 [
-  AC_ARG_WITH(openssl_prefix,
-              [ --with-openssl-prefix=PFX    prefix where OpenSSL (non-globus) is installed. (/usr)],
-              [with_openssl_prefix="$withval"],
-              [with_openssl_prefix=/usr])
-
   AC_ARG_WITH(openssl_libs,
               [ --with-openssl-libs do you want OpenSSL only libs? (yes)],
               [ with_openssl_libs="$withval"],
@@ -80,16 +75,11 @@
      AC_MSG_ERROR([Value of --with-openssl-libs must be either "yes" or "no"])
   fi  
 
-  SAVE_LD_LIBRARY_PATH=$LD_LIBRARY_PATH
-  LD_LIBRARY_PATH="$with_openssl_prefix/lib"
-
-  AC_LANG_PUSH(C)
-  AC_CHECK_LIB(crypto, CRYPTO_num_locks, [found=yes], [found=no])
-  AC_LANG_POP(C) 
+  PKG_CHECK_MODULES(OPENSSL, [openssl], [
+  NO_GLOBUS_FLAGS=$OPENSSL_CFLAGS
+  found=yes], [found=no])
 
   if test "x$found" = "xyes"; then
-    NO_GLOBUS_FLAGS="-I$with_openssl_prefix/include"
-    OPENSSL_LIBS="-L$with_openssl_prefix/lib -lcrypto -lssl"
     AC_SUBST(NO_GLOBUS_FLAGS)
     AC_SUBST(OPENSSL_LIBS)
     AC_MSG_CHECKING([for system OpenSSL version])
@@ -105,11 +95,10 @@
 #include <openssl/opensslv.h>
 OPENSSL_VERSION_TEXT
 HERE
-    openssl_version=`$CPP -I$NO_GLOBUS_FLAGS -o - -P conftest.h`
+    openssl_version=`$CPP $NO_GLOBUS_FLAGS -o - -P conftest.h`
     AC_MSG_RESULT($openssl_version)
     rm -f conftest.h
   fi
-  LD_LIBRARY_PATH="$SAVE_LD_LIBRARY_PATH"
 ])
 
 # AC_GLOBUS checks globus prefix, looks for globus 
@@ -119,6 +108,11 @@
 # -------------------------------------------------------
 AC_DEFUN([AC_GLOBUS],
 [
+    PKG_CHECK_MODULES(GLOBUS_GSS, [globus-gssapi-gsi globus-gss-assist], [
+    GLOBUS_CFLAGS=$GLOBUS_GSS_CFLAGS
+    PKG_CHECK_MODULES(GLOBUS_GSS_API, [openssl])
+    ], [
+
     AC_ARG_WITH(globus_prefix,
 	[  --with-globus-prefix=PFX     prefix where GLOBUS is installed. (/opt/globus)],
 	[with_globus_prefix="$withval"],
@@ -165,6 +159,8 @@
 
     AC_MSG_RESULT([found $GLOBUS_FLAVORS ($with_globus_flavor selected)])
 
+    ])
+
     if test "x$with_globus_flavor" = "x" ; then
       if test "x$USE_OLDGAA_LIB" = "x"; then
         USE_OLDGAA_LIB="liboldgaa.la"