seamonkey-ldap-with-nss.patch

   1 --- seamonkey-1.1.10/configure.in.orig  2008-06-16 00:25:32.000000000 +0200
   2 +++ seamonkey-1.1.10/configure.in       2008-07-10 18:30:45.487028766 +0200
   3 @@ -3746,7 +3746,7 @@
   4  fi
   5
   6  if test -n "$MOZ_NATIVE_NSS"; then
   7 -   NSS_LIBS="$NSS_LIBS -lcrmf"
   8 +   NSS_LIBS="-lcrmf $NSS_LIBS"
   9  else
  10     NSS_CFLAGS='-I$(DIST)/public/nss'
  11     NSS_DEP_LIBS='\\\
  12 @@ -7629,7 +7629,7 @@
  13          mkdir "directory/c-sdk/ldap"
  14      fi
  15
  16 -    ac_configure_args="$_SUBDIR_CONFIG_ARGS --prefix=$MOZ_BUILD_ROOT/dist --with-dist-prefix=$MOZ_BUILD_ROOT/dist --without-nss --with-mozilla"
  17 +    ac_configure_args="$_SUBDIR_CONFIG_ARGS --prefix=$MOZ_BUILD_ROOT/dist --with-dist-prefix=$MOZ_BUILD_ROOT/dist --with-nss --with-mozilla"
  18      if test -z "$MOZ_DEBUG"; then
  19          ac_configure_args="$ac_configure_args --disable-debug"
  20      fi
  21 --- seamonkey-1.1.10/configure.orig     2008-06-16 00:25:31.000000000 +0200
  22 +++ seamonkey-1.1.10/configure  2008-07-10 18:31:04.379027928 +0200
  23 @@ -11842,7 +11842,7 @@
  24  fi
  25
  26  if test -n "$MOZ_NATIVE_NSS"; then
  27 -   NSS_LIBS="$NSS_LIBS -lcrmf"
  28 +   NSS_LIBS="-lcrmf $NSS_LIBS"
  29  else
  30     NSS_CFLAGS='-I$(DIST)/public/nss'
  31     NSS_DEP_LIBS='\\\
  32 @@ -21195,7 +21195,7 @@
  33          mkdir "directory/c-sdk/ldap"
  34      fi
  35
  36 -    ac_configure_args="$_SUBDIR_CONFIG_ARGS --prefix=$MOZ_BUILD_ROOT/dist --with-dist-prefix=$MOZ_BUILD_ROOT/dist --without-nss --with-mozilla"
  37 +    ac_configure_args="$_SUBDIR_CONFIG_ARGS --prefix=$MOZ_BUILD_ROOT/dist --with-dist-prefix=$MOZ_BUILD_ROOT/dist --with-nss --with-mozilla"
  38      if test -z "$MOZ_DEBUG"; then
  39          ac_configure_args="$ac_configure_args --disable-debug"
  40      fi
  41 --- mozilla/directory/c-sdk/ldap/libraries/libssldap/Makefile.in.orig   Fri May 17 08:54:00 2002
  42 +++ mozilla/directory/c-sdk/ldap/libraries/libssldap/Makefile.in        Wed Aug 28 11:37:29 2002
  43 @@ -53,9 +53,8 @@
  44  LOCAL_INCLUDES  = -I$(PUBLIC)/nspr
  45  INCLUDES       += -I$(DISTHDIR) -I$(HDIR) -I$(INSTALLDIR)/include \
  46                    -I$(DIST)/include \
  47 -                  -I$(DIST)/public/security \
  48 -                  -I$(DIST)/public/nss \
  49 -                   -I$(DIST)/include/nspr
  50 +                  -I/usr/include/nss \
  51 +                   -I/usr/include/nspr
  52  DEFINES                += $(DEFS)
  53
  54  PLATFORMCFLAGS = -DUSE_WAITPID -DNEEDPROTOS