diff options
| author | Ahmad Fatoum <ahmad@a3f.at> | 2017-04-04 23:23:59 +0200 |
|---|---|---|
| committer | Roland Knall <rknall@gmail.com> | 2017-04-19 10:41:55 +0000 |
| commit | cfab5ef035db7be8502623af203ab3494a9200e3 (patch) | |
| tree | 2d848bbd7bd38baa818a817b9cda5b4b107f30a6 /macosx-setup.sh | |
| parent | d13c6d9628e3964697559e3509d9c1f8ec30ed9e (diff) | |
| download | wireshark-cfab5ef035db7be8502623af203ab3494a9200e3.tar.gz | |
Add libxml2 as optional dependency
This can be used by dissectors that need to parse out-of-band
configuration.
Change-Id: I13c0a2f408fb5c21bad7ab3d7971e0fa8ed7d783
Reviewed-on: https://code.wireshark.org/review/20912
Reviewed-by: Roland Knall <rknall@gmail.com>
Diffstat (limited to 'macosx-setup.sh')
| -rwxr-xr-x | macosx-setup.sh | 53 |
1 files changed, 53 insertions, 0 deletions
diff --git a/macosx-setup.sh b/macosx-setup.sh index e3302fd3ef..72a64d6ab8 100755 --- a/macosx-setup.sh +++ b/macosx-setup.sh @@ -136,6 +136,7 @@ GNUTLS_VERSION=2.12.19 LUA_VERSION=5.2.4 PORTAUDIO_VERSION=pa_stable_v19_20111121 SNAPPY_VERSION=1.1.3 +LIBXML2_VERSION=2.9.4 LZ4_VERSION=r131 SBC_VERSION=1.3 GEOIP_VERSION=1.6.10 @@ -227,6 +228,41 @@ uninstall_snappy() { fi } +install_libxml2() { + if [ "$LIBXML2_VERSION" -a ! -f libxml2-$LIBXML2_VERSION-done ] ; then + echo "Downloading, building, and installing libxml2:" + [ -f libxml2-$LIBXML2_VERSION.tar.gz ] || curl -L -O ftp://xmlsoft.org/libxml2/libxml2-$LIBXML2_VERSION.tar.gz || exit 1 + gzcat libxml2-$LIBXML2_VERSION.tar.gz | tar xf - || exit 1 + cd libxml2-$LIBXML2_VERSION + CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=0" ./configure || exit 1 + make $MAKE_BUILD_OPTS || exit 1 + $DO_MAKE_INSTALL || exit 1 + cd .. + touch libxml2-$LIBXML2_VERSION-done + fi +} + +uninstall_libxml2() { + if [ ! -z "$installed_libxml2_version" ] ; then + echo "Uninstalling libxml2:" + cd libxml2-$installed_libxml2_version + $DO_MAKE_UNINSTALL || exit 1 + make distclean || exit 1 + cd .. + rm libxml2-$installed_libxml2_version-done + + if [ "$#" -eq 1 -a "$1" = "-r" ] ; then + # + # Get rid of the previously downloaded and unpacked version. + # + rm -rf libxml2-$installed_libxml2_version + rm -rf libxml2-$installed_libxml2_version.tar.gz + fi + + installed_libxml2_version="" + fi +} + install_lz4() { if [ "$LZ4_VERSION" -a ! -f lz4-$LZ4_VERSION-done ] ; then echo "Downloading, building, and installing lz4:" @@ -1685,6 +1721,18 @@ install_all() { uninstall_snappy -r fi + if [ ! -z "$installed_libxml2_version" -a \ + "$installed_libxml2_version" != "$LIBXML2_VERSION" ] ; then + echo "Installed libxml2 version is $installed_libxml2_version" + if [ -z "$LIBXML2_VERSION" ] ; then + echo "libxml2 is not requested" + else + echo "Requested libxml2 version is $LIBXML2_VERSION" + fi + uninstall_libxml2 -r + fi + + if [ ! -z "$installed_sbc_version" -a \ "$installed_sbc_version" != "$SBC_VERSION" ] ; then echo "Installed SBC version is $installed_sbc_version" @@ -2060,6 +2108,8 @@ install_all() { install_snappy + install_libxml2 + install_lz4 install_sbc @@ -2099,6 +2149,8 @@ uninstall_all() { uninstall_snappy + uninstall_libxml2 + uninstall_lz4 uninstall_sbc @@ -2250,6 +2302,7 @@ then installed_lua_version=`ls lua-*-done 2>/dev/null | sed 's/lua-\(.*\)-done/\1/'` installed_portaudio_version=`ls portaudio-*-done 2>/dev/null | sed 's/portaudio-\(.*\)-done/\1/'` installed_snappy_version=`ls snappy-*-done 2>/dev/null | sed 's/snappy-\(.*\)-done/\1/'` + installed_libxml2_version=`ls libxml2-*-done 2>/dev/null | sed 's/libxml2-\(.*\)-done/\1/'` installed_lz4_version=`ls lz4-*-done 2>/dev/null | sed 's/lz4-\(.*\)-done/\1/'` installed_sbc_version=`ls sbc-*-done 2>/dev/null | sed 's/sbc-\(.*\)-done/\1/'` installed_geoip_version=`ls geoip-*-done 2>/dev/null | sed 's/geoip-\(.*\)-done/\1/'` |