[xmlsec] build config change for nss

[Daniel Veillard]

On Thu, Jun 08, 2006 at 09:15:17PM -0700, aleksey at aleksey.com wrote:
> > For the Debian package I've had to change the pkg-config mozilla calls
> > to xulrunner...
> 
> Oh... Daniel also had to tweak NSPR/NSS package names for Fedora... I just
> updated xmlsec configuration scripts and I believe it should handle new
> NSPR/NSS packages' names for both Fedora and Debian.
> 
> Jon, Daniel, can you try the current CVS version, please? If everything works
> for you then I will try (very hard) to do an xmlsec release next week.

  Works for me. I still have another patch (to xmlsec-config.in)
to avoid conflict when installing xmlsec1-devel from both i386 and
x86_64 on the same box, this is ugly and incomplete (the resulting 
xmlsec-config is modified by sed) so I'm not sure it should really go
upstream, attached anyway.

Daniel

-- 
Daniel Veillard      | Red Hat http://redhat.com/
veillard at redhat.com  | libxml GNOME XML XSLT toolkit  http://xmlsoft.org/
http://veillard.com/ | Rpmfind RPM search engine http://rpmfind.net/
-------------- next part --------------
*** xmlsec/xmlsec-config.in.orig	2006-06-08 13:56:20.000000000 +0200
--- xmlsec/xmlsec-config.in	2006-06-08 14:01:10.000000000 +0200
***************
*** 4,9 ****
--- 4,15 ----
  package="@PACKAGE@"
  exec_prefix="@exec_prefix@"
  exec_prefix_set=no
+ if [ "`ldd /bin/sh | grep lib64`" = "" ]
+ then
+     archlib=lib
+ else
+     archlib=lib64
+ fi
  
  usage()
  {
***************
*** 188,194 ****
  # Assemble all the settings together
  #
  the_flags="$the_flags @XMLSEC_CORE_CFLAGS@ $the_xml_flags $the_xslt_flags $the_crypto_flags"
! the_libs="$the_libs -L${exec_prefix}/lib @XMLSEC_CORE_LIBS@ $the_xmlsec_crypto_lib -lxmlsec1 $the_xml_libs $the_xslt_libs $the_crypto_libs"
  
  if $cflags; then
      all_flags="$the_flags"
--- 194,200 ----
  # Assemble all the settings together
  #
  the_flags="$the_flags @XMLSEC_CORE_CFLAGS@ $the_xml_flags $the_xslt_flags $the_crypto_flags"
! the_libs="$the_libs -L${exec_prefix}/$archlib @XMLSEC_CORE_LIBS@ $the_xmlsec_crypto_lib -lxmlsec1 $the_xml_libs $the_xslt_libs $the_crypto_libs"
  
  if $cflags; then
      all_flags="$the_flags"