29 lines
1.5 KiB
Text
29 lines
1.5 KiB
Text
--- wiretap/configure.orig Thu Jul 5 15:26:36 2007
|
|
+++ wiretap/configure Sat Jul 7 14:40:49 2007
|
|
@@ -20277,7 +20277,7 @@ echo $ECHO_N "checking whether we should
|
|
# Check whether --enable-warnings-as-errors was given.
|
|
if test "${enable_warnings_as_errors+set}" = set; then
|
|
enableval=$enable_warnings_as_errors;
|
|
- if test "x$GCC" = "xyes" -a "x$enableval" == "xyes" -a "x$wireshark_extra_gcc_flags" != "xyes"; then
|
|
+ if test "x$GCC" = "xyes" -a "x$enableval" = "xyes" -a "x$wireshark_extra_gcc_flags" != "xyes"; then
|
|
with_warnings_as_errors="yes"
|
|
{ echo "$as_me:$LINENO: result: yes" >&5
|
|
echo "${ECHO_T}yes" >&6; }
|
|
@@ -20570,7 +20570,7 @@ echo $ECHO_N "checking for GLIB - versio
|
|
ac_save_CFLAGS="$CFLAGS"
|
|
ac_save_LIBS="$LIBS"
|
|
CFLAGS="$CFLAGS $GLIB_CFLAGS"
|
|
- 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"
|
|
@@ -20694,7 +20694,7 @@ fi
|
|
if test "x$no_glib" = x ; then
|
|
{ echo "$as_me:$LINENO: result: yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)" >&5
|
|
echo "${ECHO_T}yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)" >&6; }
|
|
- CFLAGS="$CFLAGS $GLIB_CFLAGS" LIBS="$LIBS $GLIB_LIBS"
|
|
+ CFLAGS="$CFLAGS $GLIB_CFLAGS" LIBS="$LIBS -liconv $GLIB_LIBS"
|
|
else
|
|
{ echo "$as_me:$LINENO: result: no" >&5
|
|
echo "${ECHO_T}no" >&6; }
|