aboutsummaryrefslogtreecommitdiffstats
path: root/acinclude.m4
AgeCommit message (Collapse)AuthorFilesLines
2017-05-11Revert "Revert "Get rid of HAVE_REMOTE.""Guy Harris1-3/+1
This reverts commit 8cd1fd0c993df904596390ebdf350259e7c9c5fc. Making HAVE_REMOTE a config.h #define is a really horrible idea. It's *NOT* a configuration option. Instead, HAVE_REMOTE should be defined by other mechanisms, as was done in 79eab8ca070f978415126f85b0777ab4ab02f0a2. Change-Id: I4632b63bd73a25a27c5f4686d2baf3e0beddecb3 Reviewed-on: https://code.wireshark.org/review/21604 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-05-11Revert "Get rid of HAVE_REMOTE."Jörg Mayer1-1/+3
This reverts commit d13b8ea13cf708a7770e7f51912ce16d0b43e459. This will only work with git HEAD of libpcap, but not with any release versions of libpcap or winpcap (the *pcap includes require the define, not Wireshark). Change-Id: I08e5ec66e3642dc02f793c83ffc4363bb348202c Reviewed-on: https://code.wireshark.org/review/21603 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2017-05-10Get rid of HAVE_REMOTE.Guy Harris1-3/+1
We never test for it - we test for HAVE_PCAP_REMOTE - so there's no need to set it in config.h. While we're at it, note that "PCAP" in "HAVE_PCAP_REMOTE" can refer to libpcap as well as WinPcap, given that, at least in the tip of the master branch, you can configure remote support in libpcap, although it's not enabled by default (it needs to be vetted for security, as it increases the attack surface of a machine running the server *and* of an application using libpcap with remote support). Change-Id: I3c96cf16bbda19ec7c085f74cffc6f125198d45b Reviewed-on: https://code.wireshark.org/review/21589 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-04-14Update Windows binaries to GeoIP 1.6.10 with a local GeoIP_free functionPascal Quantin1-0/+5
This solves a crash occurring when trying to free memory allocated by GeoIP (cross-compiled with mingw(32|64)) with MSVC function Bug: 13598 Change-Id: I757cff13660bd485d7ea91d10660e9bf86404728 Reviewed-on: https://code.wireshark.org/review/21090 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-12-28CMake,autotools: enable -Werror=implicit by defaultPeter Wu1-4/+5
The -Wimplicit error covers two warnings, trying to catch these cases: Setting a global variable without declaring its type (-Wimplicit-int): undeclared_type = 1; More importantly, -Wimplicit-function-declaration catches the case where a function is not declared (missing header, programming error, etc.). Turn these warnings into errors, most likely it will be a programming error that results in a link failure anyway. See also https://fedoraproject.org/wiki/Changes/Fedora26CFlags Also fix autotools checks not to trigger -Wimplicit-int and -Wimplicit-function-declaration (in krb5 check due to missing include). Tested on Ubuntu 16.04 (autotools & cmake) and Arch Linux (cmake), configure/cmake output and config.h are identical. Change-Id: I137284263f3b1223df6e6a893111c3640802631f Reviewed-on: https://code.wireshark.org/review/19331 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-12-20Update comments and messages for the new name for Apple's OS for Macs.Guy Harris1-1/+1
Change-Id: I96be861220f6052cb1bc61f5f4e74e76821ff565 Reviewed-on: https://code.wireshark.org/review/19358 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-12-02Do *NOT* strip newlines from the standard input of sed.Guy Harris1-1/+1
There is *NO* guarantee that sed will do anything useful with input that doesn't have a newline and, in fact, the default sed in Solaris 11 doesn't produce *any* output if you hand it input with no newline. Furthermore, doing xxx=`yyy` will, if the output of yyy has newlines at the end, strip them; to quote section 2.6.3 "Command Substitution" of the Single UNIX Specification: The shell shall expand the command substitution by executing command in a subshell environment (see Shell Execution Environment) and replacing the command substitution (the text of command plus the enclosing "$()" or backquotes) with the standard output of the command, removing sequences of one or more <newline> characters at the end of the substitution. so there's no need to strip the newline. Change-Id: Ia710f67a42739c1e218eb9fec53a54bde6e010da Reviewed-on: https://code.wireshark.org/review/19016 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>
2016-10-17cql: add lz4 and snappy decompressionBenoît Canet1-0/+160
We do not use the STARTUP negotiation since a stream can be captured in its middle but try to decompress if the flag is present and fallback if it fails. Change-Id: Iecbf49a45220b04be7808869c9884548eb1e7694 Signed-off-by: Benoît Canet <benoit@scylladb.com> Reviewed-on: https://code.wireshark.org/review/17952 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-10-13Remove nghttp2 code and use system' nghttp2Balint Reczey1-0/+28
Update debian, macos (setup / homebrew) download script Update testsuite (don't try HPACK when build without nghttp2) Change-Id: I365e5e17bc4fab4acd81b4c39ea7189a5d1ee112 Reviewed-on: https://code.wireshark.org/review/17347 Reviewed-by: Gerald Combs <gerald@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-07-06configure: Check for working lreleaseJoão Valverde1-0/+13
The qtchooser package in many (all?) distros installs executable symlinks to qtchooser that can mislead AC_PROG_PATH if the corresponding Qt linguist tools package is missing. Bug: 12570 Change-Id: I98795a3a7b8a05214c56a0c7b50829ea3b2976fa Reviewed-on: https://code.wireshark.org/review/16316 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Adrian Simionov <daniel.simionov@gmail.com> Reviewed-by: João Valverde <j@v6e.pt>
2016-06-27autotools: Qt 5.7 requires C++11João Valverde1-0/+8
Change-Id: Icad622a052a84862ace98a7000f10ccf677f54a5 Reviewed-on: https://code.wireshark.org/review/16138 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>
2016-06-13extcap: Check libssh >= 0.6.0 for sshdump, ciscodumpJohn A. Thacker1-5/+17
sshdump and ciscodump require libssh >= 0.6.0. Check for this version and only build them if a sufficient version is present. (The other checks stay; in particular, ssh_userauth_agent doesn't exist on Windows and must be checked separately.) Bug: 12507 Change-Id: Ibe42b0cbb597cd9c4aab51f44d48185940ad954b Reviewed-on: https://code.wireshark.org/review/15882 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Dario Lombardo <lomato@gmail.com> Tested-by: Dario Lombardo <lomato@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-05-12autotools: Move OSX autoconf macros to ws_osx.m4João Valverde1-78/+0
Change-Id: Icde077957810a0eb2a99cdfd6ec57dfd04b4ad47 Reviewed-on: https://code.wireshark.org/review/15354 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Tüxen <tuexen@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2016-04-25autotools: use AM_CONDITIONAL for rpm build ruleJoão Valverde1-20/+0
Change-Id: Ia97966e28cf7d061694336fb00b9a0790f0d57bb Reviewed-on: https://code.wireshark.org/review/15067 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2016-04-04Rename "libz" to "zlib"João Valverde1-1/+1
Change-Id: I12f92c983d587c2a4751428cdf299635090c9f0b Reviewed-on: https://code.wireshark.org/review/14748 Reviewed-by: João Valverde <j@v6e.pt> Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-04-02Use AC_PROG_SEDJoão Valverde1-15/+0
Change-Id: I879e2457b8127404b8ddf12ed2d2ff8c90a49dc3 Reviewed-on: https://code.wireshark.org/review/14755 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: João Valverde <j@v6e.pt>
2016-04-02Use AC_CHECK_MEMBERSJoão Valverde1-45/+0
Change-Id: I18779ad869c97a6ddd12e39fe2f7a1f7b0c8cf56 Reviewed-on: https://code.wireshark.org/review/14754 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2016-04-02Use AC_STRUCT_TIMEZONEJoão Valverde1-34/+0
Change-Id: I96c12dce662691d37d6eb6c1893c5e9d91a8ea6f Reviewed-on: https://code.wireshark.org/review/14753 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2016-03-25Improve configure script messageJoão Valverde1-1/+1
Change-Id: I4b05d20d22300e2c29982ca0b9724196f9335497 Reviewed-on: https://code.wireshark.org/review/14621 Reviewed-by: João Valverde <j@v6e.pt>
2016-03-25Add ax_lib_socket_nsl.m4 macroJoão Valverde1-86/+13
Add SOCKET_LIBS and NSL_LIBS to global LIBS variables on platforms where it is required. Make configure checks for getaddrinfo/gethostname unconditional, that is handled with #ifdefs if necessary. Change-Id: Ia874038454fb9cf3bdbf8e6fd829f319e331837e Reviewed-on: https://code.wireshark.org/review/14560 Reviewed-by: João Valverde <j@v6e.pt>
2016-03-23configure.ac: Remove --enable-usr-localJoão Valverde1-29/+2
Let the compiler and linker handle the system default search path. Generally give priority to /usr/local when doing "manual" searches. Change-Id: I3bde7af1226305d94ddb4bc96cefe9ef91e26769 Reviewed-on: https://code.wireshark.org/review/14564 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2016-03-22Reorder some linker flags from most dependent to least dependentJoão Valverde1-4/+3
Change-Id: I949a01cc6a8d56c4aac65b54f45e6ab6cc918d29 Reviewed-on: https://code.wireshark.org/review/14563 Reviewed-by: João Valverde <j@v6e.pt>
2016-03-21Remove ADNS supportJoão Valverde1-31/+0
Relevant mailing list message: https://www.wireshark.org/lists/wireshark-dev/201503/msg00007.html Change-Id: I0cff6d4d64fb52a651bcf6b28c183e43653b1cc2 Reviewed-on: https://code.wireshark.org/review/14519 Reviewed-by: João Valverde <j@v6e.pt>
2016-03-10Use AX_PROG_CC_FOR_BUILD macro to identify compiler targeting the build host.Eric Anderson1-2/+2
(When cross-compiling, this is *not* the compiler used to build wireshark itself). Macro ax_prog_cc_for_build.m4 retrieved from http://git.savannah.gnu.org/gitweb/?p=autoconf-archive.git Change-Id: I035059d9315e0081dcf1ffbafd9ce6d7ad46700c Reviewed-on: https://code.wireshark.org/review/4503 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Eric Anderson <andersoe@cs.cmu.edu> Reviewed-by: João Valverde <j@v6e.pt>
2016-03-03Revert "autotools: Use explicit zlib dependency build flags"João Valverde1-40/+60
This reverts commit 2bded0b66137a2f1c8b69911d91903a24f8a2624. Change-Id: Ic898c65df4daaa395eb010e0286d97509346d43a Reviewed-on: https://code.wireshark.org/review/14318 Reviewed-by: João Valverde <j@v6e.pt>
2016-03-03autotools: Use explicit zlib dependency build flagsJoão Valverde1-60/+40
Use pkg-config if a zlib.pc file is available. Remove the now redundant AC_TRY_LINK_FUNC test (there are no linker flags for GTK+ here). Change-Id: I7de744749eba7231ae0097b975144b76ffcf1bdb Reviewed-on: https://code.wireshark.org/review/14263 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2016-02-27Lua configure.ac improvementsJoão Valverde1-1/+12
Use PKG_WIRESHARK_CHECK_SYSTEM_MODULES for consistency with other system dependencies. Give slightly more informative configure messages other than multiple 'checking for LUA'. Check for headers using pkg-config to avoid undefined symbols in config.h. Change-Id: I8d3df9ccf6f718d7d055da4f713af60d46d89e33 Reviewed-on: https://code.wireshark.org/review/14173 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2016-02-23autotools: Display build flags in configure summaryJoão Valverde1-6/+6
Add more AX_APPEND_FLAGS to handle whitespace better too. Change-Id: I679fc76076c2d800e3524fe7bf22d0af8e58b284 Reviewed-on: https://code.wireshark.org/review/14062 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-02-21autotools: Fix multiple repetitions of -L build flagsJoão Valverde1-2/+2
Before: WS_LDFLAGS=' -Wl,--as-needed -L/usr/local/lib -L/usr/local/lib -L/usr/local/lib -L/usr/local/lib -L/usr/local/lib' After: WS_LDFLAGS=' -Wl,--as-needed -L/usr/local/lib' Bumps autoconf required version to 2.64. Change-Id: Idac0e0382481ddd954b07d9ac729f33c9d11639a Reviewed-on: https://code.wireshark.org/review/14041 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2016-02-20autotools: Use Qt flags only for building Qt GUIJoão Valverde1-2/+0
Change-Id: I041e2fab6de948c803cc059e78358077000efee8 Reviewed-on: https://code.wireshark.org/review/14006 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2016-02-03Fix Qt4 moc option argument and add build parametrizationJoão Valverde1-1/+4
Change-Id: Ib758f0eabaf96f9c6010201e7e16147fcfa0daa2 Reviewed-on: https://code.wireshark.org/review/13671 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Michal Labedzki <michal.labedzki@tieto.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-01-28autotools: Don't use "user variables" to set build flagsJoão Valverde1-109/+105
GNU coding standards recommend against it and automake is designed around it. This allows overriding the global build flags using AM_CFLAGS, etc., or per object flags, something that is difficult or impossible currently because of automake precedence rules. Change-Id: I3f1ea12e560af5a46b2f04b342b1882bbf123f12 Reviewed-on: https://code.wireshark.org/review/13455 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2016-01-16Revert "Don't use the printf command; it's not guaranteed to be there."Guy Harris1-1/+1
This reverts commit 67c58497442fb52571e7507cab0115567eb6352d. It's not *guaranteed* to be there in *every* UN*X, but it's in at least the Single UNIX Specification V3, as well as in shells commonly used in non-UNIX UN*Xes :-), so it'll be there in the UN*Xes we'll be run on. Change-Id: I541f7607055a24d6933d10244f85eea60052a3d8 Reviewed-on: https://code.wireshark.org/review/13325 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-16Don't use the printf command; it's not guaranteed to be there.Guy Harris1-1/+1
Change-Id: I8cb7f1dcf9cbe360f38a2d9e05f1b876c80409e3 Reviewed-on: https://code.wireshark.org/review/13324 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-11-26autotools: do not apply CFLAGS in reverse orderPeter Wu1-20/+22
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-25Don't check whether the C++ compiler supports a flag if there isn't one.Guy Harris1-93/+102
If we didn't find a C++ compiler, we can't check whether the non-existent C++ compiler supports a flag, so don't do so. Change-Id: I3d3232acae2dfc40deb0b01f35656ef53c4f1640 Reviewed-on: https://code.wireshark.org/review/12132 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-11-23Remove configure --enable-ipv6 optionJoão Valverde1-118/+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-21acinclude.m4: Replace AS_ECHO_N with printfJoão Valverde1-1/+1
Quick fix for OSX build, AS_ECHO_N is not available for that autoconf version. Change-Id: I24a93622d15388ef84c0f099d1209052bb35856d Reviewed-on: https://code.wireshark.org/review/12013 Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2015-11-21autotools: Fix extra-compiler-warnings for system headersJoão Valverde1-1/+25
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/+37
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-10-08No RCS/CVS/SVN Ids any more.Guy Harris1-2/+0
Change-Id: Ia9057a1851be17238c35094f14e847b387943186 Reviewed-on: https://code.wireshark.org/review/10869 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-10-02Qt: Initial RTP playback.Gerald Combs1-4/+6
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-09-18do not clobber user CFLAGSJeroen Roovers1-14/+14
Bug: 10791 Change-Id: I58c35c757039e69111a39100f5ccb306e098d591 Reviewed-on: https://code.wireshark.org/review/10519 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Guy Harris <guy@alum.mit.edu> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-09-10Check if -fPIC is needed for Qt5 code to compileJeffrey Smith1-0/+30
On many systems, Qt5 requires that code compiled against it must compile with -fPIC. The preferred place to determine whether this is necessary is at configure time. This change adds the auto-tool code to make that happen and removes the hack put in place as an interim solution. Bug: 11230 Change-Id: I6e583c67bb67d168a30c0af05a8cd0a070522ba0 Reviewed-on: https://code.wireshark.org/review/10281 Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2015-07-10Make .o files, not .cpp and .h files, depend on the ui_*.h files.Guy Harris1-77/+39
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-08Make sure we get the Qt tools for the Qt version with which we're building.Guy Harris1-66/+182
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-11Search for the Lua (version < 5.3) package first: it's the most common case.Jeff Morriss1-1/+1
Change-Id: I5a74870c491d46e538200f2b275b1608c0afecd4 Ping-Bug: 11219 Reviewed-on: https://code.wireshark.org/review/8865 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2015-06-09Clean up --with-qt handling.Guy Harris1-1/+1
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-06-08Update how we search for Lua with pkg-config.Jeff Morriss1-18/+26
First, search for packages with the version number without the period (bug 11219). Second, don't look for Lua 5.3 because we don't work with it. If what we find (without pkg-config's help) is Lua 5.3, disable Lua support (bug 10881). Cmake support by Peter Wu (originally Ie73e5b53640f10432881a9671c0a605f7f027ed8): Note the check for "lua<=5.2.99" instead of "lua<5.3" since cmake does not support the latter syntax. Tested with lua5.2, lua5.1 and lua (5.3) installed. Bug: 11219 Ping-Bug: 10881 Change-Id: I382d07ca00eafc6111cd4e9faa2b66f6b8f95b6e Reviewed-on: https://code.wireshark.org/review/8783 Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-05-28switch to AC_PATH_TOOLMike Frysinger1-3/+3
The TOOL variant will automatically search for host prefixed scripts (e.g. armv7a-unknown-linux-gnueabi-pcap-config) before falling back to the default (i.e. pcap-config). This makes cross-compiling a bit simpler. Change-Id: Ia450839693b5550f798634a7e8b82c2a661b088c Reviewed-on: https://code.wireshark.org/review/8481 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-20 03:43:58 +0000