cvs commit: xml-security/c/src configure configure.ac

[blautenb]

blautenb    2003/08/05 04:49:49

  Modified:    c/src    configure configure.ac
  Log:
  Updates for Xalan 1.6 sane includes change
  
  Revision  Changes    Path
  1.19      +4 -4      xml-security/c/src/configure
  
  Index: configure
  ===================================================================
  RCS file: /home/cvs/xml-security/c/src/configure,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- configure 2 Jul 2003 12:10:11 -0000       1.18
  +++ configure 5 Aug 2003 11:49:49 -0000       1.19
  @@ -3802,7 +3802,7 @@
       cat >conftest.$ac_ext <<_ACEOF
   #line $LINENO "configure"
   #include "confdefs.h"
  -#include <Include/XalanVersion.hpp>
  +#include <xalanc/Include/XalanVersion.hpp>
   _ACEOF
   if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
     (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
  @@ -3822,7 +3822,7 @@
   fi
   if test -z "$ac_cpp_err"; then
     xalan_found=yes
  -      LIBS="${LIBS} -L${XALANCROOT}/lib -lxalan-c1_5_0"
  +      LIBS="${LIBS} -L${XALANCROOT}/lib -lxalan-c"
         echo "$as_me:$LINENO: result: found" >&5
   echo "${ECHO_T}found" >&6
   else
  @@ -3843,7 +3843,7 @@
       cat >conftest.$ac_ext <<_ACEOF
   #line $LINENO "configure"
   #include "confdefs.h"
  -#include <Include/XalanVersion.hpp>
  +#include <xalanc/Include/XalanVersion.hpp>
   _ACEOF
   if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
     (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
  @@ -3863,7 +3863,7 @@
   fi
   if test -z "$ac_cpp_err"; then
     xalan_found=yes
  -      LIBS="${LIBS} -lxalan-c1_5_0"
  +      LIBS="${LIBS} -lxalan-c"
         echo "$as_me:$LINENO: result: found" >&5
   echo "${ECHO_T}found" >&6
   else
  
  
  
  1.19      +4 -4      xml-security/c/src/configure.ac
  
  Index: configure.ac
  ===================================================================
  RCS file: /home/cvs/xml-security/c/src/configure.ac,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- configure.ac      2 Jul 2003 12:10:11 -0000       1.18
  +++ configure.ac      5 Aug 2003 11:49:49 -0000       1.19
  @@ -387,9 +387,9 @@
       OLD_CPPFLAGS=$CPPFLAGS
       CPPFLAGS=["${CPPFLAGS} -I${XALANCROOT}/src"]
   
  -    AC_TRY_CPP([#include <Include/XalanVersion.hpp>], 
  +    AC_TRY_CPP([#include <xalanc/Include/XalanVersion.hpp>], 
         xalan_found=yes 
  -      LIBS="${LIBS} -L${XALANCROOT}/lib -lxalan-c1_5_0"
  +      LIBS="${LIBS} -L${XALANCROOT}/lib -lxalan-c"
         [AC_MSG_RESULT([found])], 
         CPPFLAGS=$OLD_CPPFLAGS
         [AC_MSG_RESULT([no])]);
  @@ -399,9 +399,9 @@
     if test -z $xalan_found ; then
   
       AC_MSG_CHECKING([for Xalan in system includes])
  -    AC_TRY_CPP([#include <Include/XalanVersion.hpp>], 
  +    AC_TRY_CPP([#include <xalanc/Include/XalanVersion.hpp>], 
         xalan_found=yes 
  -      LIBS="${LIBS} -lxalan-c1_5_0"
  +      LIBS="${LIBS} -lxalan-c"
         [AC_MSG_RESULT([found])],
         [AC_DEFINE(XSEC_NO_XALAN)] 
         [AC_MSG_RESULT([no - WARNING - configuring for no Xalan])]);