diff options
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 76 |
1 files changed, 38 insertions, 38 deletions
diff --git a/configure.in b/configure.in index bb1b84c393..0abc39c398 100644 --- a/configure.in +++ b/configure.in @@ -116,7 +116,7 @@ else fi AC_SUBST(HAVE_SVR4_PACKAGING) -AC_ETHEREAL_RPM_CHECK +AC_WIRESHARK_RPM_CHECK AC_SUBST(HAVE_RPM) # @@ -134,12 +134,12 @@ 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 -Wmissing-declarations -Wwrite-strings" + wireshark_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) +AC_MSG_CHECKING(to see if we can add '-Wall -W $wireshark_extra_gcc_flags' to CFLAGS) if test x$GCC != x ; then - CFLAGS="-D_U_=\"__attribute__((unused))\" -Wall -Wpointer-arith -W $ethereal_extra_gcc_flags $CFLAGS" + CFLAGS="-D_U_=\"__attribute__((unused))\" -Wall -Wpointer-arith -W $wireshark_extra_gcc_flags $CFLAGS" AC_MSG_RESULT(yes) else CFLAGS="-D_U_=\"\" $CFLAGS" @@ -281,7 +281,7 @@ if test "x$ac_cv_enable_usr_local" = "xyes" ; then # # Arrange that we search for libraries in "/usr/local/lib". # - AC_ETHEREAL_ADD_DASH_L(LDFLAGS, /usr/local/lib) + AC_WIRESHARK_ADD_DASH_L(LDFLAGS, /usr/local/lib) else AC_MSG_RESULT(no) fi @@ -314,7 +314,7 @@ esac # # Add any checks here that are necessary for other OSes. # -AC_ETHEREAL_GNU_SED_CHECK +AC_WIRESHARK_GNU_SED_CHECK if test "$HAVE_GNU_SED" = no ; then case "$host_os" in solaris*) @@ -401,8 +401,8 @@ fi # if test "$GTK_OK" = "no" ; then enable_ethereal="no" - ethereal_bin="" - ethereal_man="" + wireshark_bin="" + wireshark_man="" # Honor GLIB_CFLAGS if test "x$enable_gtk2" = "xyes" ; then AM_PATH_GLIB_2_0(2.0.0, CFLAGS="$CFLAGS $GLIB_CFLAGS", AC_MSG_ERROR(GLib2 distribution not found.), gmodule) @@ -410,9 +410,9 @@ if test "$GTK_OK" = "no" ; then AM_PATH_GLIB(1.2.0, CFLAGS="$CFLAGS $GLIB_CFLAGS", AC_MSG_ERROR(GLib distribution not found.), gmodule) fi else - ethereal_bin="ethereal\$(EXEEXT)" - ethereal_man="ethereal.1" - ethereal_SUBDIRS="gtk" + wireshark_bin="ethereal\$(EXEEXT)" + wireshark_man="ethereal.1" + wireshark_SUBDIRS="gtk" # Honor GLIB_CFLAGS if test "$GTK_OK" = "two" ; then AM_PATH_GLIB_2_0(2.0.0, , AC_MSG_ERROR(GLib distribution not found.), gmodule) @@ -488,11 +488,11 @@ AC_CHECK_HEADERS(inttypes.h, ], [ AC_MSG_RESULT(yes) - ac_ethereal_inttypes_h_defines_formats=yes + ac_wireshark_inttypes_h_defines_formats=yes ], [ AC_MSG_RESULT(no) - ac_ethereal_inttypes_h_defines_formats=no + ac_wireshark_inttypes_h_defines_formats=no ]) ], [ @@ -500,16 +500,16 @@ AC_CHECK_HEADERS(inttypes.h, # We don't have inttypes.h, so it obviously can't define those # macros. # - ac_ethereal_inttypes_h_defines_formats=no + ac_wireshark_inttypes_h_defines_formats=no ]) -if test "$ac_ethereal_inttypes_h_defines_formats" = yes; then +if test "$ac_wireshark_inttypes_h_defines_formats" = yes; then AC_DEFINE(INTTYPES_H_DEFINES_FORMATS,,[Define if <inttypes.h> defines PRI[doxu]64 macros]) else - AC_ETHEREAL_CHECK_64BIT_FORMAT(ll, + AC_WIRESHARK_CHECK_64BIT_FORMAT(ll, [ - AC_ETHEREAL_CHECK_64BIT_FORMAT(L, + AC_WIRESHARK_CHECK_64BIT_FORMAT(L, [ - AC_ETHEREAL_CHECK_64BIT_FORMAT(q, + AC_WIRESHARK_CHECK_64BIT_FORMAT(q, [ AC_MSG_ERROR([neither %llx nor %Lx nor %qx worked on a 64-bit integer]) ]) @@ -517,8 +517,8 @@ else ]) fi -AC_SUBST(ethereal_bin) -AC_SUBST(ethereal_man) +AC_SUBST(wireshark_bin) +AC_SUBST(wireshark_man) rdps_bin="rdps\$(EXEEXT)" AC_SUBST(rdps_bin) @@ -532,14 +532,14 @@ AC_ARG_ENABLE(tshark, if test "x$enable_tshark" = "xyes" ; then tshark_bin="tshark\$(EXEEXT)" tshark_man="tshark.1" - etherealfilter_man="ethereal-filter.4" + wiresharkfilter_man="wireshark-filter.4" else tshark_bin="" tshark_man="" fi AC_SUBST(tshark_bin) AC_SUBST(tshark_man) -AC_SUBST(etherealfilter_man) +AC_SUBST(wiresharkfilter_man) @@ -666,11 +666,11 @@ AC_SUBST(randpkt_bin) dnl Checks for "gethostbyname()" - and "-lnsl", if we need it to get dnl "gethostbyname()". -AC_ETHEREAL_GETHOSTBY_LIB_CHECK +AC_WIRESHARK_GETHOSTBY_LIB_CHECK dnl Checks for "connect()", used as a proxy for "socket()" - and dnl "-lsocket", if we need it to get "connect()". -AC_ETHEREAL_SOCKET_LIB_CHECK +AC_WIRESHARK_SOCKET_LIB_CHECK dnl pcap check AC_MSG_CHECKING(whether to use libpcap for packet capture) @@ -696,7 +696,7 @@ if test "x$want_pcap" = "xno" ; then AC_MSG_RESULT(no) else AC_MSG_RESULT(yes) - AC_ETHEREAL_PCAP_CHECK + AC_WIRESHARK_PCAP_CHECK fi dnl zlib check @@ -726,7 +726,7 @@ if test "x$want_zlib" = "xno" ; then AC_MSG_RESULT(no) else AC_MSG_RESULT(yes) - AC_ETHEREAL_ZLIB_CHECK + AC_WIRESHARK_ZLIB_CHECK if test "x$want_zlib" = "xno" ; then AC_MSG_RESULT(zlib not found - disabling compressed capture file support) fi @@ -760,7 +760,7 @@ if test "x$want_pcre" = "xno" ; then AC_MSG_RESULT(no) else AC_MSG_RESULT(yes) - AC_ETHEREAL_LIBPCRE_CHECK + AC_WIRESHARK_LIBPCRE_CHECK if test "x$want_pcre" = "xno" ; then AC_MSG_RESULT(libpcre not found - disabling support for perl compatible regular expressions in dfilters) fi @@ -794,7 +794,7 @@ if test "x$want_lua" = "xno" ; then AC_MSG_RESULT(no) else AC_MSG_RESULT(yes) - AC_ETHEREAL_LIBLUA_CHECK + AC_WIRESHARK_LIBLUA_CHECK if test "x$want_lua" = "xno" ; then AC_MSG_RESULT(liblua not found - disabling support for the lua scripting plugin) fi @@ -811,7 +811,7 @@ if test "x$enable_ipv6" = "xno" ; then AC_MSG_RESULT(no) else AC_MSG_RESULT(yes) - AC_ETHEREAL_IPV6_STACK + AC_WIRESHARK_IPV6_STACK fi @@ -853,7 +853,7 @@ elif test "x$withval" = "xyes"; then want_ssl=yes elif test -d "$withval"; then want_ssl=yes - AC_ETHEREAL_ADD_DASH_L(LDFLAGS, ${withval}/lib) + AC_WIRESHARK_ADD_DASH_L(LDFLAGS, ${withval}/lib) fi ],[ want_ssl=no @@ -930,7 +930,7 @@ else else AC_MSG_RESULT(yes) fi - AC_ETHEREAL_NETSNMP_CHECK + AC_WIRESHARK_NETSNMP_CHECK fi # @@ -946,7 +946,7 @@ if test "x$have_net_snmp" != "xyes" ; then else AC_MSG_RESULT(yes) fi - AC_ETHEREAL_UCDSNMP_CHECK + AC_WIRESHARK_UCDSNMP_CHECK fi fi @@ -984,7 +984,7 @@ if test "x$want_krb5" = "xno" ; then AC_MSG_RESULT(no) else AC_MSG_RESULT(yes) - AC_ETHEREAL_KRB5_CHECK + AC_WIRESHARK_KRB5_CHECK fi @@ -1001,14 +1001,14 @@ elif test "x$withval" = "xyes"; then want_adns=yes elif test -d "$withval"; then want_adns=yes - AC_ETHEREAL_ADD_DASH_L(LDFLAGS, ${withval}/lib) + AC_WIRESHARK_ADD_DASH_L(LDFLAGS, ${withval}/lib) fi ]) if test "x$with_adns" = "xno" ; then AC_MSG_RESULT(no) else AC_MSG_RESULT(yes) - AC_ETHEREAL_ADNS_CHECK + AC_WIRESHARK_ADNS_CHECK fi AC_SUBST(ADNS_LIBS) @@ -1024,7 +1024,7 @@ dnl Checks for typedefs, structures, and compiler characteristics. # We need to know whether "struct sockaddr" has an "sa_len" member # for get_interface_list(). -AC_ETHEREAL_STRUCT_SA_LEN +AC_WIRESHARK_STRUCT_SA_LEN # We must know our byte order AC_C_BIGENDIAN @@ -1221,7 +1221,7 @@ AC_CHECK_FUNCS(issetugid) AC_CHECK_FUNCS(mmap mprotect sysconf) dnl blank for now, but will be used in future -AC_SUBST(ethereal_SUBDIRS) +AC_SUBST(wireshark_SUBDIRS) dnl dnl check whether plugins should be enabled and, if they should be, @@ -1312,7 +1312,7 @@ AC_OUTPUT( packaging/nsis/Makefile packaging/rpm/Makefile packaging/rpm/SPECS/Makefile - packaging/rpm/SPECS/ethereal.spec + packaging/rpm/SPECS/wireshark.spec packaging/svr4/Makefile packaging/svr4/checkinstall packaging/svr4/pkginfo |