Index: Makefile.in =================================================================== RCS file: /cvsroot/tclxml/tclxslt/Makefile.in,v retrieving revision 1.8 diff -u -u -p -r1.8 Makefile.in --- Makefile.in 12 Nov 2002 20:11:57 -0000 1.8 +++ Makefile.in 26 Dec 2003 01:18:04 -0000 @@ -251,7 +251,7 @@ install-libraries: libraries @for p in $(GENERIC_SCRIPTS); do \ if test -f $$p; then \ echo "Installing $$p"; \ - $(INSTALL_DATA) $$p $(pkglibdir); \ + $(INSTALL_DATA) $$p $(DESTDIR)$(pkglibdir); \ else :; fi; \ done @echo "libraries done" Index: configure.in =================================================================== RCS file: /cvsroot/tclxml/tclxslt/configure.in,v retrieving revision 1.15 diff -u -u -p -r1.15 configure.in --- configure.in 9 Mar 2003 11:30:34 -0000 1.15 +++ configure.in 26 Dec 2003 01:18:05 -0000 @@ -194,7 +194,7 @@ AC_MSG_CHECKING([for libxml2 headers]) with_xml2include=NONE AC_ARG_WITH(libxml2-include, - [ --with-xml2-include directory containing the libxml2 header files], + [ --with-libxml2-include directory containing the libxml2 header files], with_xml2include=${withval}) LIBXML2_INCLUDEDIR="" @@ -233,7 +233,7 @@ AC_MSG_CHECKING([for libxml2 library]) with_xml2lib=NONE AC_ARG_WITH(libxml2-lib, - [ --with-xml2-lib directory containing the libxml2 library], + [ --with-libxml2-lib directory containing the libxml2 library], with_xml2lib=${withval}) LIBXML2_LIBDIR="" @@ -263,6 +263,10 @@ do LIBXML2_LIBDIR="$d" break fi + if test -f "$d/libxml2.a" ; then + LIBXML2_LIBDIR="$d" + break + fi done if test "x$LIBXML2_LIBDIR" = "x"; then AC_MSG_ERROR([not found, please use --with-libxml2-lib]) @@ -282,7 +286,7 @@ AC_MSG_CHECKING([for libxslt headers]) with_xsltinclude=NONE AC_ARG_WITH(libxslt-include, - [ --with-xslt-include directory containing the libxslt header files], + [ --with-libxslt-include directory containing the libxslt header files], with_xsltinclude=${withval}) LIBXSLT="" @@ -321,7 +325,7 @@ AC_SUBST(LIBXSLT_INCLUDEDIR) AC_MSG_CHECKING([for libxslt library]) with_xsltlib=NONE -AC_ARG_WITH(libxslt-lib, [ --with-xslt-lib directory containing the libxslt library], +AC_ARG_WITH(libxslt-lib, [ --with-libxslt-lib directory containing the libxslt library], with_xsltlib=${withval}) LIBXSLT_LIBDIR="" @@ -351,6 +355,10 @@ do LIBXSLT_LIBDIR="$d" break fi + if test -f "$d/libxslt.a" ; then + LIBXSLT_LIBDIR="$d" + break + fi done if test "x$LIBXSLT_LIBDIR" = "x"; then AC_MSG_ERROR([not found, please use --with-libxslt-lib]) @@ -370,7 +378,7 @@ AC_MSG_CHECKING([for libexslt headers]) with_exsltinclude=NONE AC_ARG_WITH(libexslt-include, - [ --with-exslt-include directory containing the libexslt header files], + [ --with-libexslt-include directory containing the libexslt header files], with_exsltinclude=${withval}) LIBEXSLT="" @@ -409,7 +417,7 @@ AC_SUBST(LIBEXSLT_INCLUDEDIR) AC_MSG_CHECKING([for libexslt library]) with_exsltlib=NONE -AC_ARG_WITH(libexslt-lib, [ --with-exslt-lib directory containing the libexslt library], +AC_ARG_WITH(libexslt-lib, [ --with-libexslt-lib directory containing the libexslt library], with_exsltlib=${withval}) LIBEXSLT_LIBDIR="" @@ -436,6 +444,10 @@ do break fi if test -f "$d/libexslt.dylib" ; then + LIBEXSLT_LIBDIR="$d" + break + fi + if test -f "$d/libexslt.a" ; then LIBEXSLT_LIBDIR="$d" break fi