From Graeme Lunt

[obnox/wireshark/wip.git] / configure.in

diff --git a/configure.in b/configure.in
index c6ff7d104ba0c93939f15cb1a43be4dceb8c7ded..b97fbeefd065652523f66adcfdaaa15f4b9f913a 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
 # $Id$
 #
-AC_INIT(etypes.h)
+AC_INIT(cfile.h)
 
 AC_PREREQ(2.52)
 
@@ -8,7 +8,7 @@ dnl Check for CPU / vendor / OS
 AC_CANONICAL_HOST
 AC_CANONICAL_TARGET
 
-AM_INIT_AUTOMAKE(ethereal, 0.10.11)
+AM_INIT_AUTOMAKE(ethereal, 0.10.12)
 
 AM_DISABLE_STATIC
 
@@ -38,6 +38,14 @@ then
        #
        AC_MSG_ERROR(I couldn't find pod2html; make sure it's installed and in your path)
 fi
+AC_PATH_PROG(HTML_VIEWER, htmlview)
+if test "x$HTML_VIEWER" = x
+then
+       AC_DEFINE_UNQUOTED(HTML_VIEWER, "mozilla", [HTML viewer, e.g. mozilla])
+else
+       AC_DEFINE_UNQUOTED(HTML_VIEWER, "htmlview", [HTML viewer, e.g. mozilla])
+fi
+
 AC_PATH_PROG(LEX, flex)
 AC_PATH_PROG(PYTHON, python)
 
@@ -108,7 +116,7 @@ AC_ARG_WITH(extra-gcc-checks,
 [
        if test $withval != no
        then
-               ethereal_extra_gcc_flags=" -Wcast-qual -Wcast-align -Wbad-function-cast -pedantic -Wstrict-prototypes"
+               ethereal_extra_gcc_flags=" -Wcast-qual -Wcast-align -Wbad-function-cast -pedantic -Wstrict-prototypes -Wmissing-declarations -Wwrite-strings"
        fi
 ],)
 AC_MSG_CHECKING(to see if we can add '-Wall -W $ethereal_extra_gcc_flags' to CFLAGS)
@@ -455,6 +463,7 @@ AC_CHECK_HEADERS(inttypes.h,
              printf("%" PRId64 "\n", (gint64)1);
              printf("%" PRIo64 "\n", (guint64)1);
              printf("%" PRIx64 "\n", (guint64)1);
+             printf("%" PRIX64 "\n", (guint64)1);
              printf("%" PRIu64 "\n", (guint64)1);
            }
          ]])
@@ -611,7 +620,7 @@ AC_SUBST(dftest_bin)
 # Enable/disable randpkt
 
 AC_ARG_ENABLE(randpkt,
-[  --enable-randpkt        build randpkt.  [default=no]],enable_randpkt=$enableval,enable_randpkt=no)
+[  --enable-randpkt        build randpkt.  [default=yes]],enable_randpkt=$enableval,enable_randpkt=yes)
 
 if test "x$enable_randpkt" = "xyes" ; then
        randpkt_bin="randpkt\$(EXEEXT)"
@@ -1243,7 +1252,6 @@ AC_OUTPUT(
   plugins/rudp/Makefile
   plugins/stats_tree/Makefile
   plugins/v5ua/Makefile
-  plugins/xml/Makefile
   tools/Makefile
   tools/lemon/Makefile
   ,)