Changeset 39925 in vbox

Timestamp:

Jan 31, 2012 8:44:17 PM (13 years ago)

Author:

vboxsync

Message:

removed obsolete libxslt

Location:

trunk

Files:

• Config.kmk (modified) (1 diff)
• configure (modified) (4 diffs)
• src/libs/Makefile.kmk (modified) (1 diff)
• src/libs/libxslt-1.1.22 (deleted)

trunk/Config.kmk

@@ -2437 +2437 @@
 # note: no linking to LIB here, we do that explicitly in src/VBox/Runtime/Makefile.kmk to link
 # libxml against VBoxRT
-
-SDK_VBOX_LIBXSLT          = .
-#if1of ($(KBUILD_TARGET), os2 solaris win)
- SDK_VBOX_LIBXSLT_INCS   ?= $(PATH_ROOT)/src/libs/libxslt-1.1.22
- SDK_VBOX_LIBXSLT_LIBS   ?= $(PATH_STAGE_LIB)/VBox-libxslt$(VBOX_SUFF_LIB)
- SDK_VBOX_LIBXSLT_DEFS   ?=
- SDK_VBOX_LIBXSLT_DEFS.win += WIN32 _WINDOWS _MBCS _REENTRANT
-#else if1of ($(KBUILD_TARGET), linux)
-# SDK_VBOX_LIBXSLT_INCS      ?=
-# SDK_VBOX_LIBXSLT_LIBS      ?=
-# SDK_VBOX_LIBXSLT_CFLAGS    ?= $(shell pkg-config libxslt-1.0 --cflags)
-# SDK_VBOX_LIBXSLT_CXXFLAGS  ?= $(SDK_VBOX_LIBXSLT_CFLAGS)
-# SDK_VBOX_LIBXSLT_LDFLAGS   ?= $(shell pkg-config libxslt-1.0 --libs)
-#else
-# SDK_VBOX_LIBXSLT_INCS   ?=
-# SDK_VBOX_LIBXSLT_LIBS   ?= xslt
-#endif
 
 SDK_VBOX_LIBPNG       = .

trunk/configure

@@ -717 +717 @@
 
 #
-# Check for libxslt, needed by VBoxSettings. For now we depend on 1.1.15,
-# as Solaris right now has no newer version and it definitely works.
-# 1.1.17 is available on Ubuntu Edgy which fulfils the minimal libxml2
-# requirement (2.6.26).
-#
-check_libxslt()
-{
-  if [ -z "$BUILD_LIBXSLT" ]; then
-    test_header libxslt
-    if which_wrapper pkg-config > /dev/null; then
-      libxslt_ver=`pkg-config libxslt --modversion 2>> $LOG`
-      if [ $? -ne 0 ]; then
-        log_failure "libxslt not found"
-        fail
-      else
-        FLGXSLT=`pkg-config libxslt --cflags`
-        INCXSLT=`strip_I "$FLGXSLT"`
-        LIBXSLT=`pkg-config libxslt --libs`
-        cat > $ODIR.tmp_src.cc << EOF
-#include <cstdio>
-#include <libxslt/xsltconfig.h>
-extern "C" int main(void)
-{
-  printf("found version %s", LIBXSLT_DOTTED_VERSION);
-#if LIBXSLT_VERSION >= 10117
-  printf(", OK.\n");
-  return 0;
-#else
-  printf(", expected version 1.1.17 or higher\n");
-  return 1;
-#endif
-}
-EOF
-        [ -n "$INCXSLT" ] && I_INCXSLT=`prefix_I "$INCXSLT"`
-        if test_compile "$LIBXSLT $LIBPTHREAD $I_INCXSLT" xslt xslt; then
-          if test_execute; then
-            cnf_append "SDK_VBOX_LIBXSLT_INCS" "$INCXSLT"
-            cnf_append "SDK_VBOX_LIBXSLT_LIBS" "`strip_l "$LIBXSLT"`"
-          fi
-        fi
-      fi
-    elif which_wrapper xslt-config; then
-      libxslt_ver=`xslt-config --version`
-      if [ $? -ne 0 ]; then
-        log_failure "xslt-config not working"
-        fail
-      else
-        log_success "found version $libxslt_ver"
-        FLGXSLT=`xslt-config --cflags`
-        INCXSLT=`strip_I "$FLGXSLT"`
-        LIBXSLT=`xslt-config --libs`
-        cat > $ODIR.tmp_src.cc << EOF
-#include <cstdio>
-#include <libxslt/xsltconfig.h>
-extern "C" int main(void)
-{
-  printf("found version %s", LIBXSLT_DOTTED_VERSION);
-#if LIBXSLT_VERSION >= 10117
-  printf(", OK.\n");
-  return 0;
-#else
-  printf(", expected version 1.1.17 or higher\n");
-  return 1;
-#endif
-}
-EOF
-        [ -n "$INCXSLT" ] && I_INCXSLT=`prefix_I "$INCXSLT"`
-        if test_compile "$LIBXSLT $LIBPTHREAD $I_INCXSLT" xslt xslt; then
-          if test_execute; then
-            cnf_append "SDK_VBOX_LIBXSLT_INCS" "$INCXSLT"
-            cnf_append "SDK_VBOX_LIBXSLT_LIBS" "`strip_l "$LIBXSLT"`"
-          fi
-        fi
-      fi
-    else
-      log_failure "neither pkg-config nor xslt-config found"
-      fail
-    fi
-  fi
-}
-
-
-#
 # Check for libIDL, needed by xpcom
 #
@@ -2188 +2105 @@
   --disable-hardening      don't be strict about /dev/vboxdrv access
   --build-libxml2          build libxml2 from sources
-  --build-libxslt          build libxslt from sources
 EOF
 [ $OSE -eq 0 ] && cat << EOF
@@ -2378 +2294 @@
     --build-libxml2)
       BUILD_LIBXML2=1
-      ;;
-    --build-libxslt)
-      BUILD_LIBXSLT=1
       ;;
     --build-libssl)
@@ -2552 +2465 @@
 [ "$OS" != "darwin"  ] && check_pthread
 check_libxml2
-[ $WITH_XPCOM  -eq 1 ] && check_libxslt
 [ $WITH_LIBIDL -eq 1 ] && check_libidl
 check_ssl

trunk/src/libs/Makefile.kmk

@@ -69 +69 @@
  endif
 
- ifeq ($(SDK_VBOX_LIBXSLT_INCS),$(PATH_ROOT)/src/libs/libxslt-1.1.22)
-  include $(PATH_SUB_CURRENT)/libxslt-1.1.22/Makefile.kmk
- endif
-
  # FFmpeg for test videos.
  if defined(VBOX_WITH_FFMPEG) && !defined(VBOX_OSE) && !defined(VBOX_ONLY_DOCS) && !defined(VBOX_WITH_SDK)