VirtualBox

Changeset 6125

Show
Ignore:
Timestamp:
12/18/07 15:01:55 (9 months ago)
Author:
vboxsync
Message:

removed the remaining VBoxXML part

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/configure

    r6122 r6125  
    5252GENISOIMAGE="genisoimage" 
    5353MKISOFS="mkisofs" 
    54 INCXALAN="/usr/local/include" 
    55 LIBXALAN="-lxalan-c" 
    56 LIBXALAN_DIR="/usr/local/lib" 
    57 INCXERCES="/usr/local/include" 
    58 LIBXERCES="-lxerces-c" 
    59 LIBXERCES_DIR="/usr/local/lib" 
    6054BUILD_LIBXML2= 
    6155LIBCRYPTO="-lcrypto" 
    …… 
    538532 
    539533# 
    540 # Check for xalan, needed by VBoxXML 
    541 # 
    542 check_xalan() 
    543 { 
    544   if [ -n "$LIBXALAN" ]; then 
    545     test_header xalan 
    546     cat > .tmp_src.cc << EOF 
    547 #include <cstdio> 
    548 #include <xalanc/Include/XalanVersion.hpp> 
    549 extern "C" int main(void) 
    550 { 
    551   printf("found version %d.%d.%d", 
    552          XALAN_VERSION_MAJOR, XALAN_VERSION_MINOR, XALAN_VERSION_REVISION); 
    553 #if _XALAN_VERSION >= 10800 
    554   printf(", OK.\n"); 
    555   return 0; 
    556 #else 
    557   printf(", expected version 1.8.0 or higher\n"); 
    558   return 1; 
    559 #endif 
    560 } 
    561 EOF 
    562     [ -n "$INCXALAN" ] && I_INCXALAN=`prefix_I "$INCXALAN"` 
    563     if test_compile "$LIBXALAN $LIBPTHREAD $I_INCXALAN" xalan xalanc; then 
    564       if test_execute; then 
    565         cnf_append "SDK_VBOX_XALAN_LIBS"    "`strip_l "$LIBXALAN"`" 
    566         cnf_append "SDK_VBOX_XALAN_LIBPATH" "`strip_L "$LIBXALAN"`" 
    567         cnf_append "SDK_VBOX_XALAN_INCS"    "$INCXALAN" 
    568       fi 
    569     fi 
    570   else 
    571     echo "Building xalan from shipped sources." 
    572     echo "Building xalan from shipped sources." >> $LOG 
    573     echo >> $LOG 
    574     echo >> $LOG 
    575   fi 
    576 } 
    577  
    578 # 
    579 # Check for xerces, needed by VBoxXML 
    580 # 
    581 check_xerces() 
    582 { 
    583   if [ -n "$LIBXERCES" ]; then 
    584     test_header xerces 
    585     cat > .tmp_src.cc << EOF 
    586 #include <cstdio> 
    587 #include <xercesc/util/XercesVersion.hpp> 
    588 extern "C" int main(void) 
    589 { 
    590   printf("found version %d.%d.%d", 
    591          XERCES_VERSION_MAJOR, XERCES_VERSION_MINOR, XERCES_VERSION_REVISION); 
    592 #if _XERCES_VERSION >= 20500 
    593   printf(", OK.\n"); 
    594   return 0; 
    595 #else 
    596   printf(", expected version 2.5.0 or higher\n"); 
    597   return 1; 
    598 #endif 
    599 } 
    600 EOF 
    601     [ -n "$INCXERCES" ] && I_INCXERCES=`prefix_I "$INCXERCES"` 
    602     if test_compile "$LIBXERCES $LIBPTHREAD $I_INCXERCES" xerces xercesc; then 
    603       if test_execute; then 
    604         cnf_append "SDK_VBOX_XERCES_LIBS"    "`strip_l "$LIBXERCES"`" 
    605         cnf_append "SDK_VBOX_XERCES_LIBPATH" "`strip_L "$LIBXERCES"`" 
    606         cnf_append "SDK_VBOX_XERCES_INCS"    "$INCXERCES" 
    607       fi 
    608     fi 
    609   else 
    610     echo "Building xerces from shipped sources." 
    611     echo "Building xerces from shipped sources." >> $LOG 
    612     echo >> $LOG 
    613     echo >> $LOG 
    614   fi 
    615 } 
    616  
    617 # 
    618 # Check for libxml2, needed by xpcom 
    619 # For now we check for libxml2 2.6.23 as 2.6.22 is known to NOT work 
     534# Check for libxml2, needed by VBoxSettings 
     535# 2.6.23 is known to NOT work, 2.6.24 is known to work (e.g. Ubuntu/Dapper) 
    620536# 
    621537check_libxml2() 
    …… 
    13741290  --disable-sdl-ttf        disable SDL_ttf detection 
    13751291  --disable-pulse          disable PulseAudio detection 
    1376   --build-xalan            build xalan & xerces from sources (not OSE!) 
    13771292  --build-libxml2          build libxml2 from sources (not OSE!) 
    13781293  --setup-wine             setup a Wine directory and register the hhc hack 
    …… 
    13861301  --with-mkisofs=PATH      location of mkisofs [$MKISOFS] 
    13871302  --with-qt-dir=DIR        directory for QT headers/libraries [$QTDIR] 
    1388   --with-xalan=LIB         location of the xalan library [$LIBXALAN] 
    1389   --with-xalan-incdir=DIR  location of the xalan headers [/usr/include /usr/local/include] 
    1390   --with-xalan-libdir=DIR  location of the xalan library [/usr/lib /usr/local/lib] 
    1391   --with-xerces=LIB        location of the xerces library [$LIBXERCES] 
    1392   --with-xerces-incdir=DIR location of the xerces headers [/usr/include /usr/local/include] 
    1393   --with-xerces-libdir=DIR location of the xerces library [/usr/lib /usr/local/lib] 
    13941303 
    13951304Build type: 
    …… 
    14391348      MKISOFS=`echo $option | cut -d'=' -f2` 
    14401349      ;; 
    1441     --with-xalan=*) 
    1442       LIBXALAN=`echo $option | cut -d'=' -f2` 
    1443       ;; 
    1444     --with-xalan-libdir=*) 
    1445       LIBXALAN_DIR=`echo $option | cut -d'=' -f2` 
    1446       ;; 
    1447     --with-xalan-incdir=*) 
    1448       INCXALAN=`echo $option | cut -d'=' -f2` 
    1449       ;; 
    1450     --with-xerces=*) 
    1451       LIBXERCES=`echo $option | cut -d'=' -f2` 
    1452       ;; 
    1453     --with-xerces-libdir=*) 
    1454       LIBXERCES_DIR=`echo $option | cut -d'=' -f2` 
    1455       ;; 
    1456     --with-xerces-incdir=*) 
    1457       INCXERCES=`echo $option | cut -d'=' -f2` 
    1458       ;; 
    14591350    --disable-xpcom) 
    14601351      WITH_XPCOM=0 
    …… 
    14711362    --build-debug|-d) 
    14721363      BUILD_TYPE=debug 
    1473       ;; 
    1474     --build-xalan) 
    1475       LIBXERCES= 
    1476       LIBXERCES_DIR= 
    1477       LIBXALAN= 
    1478       LIBXALAN_DIR= 
    14791364      ;; 
    14801365    --build-libxml2) 
    …… 
    15051390  esac 
    15061391done 
    1507  
    1508 [ -n "$LIBXALAN_DIR" ] && LIBXALAN="-L$LIBXALAN_DIR $LIBXALAN" 
    1509 [ -n "$LIBXERCES_DIR" ] && LIBXERCES="-L$LIBXERCES_DIR $LIBXERCES" 
    15101392 
    15111393LOG="$ODIR$LOG" 
    …… 
    16001482# the libraries 
    16011483[ "$OS" != "darwin"  ] && check_pthread 
    1602 [ $WITH_XPCOM  -eq 1 ] && check_xalan 
    1603 [ $WITH_XPCOM  -eq 1 ] && check_xerces 
    16041484[ $WITH_XPCOM  -eq 1 ] && check_libxml2 
    16051485[ $WITH_LIBIDL -eq 1 ] && check_libidl 

  • trunk/debian/control

    r6037 r6125  
    55Standards-Version: 3.2.1 
    66Build-Depends: debhelper (>= 5), libz-dev, libssl-dev, libqt3-headers, qt3-dev-tools, libsdl1.2-dev, 
    7   uuid-dev, libxalan110-dev, libxerces27-dev, libxcursor-dev, libidl-dev, libpam0g-dev, 
    8   bcc, iasl, xsltproc, linux-headers-generic, wine, java2-runtime, lsb-release, g++-multilib [amd64], 
    9   libc6-dev-i386 [amd64], ia32-libs [amd64] 
     7  uuid-dev, libxcursor-dev, libidl-dev, libpam0g-dev, bcc, iasl, xsltproc, linux-headers-generic, wine, 
     8  java2-runtime, lsb-release, g++-multilib [amd64], libc6-dev-i386 [amd64], ia32-libs [amd64] 
    109 
    1110Package: virtualbox-ose 

  • trunk/debian/rules

    r5862 r6125  
    6060            $(ose),--ose,) $(if $(LINUX),--with-linux=$(LINUX),) $(if \ 
    6161            $(filter _Ubuntu_dapper,$(debrel)),--with-gcc=gcc-3.4 --with-g++=g++-3.4,) $(if \ 
    62             $(filter _xandros4.1,$(debrel)),--build-xalan,) $(if \ 
    6362            $(filter _xandros4.1 _ucs1.3,$(debrel)),--disable-sdl-ttf,) $(if \ 
    6463            $(HEADLESS),--build-headless,) $(if $(DEBUG),--build-debug,) 

© 2008 Sun Microsystems, Inc.
Contact – Privacy policy