diff -ur voms-1.9.14.2.orig/project/expat.m4 voms-1.9.14.2/project/expat.m4
--- voms-1.9.14.2.orig/project/expat.m4	2009-02-04 15:54:28.000000000 +0100
+++ voms-1.9.14.2/project/expat.m4	2009-10-20 12:39:11.202112514 +0200
@@ -19,13 +19,13 @@
     ac_save_CFLAGS=$CFLAGS
     ac_save_LIBS=$LIBS
     if test -n "$with_expat_prefix" -a "$with_expat_prefix" != "/usr" ; then
-  EXPAT_CFLAGS="-I$with_expat_prefix/include"
+	EXPAT_CFLAGS="-I$with_expat_prefix/include"
 	EXPAT_LIBS="-L$with_expat_prefix/lib"
-  EXPAT_LIBS64="-L$with_expat_prefix/lib64"
+	EXPAT_LIBS64="-L$with_expat_prefix/lib64"
     else
 	EXPAT_CFLAGS=""
-	EXPAT_LIBS="-L/usr/lib"
-	EXPAT_LIBS64="-L/usr/lib64"
+	EXPAT_LIBS=""
+	EXPAT_LIBS64=""
     fi
 
     EXPAT_LIBS="$EXPAT_LIBS -lexpat"	
@@ -49,13 +49,13 @@
 #    echo "ac_cv_expat_valid64=$ac_cv_expat_valid64"
     if test x$ac_cv_expat_valid64 = xyes ; then
       EXPAT_INSTALL_PATH=$with_expat_prefix
-    	EXPAT_STATIC_LIBS="$with_expat_prefix/lib/libexpat.a"
-      EXPAT_LIBS="-L$with_expat_prefix/lib64 -lexpat"
+      EXPAT_STATIC_LIBS="$with_expat_prefix/lib64/libexpat.a"
+      EXPAT_LIBS=$EXPAT_LIBS64
       AC_MSG_RESULT([$ac_cv_expat_valid64 (in lib64)])
     	ifelse([$2], , :, [$2])
     elif test x$ac_cv_expat_valid = xyes ; then
       EXPAT_INSTALL_PATH=$with_expat_prefix
-    	EXPAT_STATIC_LIBS="$with_expat_prefix/lib/libexpat.a"
+      EXPAT_STATIC_LIBS="$with_expat_prefix/lib/libexpat.a"
       AC_MSG_RESULT([$ac_cv_expat_valid (in lib)])
     	ifelse([$2], , :, [$2])
     else