Merged.

Also note that Karsten Hopp <[EMAIL PROTECTED]> recently fixed a bug
that kept ecryptfs-utils from installing correctly in ia64:

---
diff --git a/configure.ac b/configure.ac
index ba6484d..96838d6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -105,7 +105,14 @@ AC_ARG_WITH(
        [pamdir="${withval}"],
        [
                case $target in
-                       *64* | *s390x)
+                       *ia64*)
+                               if test "${prefix}" != "/usr" ; then
+                                       pamdir="\$(prefix)/lib/security"
+                               else
+                                       pamdir="/lib/security"
+                               fi
+                       ;;
+                       *64* | *s390x*)
                                if test "${prefix}" != "/usr" ; then
                                        pamdir="\$(prefix)/lib64/security"
                                else

---

Mike

On Tue, Dec 04, 2007 at 01:07:06PM +0200, Alon Bar-Lev wrote:
> 
> ---
> 
> diff --git a/configure.ac b/configure.ac
> index 6778105..2cef444 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -265,7 +265,16 @@ if test "${enable_pam}" = "yes" ; then
>  fi
>  
>  if test "${enable_gui}" = "yes"; then
> -     PKG_CHECK_MODULES([GTK], [gtk+ >= 1.0],, AC_MSG_ERROR([Cannot locate 
> gtk+]))
> +     PKG_CHECK_MODULES(
> +             [GTK],
> +             [gtk+-2.0 >= 2.0],
> +             ,
> +             PKG_CHECK_MODULES(
> +                     [GTK],
> +                     [gtk+ >= 1.0],,
> +                     AC_MSG_ERROR([Cannot locate gtk+])
> +             )
> +     )
>  fi
>  
>  pkgconfigdir="\$(libdir)/pkgconfig"

-- 
.___________________________________________________________________.
                         Michael A. Halcrow                          
       Security Software Engineer, IBM Linux Technology Center       
GnuPG Fingerprint: 419C 5B1E 948A FA73 A54C  20F5 DB40 8531 6DCA 8769

Why isn't there some cheap and easy way to prove how much she means  
to me? 

Attachment: signature.asc
Description: Digital signature

-------------------------------------------------------------------------
SF.Net email is sponsored by: The Future of Linux Business White Paper
from Novell.  From the desktop to the data center, Linux is going
mainstream.  Let it simplify your IT future.
http://altfarm.mediaplex.com/ad/ck/8857-50307-18918-4
_______________________________________________
eCryptfs-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ecryptfs-devel

Reply via email to