aboutsummaryrefslogtreecommitdiffstats
path: root/configure.ac
AgeCommit message (Collapse)AuthorFilesLines
2016-01-04Generate better pkg-config fileMichal Privoznik1-1/+2
Firstly, when building with autogen.sh and configure script, the wireshark.pc is not generated at all. Then, due to not matching names some variables are not being replaced as they should be. Bug: 11069 Change-Id: Iefa7a9b536f3fee7f9ad78803aaacc5bb64a9c8d Signed-off-by: Michal Privoznik <mprivozn@redhat.com> Reviewed-on: https://code.wireshark.org/review/13005 Reviewed-by: João Valverde <j@v6e.pt> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-12-22extcap: add randpktdump, a random packet generator.Dario Lombardo1-0/+42
This new extcap is for testing and educational purpose. It relies on rankpkt-core functions to generate random packets. Change-Id: If6890f0673545682995a2079458108edc0913b30 Reviewed-on: https://code.wireshark.org/review/11764 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-14Note why we do -Wno-variadic-macros.Guy Harris1-0/+4
Change-Id: Icaa5c1e927d0984bd76d9d157166de359891d381 Reviewed-on: https://code.wireshark.org/review/12638 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-12-12Remove -Wwrite-strings compiler flagJoão Valverde1-1/+0
The "-Wwrite-strings" flag produces nuisance warnings. These warnings are not useful, they're impossible to fix in a sane way and therefore are being handled with casts of static strings to (char *). This just moves the warning to [-Wcast-qual] and a compiler pragma is in turn required (and used) to squelch that warning. Remove the Wwrite-strings warning. Let that responsibility fall on the programmer (as is done by casting). Change-Id: I5a44dfd9decd6d80797a521a3373593074962fb5 Reviewed-on: https://code.wireshark.org/review/12162 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-29cfutils.c: Fix ISO C forbids an empty translation unit [-Wpedantic]João Valverde1-1/+3
Change-Id: Iac9384e63a4e946c73832103f8d6949f0187fa38 Reviewed-on: https://code.wireshark.org/review/12147 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2015-11-27Fix ISO C forbids an empty translation unit [-Wpedantic] (airpcap)João Valverde1-26/+0
Autotools only warning. Change-Id: I30f33d2f8611d662dbc62326862707bf05ad3f60 Reviewed-on: https://code.wireshark.org/review/12150 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-11-27sshdump: move build checkDario Lombardo1-17/+17
Check was made too early, when libssh was still unchecked. Change-Id: I6c84548b48e99d277f67f3a7ea06b4e759111034 Reviewed-on: https://code.wireshark.org/review/12141 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-11-27configure.ac: Fix CXXFLAGS with optimization for HP-UXJoão Valverde1-1/+1
Change-Id: I0cdef95ce44fb5c6112998697dbafe23c3ee13ab Reviewed-on: https://code.wireshark.org/review/12212 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-11-26autotools: do not apply CFLAGS in reverse orderPeter Wu1-13/+19
Fixes false "-Wvariadic-macros" because "-Wpedantic" came after "-Wno-variadic-macros". While at it, avoid (unintentionally?) adding -fPIE to all C++ programs (via CXXFLAGS). Availability of flags is checked by appending a flag (in case the user has something like CFLAGS=-Wno-error). This removes a -fPIE check for CXXFLAGS and removes 5 -Woverlength-strings and 9 -Wvariadic-macros warnings from make with Clang 3.7.0. configure and compile times were equal. (A diff between the configure outputs showed no other changes.) This reverts commit cf0d762d7304aa569ea25faf999c74bbe94f9023 and applies a different approach. Ping-Bug: 10791 Change-Id: Ic7b4137e2d98b06bc7625091be9bc7dd69182586 Reviewed-on: https://code.wireshark.org/review/12175 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-11-23Remove configure --enable-ipv6 optionJoão Valverde1-16/+0
It's an ancient obsolete option with a confusing name. Change-Id: Ib10330cf859cdea18fed2077c6539e56350ef380 Reviewed-on: https://code.wireshark.org/review/11967 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-21autotools: Fix extra-compiler-warnings for system headersJoão Valverde1-3/+3
Use -isystem instead of -I for external headers with GCC/clang to squash all the noise. cmake already uses -isystem by default for supported platforms/compilers. Change-Id: Ia6c9d1eb9b894fda6f48c531094d792e16fd39fc Reviewed-on: https://code.wireshark.org/review/11947 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-11-19extcap: add sshdump.Dario Lombardo1-0/+71
sshdump is an extcap module that allows dumping from a remote host using an ssh connection. It goes with the existing extcap plugin interface. Change-Id: I8987614fdd817b8173a50130812bc643a4833bca Reviewed-on: https://code.wireshark.org/review/11402 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-11-19GResource configure.ac fixupJoão Valverde1-7/+7
Use PKG_CHECK_EXISTS instead of PKG_CHECK_MODULE. Move check to happen after GLib. Change-Id: I29276fca12556ca69cdf521a1ca22659dec28408 Reviewed-on: https://code.wireshark.org/review/11949 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-11-12[configure.ac] Update gtk+ and glib release date listsBill Meier1-0/+2
Change-Id: I79f063fece531ae5e75b0c2a96682827f74489bf Reviewed-on: https://code.wireshark.org/review/11770 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-11-12[GTK] Replace deprecated gdk_pixbuf_new_from_inline()João Valverde1-0/+8
Use GResource instead, if available. Add autotools and cmake compile time checks for build requirements (GIO >= 2.32 and GDK-Pixbuf >= 2.26). Merge all the various static pixbuf csource header files into a single pixbuf-csource.h header with external linkage through use of the tools/make-pixbuf-csource.pl script. Fix inline pixbuf build target for some image paths (broken for GTK in gb4a4de7). Add missing 'expert_ok.png' file to distribution (GTK only). Minor improvements to style/structure of ui/gtk/Makefile.am. Bug: 10750 Change-Id: I031296b666ee8b92730400dfa6f71f9ee4304863 Reviewed-on: https://code.wireshark.org/review/10992 Petri-Dish: Anders Broman <a.broman58@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-11-10Apple calls it just "OS X" these days.Guy Harris1-2/+2
Change-Id: I98905988ceb394d27307d1cbe883d8fe95ac23e4 Reviewed-on: https://code.wireshark.org/review/11703 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-10-25Require GnuTLS 2.12.0, add cmake version detectionPeter Wu1-2/+2
Since v2.1.0rc0-17-g877fd03 and v2.0.0rc0-23-g263ff53 ("ssl-utils: load RSA keys based on their modulus+exponent"), GnuTLS 2.12.0 is needed. Add a version check to cmake as well, tested on CentOS6 (with pkg-config check disabled to verify the code path). Note that RHEL6 has GnuTLS 2.8.5 and thus SSL decryption with a RSA private key is no longer supported on that version. Change-Id: I99fdfe6790107f48629dd435794fe8880263063d Reviewed-on: https://code.wireshark.org/review/11044 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2015-10-20Require libgcrypt 1.4.2, add cmake version detectionPeter Wu1-3/+3
libgcrypt 1.4.2 is required since since v1.11.0-rc1-2787-g23f9100 ("Really add support for AEAD ciphers (GCM)") due to the use of gcry_cipher_setctr. Bump the version in configure.ac too. Add version check for gcrypt to cmake. Tested with CentOS 6 (cmake 2.8.12.2, libgcrypt 1.4.5). Change-Id: I93c3ed902a764d9d14675779e866230d073c96d5 Reviewed-on: https://code.wireshark.org/review/11043 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-10-16Make it possible to not build the Qt RPM (again).Jeff Morriss1-1/+1
The spec file will build with Qt5 unless told not to; ./configure has to tell it not to (if the user doesn't have/want Qt). Change-Id: Ib75462d20c841e75e425b5b07117f10e5573ad58 Reviewed-on: https://code.wireshark.org/review/11061 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2015-10-09Now that we're using AC_PROG_CC_STDC, let it handle HP C.Guy Harris1-8/+9
AC_PROG_CC_STDC should be setting whatever flags are needed for ISO C plus extensions, including requesting C99 if available. Don't set -Ae ourselves for HP C. Change-Id: Icd4dfc0c2078586d5773075ee25c40bfc787a482 Reviewed-on: https://code.wireshark.org/review/10910 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-10-08The second argument to AC_PATH_PROGS is a list of program names.Guy Harris1-1/+1
The *third* argument is the value to use if we don't find the program; we shouldn't fall back on "python3" if we can't find "python", we should try both "python" and "python3" and just set $PYTHON to nothing if we don't find either one. Change-Id: I5168455f09bc3165c49db4334f05856dec46bf62 Reviewed-on: https://code.wireshark.org/review/10890 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-10-07Don't just ask for C, ask for standard C - preferably C99.Guy Harris1-1/+5
We're using some C99 features, such as variadic macros, so if there's a compiler flag needed for C99 features, make sure it's supplied. If the compiler doesn't support standard C, complain. Change-Id: I6fb18f5222567249370b3d43065f2258dbde7e4d Reviewed-on: https://code.wireshark.org/review/10866 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-10-05Initialize 2.1.Gerald Combs1-3/+3
Change-Id: I515c53bb56cf82d1911b58f2cb2103afd0e597a5 Reviewed-on: https://code.wireshark.org/review/10810 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-10-05Allow use of variadic macrosPeter Wu1-0/+1
Remove variadic macros restriction (c99, c++11 feature) from README.developer. GCC, Clang, MSVC 2005 all support it. Enable -Wno-variadic-macros in configure.ac and CMakeLists.txt when -Wpedantic is enabled (which would enable -Wvariadic-macros). For all files matching 'define\s*\w+[0-9]\(', replace "FOO[0-9]" by "FOO" and adjust the macro definition accordingly. The nbap dissector was regenerated after adjusting its template and .cnf file. The generated code is the same since all files disabled the debug macros. Discussed at: https://www.wireshark.org/lists/wireshark-dev/201209/msg00142.html https://www.wireshark.org/lists/wireshark-dev/201510/msg00012.html Change-Id: I3b2e22487db817cbbaac774a592669a4f44314b2 Reviewed-on: https://code.wireshark.org/review/10781 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-10-02Qt: Initial RTP playback.Gerald Combs1-4/+11
Note the "initial". This is woefully incomplete. See the "to do" lists below and in the code. This differs a bit from the GTK+ version in that you specify one or more streams to be decoded. Instead of showing waveforms in individual widgets, add them all to a single QCustomPlot. This conserves screen real estate and lets us more easily take advantage of the QCP API. It also looks better IMHO. Change a bunch of checks for QtMultimediaWidgets to QtMultimedia. We probably won't use the widgets until we make 5.0 our minimum Qt version and plain old QtMultimedia lets us support Qt 4 more easily (in theory at least). Add resampling code from libspeex. I initially used this to resample each packet to match the preferred rate of our output device, but this resulted in poorer audio quality than expected. Leave it in and use to create visual samples for QCP and to match rates any time the rate changes. The latter is currently untested. Add some debugging macros. Note that both the RTP player and RTP analysis dialogs decode audio data using different code. Note that voip_calls_packet and voip_calls_init_tap appear to be dead code. To do: - Add silence frames where needed. - Implement the jitter buffer. - Implement the playback timing controls. - Tapping / scanning streams might be too slow. Change-Id: I20dd3b66d3df53c9b1f3501262dc01458849f6b4 Bug: 9007 Reviewed-on: https://code.wireshark.org/review/10458 Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-10-01Set the minimum Qt version to 4.7.Gerald Combs1-1/+1
We've been using QElapsedTimer for a while now with no complaints. It was introduced in Qt 4.7, which was first released in September 2010. Change-Id: I21ca768c6a7bab8a08626957583d81fd771c64b4 Reviewed-on: https://code.wireshark.org/review/10732 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-09-16Don't force Lua support in RPMs (some distros don't ship a compatible LuaJeff Morriss1-1/+10
anymore). Also make the RPM follow configure's qt4-vs-qt5 choice. Change-Id: I832af99e055d42b92f3a7c8e4378c7a9d5d628b9 Reviewed-on: https://code.wireshark.org/review/10532 Reviewed-by: Jeffrey Smith <whydoubt@gmail.com> Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2015-09-021.99.9 → 1.99.10.Gerald Combs1-1/+1
Change-Id: I924be5b0e3c73a0bb8ae1361fa518ec10139e13d Reviewed-on: https://code.wireshark.org/review/10363 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-07-241.99.8 → 1.99.9.Gerald Combs1-1/+1
Change-Id: I014399c332136a10b1c560d4c68be5b8bab97552 Reviewed-on: https://code.wireshark.org/review/9780 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-07-13On OS X, add an rpath for the Qt frameworks, and remove it in the app bundle.Guy Harris1-1/+21
Qt 5.5 and later have @rpath-based install names for the frameworks, which means that, if they're not installed in some frameworks directory searched by default (such as /Library/Frameworks) - which is the default case with the Qt installer - they won't be found by default. Add the directory in which the frameworks exist as an rpath in the Wireshark binary, so that they'll be found, and then remove it from the Wireshark binary in the app bundle, as the directory in which the frameworks exist on the machine on which Wireshark was built is irrelevant to the machines on which it's being deployed - the frameworks are included in the bundle, and we already add an rpath to find them there. Change-Id: I54e033743e7b17eab26976064dcd7cd000f97c78 Reviewed-on: https://code.wireshark.org/review/9625 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-07-13Make OS X .app bundling work with Qt 5.5.Guy Harris1-10/+2
macdeployqt doesn't actually seem to deploy any of Qt into the app bundle, probably because we're using it in a fashion they didn't intend (i.e., not doing everything with *their* build tools), so we just extend our dependency-binding stuff to handle the Qt libraries, and copy over the Qt plugins ourselves. We also add the rpaths to the executables and libraries as part of the app bundle building process; I thought it'd fix macdeployqt's problem, but it didn't, however, it's probably cleaner to do it there anyway. Change-Id: I134c2b1a32e168e82de67f0b674d17167481d69a Reviewed-on: https://code.wireshark.org/review/9612 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-07-12Update a comment.Guy Harris1-1/+2
Change-Id: I38e42ec1ea86a0678333093795be707d6e68ab62 Reviewed-on: https://code.wireshark.org/review/9607 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-07-10Update library release dates.Gerald Combs1-2/+8
Change-Id: I053096551a18242062766d966a2f28da047d5761 Reviewed-on: https://code.wireshark.org/review/9592 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-07-10Make .o files, not .cpp and .h files, depend on the ui_*.h files.Guy Harris1-27/+16
That's one of the mechanisms the autotools documentation suggests using to handle generated header files. Using it means that "make dist" will no longer try to build those files (they're not part of the distribution - and they can't be, as the files would be different for Qt 4 and Qt 5, and need to be generated by the uic from the same version of Qt as the one against which Wireshark is being built). This means we don't need to try to find uic, moc, or rcc if we're not building with Qt, so don't do so. Change-Id: Id2aadb8289598b82e14e4ed402ff8cdc15fdef74 Reviewed-on: https://code.wireshark.org/review/9583 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-07-09Clean up the "Build wireshark" message.Guy Harris1-1/+2
Change-Id: I40883aee5207dd8a437fcde827386bd370fbe96c Reviewed-on: https://code.wireshark.org/review/9570 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-07-08Make sure we get the Qt tools for the Qt version with which we're building.Guy Harris1-67/+26
For example, Qt 4's uic produces .h files that don't compile with Qt 5, as they use header #include paths that work with Qt 4's headers but not Qt 5's headers. Change-Id: I50c7bd15fca05475180a933a6c77955dc686c0c5 Reviewed-on: https://code.wireshark.org/review/9567 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-06-181.99.7 → 1.99.8Gerald Combs1-1/+1
Change-Id: I3423fd2959b1031480f15504ce38336ce3475b17 Reviewed-on: https://code.wireshark.org/review/8979 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-06-16Disable AirPcap by default in Autotools.Gerald Combs1-2/+4
Note that we might want to remove the check entirely. Change-Id: Ie0003abc64cd6f47c4f49770beb5d418995e939a Reviewed-on: https://code.wireshark.org/review/8950 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-06-09Clean up --with-qt handling.Guy Harris1-6/+13
If you don't specify --with-qt or --without-qt, we build with Qt iff we find it; we don't fail if we don't find it. If you specify --with-qt, we build with Qt if we find it and fail if we don't find it. If you specify --without-qt, we don't look for Qt and don't build with it. This is all independent of --with-gtk2 or --with-gtk3. Change-Id: I508d3281192bda9168fc46aba6011687c83ef818 Reviewed-on: https://code.wireshark.org/review/8861 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-05-31configure.ac: openSUSE build fixBart Van Assche1-85/+58
For some Linux distro's (e.g. openSUSE) the Qt4 tools have no suffix and the Qt5 tools have the suffix "-qt5". On such systems search for the Qt5 tools first. This avoids that compilation fails with the following error message: In file included from follow_stream_dialog.cpp:23:0: ui_follow_stream_dialog.h: In member function 'void Ui_FollowStreamDialog::retranslateUi(QDialog*)': ui_follow_stream_dialog.h:152:110: error: 'UnicodeUTF8' is not a member of 'QApplication' e(QApplication::translate("FollowStreamDialog", "Follow Stream", 0, QApplicatio ^ Bug: 11233 Change-Id: I09ccdb6a74043b6d952814b74fec5d618e6e26aa Reviewed-on: https://code.wireshark.org/review/8686 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-05-281.99.6 → 1.99.7.Gerald Combs1-1/+1
Change-Id: I8c431f162d199c8507ba57d84e496dce5f5a0933 Reviewed-on: https://code.wireshark.org/review/8677 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-05-22allow use of deprecated gdk-pixbuf functionsAndreas Stieger1-1/+0
gdk-pixbuf 2.31.2 marked GdkPixdata including as deprecated, including gdk_pixbuf_new_from_inline. Wireshark builds with deprecated functions turned off by default, in this case GDK_PIXBUF_DISABLE_DEPRECATED. Patch to configure.ac to allow use of deprecated function until upstream has ported the code, or a replacement patch is available. Bug: 10750 gdk-pixbuf change: https://git.gnome.org/browse/gdk-pixbuf/commit/?id=48d76fb7f2d059013f5781b199245274998f05c9 Initial warning: ui_utils.c: In function 'window_icon_realize_cb': ui_utils.c:115:5: warning: implicit declaration of function 'gdk_pixbuf_new_from_inline' [-Wimplicit-function-declaration] icon = gdk_pixbuf_new_from_inline(-1, wsicon_16_pb_data, FALSE, NULL); ^ Causes these warnings due to the implicit declaration: gui_utils.c:115:10: warning: assignment makes pointer from integer without a cast [enabled by default] icon = gdk_pixbuf_new_from_inline(-1, wsicon_16_pb_data, FALSE, NULL); ^ Fails the package checks in these lines: E: wireshark 64bit-portability-issue gui_utils.c:115, 117, 119, 121, 512 E: wireshark 64bit-portability-issue main.c:1513, 1519, 1525, 1531 E: wireshark 64bit-portability-issue prefs_layout.c:346, 347, 348, 349, 350, 351 E: wireshark 64bit-portability-issue stock_icons.c:413, 425 Change-Id: I85092753058cd2e5cda527e4321a7d92ac38facd Reviewed-on: https://code.wireshark.org/review/8578 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Balint Reczey <balint@balintreczey.hu>
2015-05-08Add some more warnings when building with Sun^WOracle's C compiler.Guy Harris1-0/+7
Change-Id: I696b0757ba7fece61f50ebcee79b576a4f15660f Reviewed-on: https://code.wireshark.org/review/8361 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-05-06Fix configuration with --without-qt and with no --with-gtk[23].Guy Harris1-1/+10
If building with Wireshark wasn't explicitly disabled - i.e., if we are building Wireshark, which means we are building an application with a GUI - and Qt was explicitly disabled, and neither GTK+ 2 nor GTK+ 3 were explicitly enabled, look for GTK+ 3. Change-Id: Ib913355f7b483d065e766605aa88a71fa9984f36 Reviewed-on: https://code.wireshark.org/review/8306 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-04-29Fix typo: we already checked for rcc and rcc-qt5, now it's time to check forJeff Morriss1-98/+98
rcc-qt4 (not rcc again). Fix up indentation: consistently use tabs. Change-Id: I8e6d5a601f2a28fef5eb705d8bfac0e02a0e02f3 Reviewed-on: https://code.wireshark.org/review/8233 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2015-04-29When configuring with Wireshark disabled, don't complain if uic, moc, and rccJeff Morriss1-3/+3
aren't found. This would work before but only if you explicitly disabled Qt. Bug: 11157 Change-Id: I1e4c2c18277e28c38b1ed2ffcaf45e49926e7a1f Reviewed-on: https://code.wireshark.org/review/8232 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2015-04-13Add a major version number argument to --with-qt.Guy Harris1-7/+22
Without a major version number, it behaves as before, picking whatever version it finds, and preferring Qt 5 to Qt 4. With a major version number, it looks only for the version in question. Bug: 10793 Change-Id: Idf6c2c61e84bb87f7b601d8f09c33f31b67bf46d Reviewed-on: https://code.wireshark.org/review/8052 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-04-12Only add flags to CFLAGS_FOR_BUILD if $CC and $CC_FOR_BUILD are the same.Guy Harris1-1/+9
Otherwise, just because a flag is appropriate for $CC, that doesn't necessarily mean it's appropriate for $CFLAGS_FOR_BUILD. (We don't use CFLAGS_FOR_BUILD for many things, so it's probably not worth making a lot of effort to throw all the warning flags into it if we're cross-compiling; we *do* throw them in for native compilation, which is what most developers use and test with, so that should be sufficient to let the warnings catch problems with the build tools we're building.) Change-Id: Iad9d611b4687e9e154f9871f741f3c8f3b307c88 Reviewed-on: https://code.wireshark.org/review/8026 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-04-08extcap: Add support for Android - androiddumpMichal Labedzki1-0/+33
androiddump is extcap program that can be used with Android devices (need Android SDK in system PATH). Supported is Logcat/Logger logs and Bluetooth interfaces for all Android to this day (Lollipop). Please note that it will work also for FirefoxOS. Interfaces: 1. Logcat Main (binary or text) 2. Logcat System (binary or text) 3. Logcat Events (binary or text) 4. Logcat Radio (binary or text) 5. Logcat Crash (text; Lollipop) 6. Bluetooth Hcidump (<Kitkat) 7. Bluetooth Bluedroid External Parser (Kitkat) 8. Bluetooth BtsnoopNet (Lollipop) Change-Id: I26e4cd1a37a6af805f8b932399b4aa44ee7b5a80 Reviewed-on: https://code.wireshark.org/review/7475 Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-03-30Work around a Linux bonding driver bug (and the lack of a libpcap workaround).Guy Harris1-0/+11
The bonding driver does not properly handle unknown ioctls; it returns ENODEV rather than ENOTSUP, EOPNOTSUPP, ENOTTY, or a "not supported" error of that type. This causes problems detailed in bug 11058. On Linux, check for bonding devices before checking for monitor-mode support. While we're at it, get rid of a commented-out include of CheckCSourceCompiles (it's presumably already been implicitly included by other functions that use it). Bug: 11058 Change-Id: I13035de0650634c51a52f262829b2b6fb86b39e9 Reviewed-on: https://code.wireshark.org/review/7856 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Guy Harris <guy@alum.mit.edu>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-21 23:53:55 +0000