diff options
Diffstat (limited to 'net/wireshark/files/patch-configure')
| -rw-r--r-- | net/wireshark/files/patch-configure | 29 |
1 files changed, 14 insertions, 15 deletions
diff --git a/net/wireshark/files/patch-configure b/net/wireshark/files/patch-configure index 87b2baa4bdda..ea1bda2c8ac6 100644 --- a/net/wireshark/files/patch-configure +++ b/net/wireshark/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig Wed May 4 17:32:34 2005 -+++ configure Sat May 7 21:07:38 2005 -@@ -21806,6 +21806,7 @@ +--- configure.orig Tue Jul 18 00:20:03 2006 ++++ configure Tue Jul 18 00:19:03 2006 +@@ -22210,6 +22210,7 @@ echo $ECHO_N "checking for GLIB - versio else GLIB_CFLAGS=`$GLIB_CONFIG $glib_config_args --cflags` GLIB_LIBS=`$GLIB_CONFIG $glib_config_args --libs` @@ -8,7 +8,7 @@ glib_config_major_version=`$GLIB_CONFIG $glib_config_args --version | \ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'` glib_config_minor_version=`$GLIB_CONFIG $glib_config_args --version | \ -@@ -21816,7 +21817,7 @@ +@@ -22220,7 +22221,7 @@ echo $ECHO_N "checking for GLIB - versio ac_save_CFLAGS="$CFLAGS" ac_save_LIBS="$LIBS" CFLAGS="$CFLAGS $GLIB_CFLAGS" @@ -17,7 +17,7 @@ rm -f conf.glibtest if test "$cross_compiling" = yes; then echo $ac_n "cross compiling; assumed OK... $ac_c" -@@ -22452,6 +22453,7 @@ +@@ -22854,6 +22855,7 @@ echo $ECHO_N "checking for GLIB - versio else GLIB_CFLAGS=`$GLIB_CONFIG $glib_config_args --cflags` GLIB_LIBS=`$GLIB_CONFIG $glib_config_args --libs` @@ -25,16 +25,15 @@ glib_config_major_version=`$GLIB_CONFIG $glib_config_args --version | \ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'` glib_config_minor_version=`$GLIB_CONFIG $glib_config_args --version | \ -@@ -22462,7 +22464,7 @@ - ac_save_CFLAGS="$CFLAGS" +@@ -22865,6 +22867,7 @@ echo $ECHO_N "checking for GLIB - versio ac_save_LIBS="$LIBS" CFLAGS="$CFLAGS $GLIB_CFLAGS" -- LIBS="$GLIB_LIBS $LIBS" + LIBS="$GLIB_LIBS $LIBS" + LIBS="$GLIB_LIBS -liconv $LIBS" rm -f conf.glibtest if test "$cross_compiling" = yes; then echo $ac_n "cross compiling; assumed OK... $ac_c" -@@ -22683,7 +22685,7 @@ +@@ -23084,7 +23087,7 @@ echo $ECHO_N "checking whether GLib supp ac_save_CFLAGS="$CFLAGS" ac_save_LIBS="$LIBS" CFLAGS="$CFLAGS $GLIB_CFLAGS" @@ -43,7 +42,7 @@ if test "$cross_compiling" = yes; then echo $ac_n "cross compiling; assumed OK... $ac_c" ac_cv_glib_supports_modules=yes -@@ -27560,7 +27562,7 @@ +@@ -28684,7 +28687,7 @@ echo "${ECHO_T}yes" >&6 # CFLAGS="$CFLAGS -I$krb5_dir/include" CPPFLAGS="$CPPFLAGS -I$krb5_dir/include" @@ -52,7 +51,7 @@ ac_mit_version=`grep 'Massachusetts Institute of Technology' $krb5_dir/include/krb5.h | head -n 1 | sed 's/^.*Massachusetts Institute of Technology.*$/MIT/'` ac_krb5_version="$ac_heimdal_version$ac_mit_version" if test "x$ac_krb5_version" = "xHEIMDAL" -@@ -27618,7 +27620,7 @@ +@@ -28742,7 +28745,7 @@ fi if test -x "$KRB5_CONFIG" then @@ -61,7 +60,7 @@ KRB5_LIBS=`"$KRB5_CONFIG" --libs` CFLAGS="$CFLAGS $KRB5_FLAGS" CPPFLAGS="$CPPFLAGS $KRB5_FLAGS" -@@ -29121,7 +29123,7 @@ +@@ -30342,7 +30345,7 @@ fi ac_save_LIBS="$LIBS" @@ -70,12 +69,12 @@ G_ASCII_STRTOULL_C="" G_ASCII_STRTOULL_O="" G_ASCII_STRTOULL_LO="" -@@ -30094,7 +30096,7 @@ +@@ -31509,7 +31512,7 @@ fi # # The plugin dissectors reside in ./plugins/PROTO/ # --PLUGIN_LIBS="-L../../epan -lethereal $GLIB_LIBS" -+PLUGIN_LIBS="-L../../epan -lethereal -liconv $GLIB_LIBS" +-PLUGIN_LIBS="-L../../epan -lwireshark $GLIB_LIBS" ++PLUGIN_LIBS="-L../../epan -lwireshark -liconv $GLIB_LIBS" # |