aboutsummaryrefslogtreecommitdiffstats
path: root/configure.ac
AgeCommit message (Collapse)AuthorFilesLines
2016-04-21Add "-git" tag to versionJoão Valverde1-2/+3
Add a static "-git" extra version tag for VCS snapshot builds, to be replaced when running 'make-version -r'. Change-Id: If29fca04029ed3129aa2332492dc536091049955 Reviewed-on: https://code.wireshark.org/review/15032 Reviewed-by: João Valverde <j@v6e.pt>
2016-04-20Put the correct path for "epan/dissectors/asn1/Custom.m4"AndersBroman1-1/+1
Change-Id: I98d333f2898d224d4e69e4ad87ae574d68dda048 Reviewed-on: https://code.wireshark.org/review/15022 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-04-17configure.ac clean upJoão Valverde1-4/+2
Remove obsolete comment and unused variable. Change-Id: I510feb8f14ceb3c74a2bde484f191bcbb64908d0 Reviewed-on: https://code.wireshark.org/review/14925 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-13Fix configure scriptJoão Valverde1-0/+6
Do not use default ACTION_IF_NOT_FOUND. Fixes bug in d77029d55dc5e3b5daa6c161deb098e786184afa. Change-Id: Ia6d27015ef51add19e5457bdf035e08a6c444a43 Reviewed-on: https://code.wireshark.org/review/14906 Reviewed-by: João Valverde <j@v6e.pt>
2016-04-13configure.ac: Make GTK+ option similar to QtJoão Valverde1-69/+35
Change-Id: I0a6cd56f92b0f7dc8f06aa93f36622887d506fb5 Reviewed-on: https://code.wireshark.org/review/14846 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-04-12configure.ac: Use environment variable to set VERSION_FLAVORJoão Valverde1-1/+2
Change-Id: I6889151878a2f83d295a7c749675a6c44575d608 Reviewed-on: https://code.wireshark.org/review/14886 Reviewed-by: Guy Harris <guy@alum.mit.edu> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-04-09[GTK] Check for xdg-open at run timeJoão Valverde1-35/+0
Remove HTML_VIEWER compile-time setting. If xdg-open doesn't exist use user web browser preference as fallback. Change-Id: I3b4a4a1a36b0192d75f2c97595f37d0d88a0941e Reviewed-on: https://code.wireshark.org/review/14805 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Tested-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: João Valverde <j@v6e.pt>
2016-04-08Use a single WS_NORETURN macroPeter Wu1-11/+2
Having to define two macros for marking a function as never returning seems a bit redundant. Merge the MSVC and GCC-like attributes into a single WS_NORETURN. Tested with Clang 3.7.1, GCC 4.4.7 and even GCC 4.1.2 using this small program (-Wall -Wextra, the first two generate warnings for uninitialized variables, the last one compiles without warnings): #include <stdlib.h> __attribute__((noreturn)) void foo() { exit(1); } __attribute__((noreturn)) void bar(); void bar() { exit(1); } int main() { int j, i; if (i) { bar(); return j; } foo(); return j; } Change-Id: I7d19c15e61b8f8fa4936864407199c4109f8cc82 Reviewed-on: https://code.wireshark.org/review/14822 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Guy Harris <guy@alum.mit.edu> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-04-07Remove -Warray-bounds, it is enabled by default with -WallJoão Valverde1-1/+0
Change-Id: If2041c66ccdf8a975d660524c793d45aa9f80623 Reviewed-on: https://code.wireshark.org/review/14852 Reviewed-by: João Valverde <j@v6e.pt>
2016-04-07Revert "Try to suppress a compiler feature that goes wrong."João Valverde1-16/+0
This reverts commit ec075789e31942008eb8ad7faf35b7012778dac8. Change-Id: I6f84f01f2027f32d3727dd9d7d097d6d90e063c2 Reviewed-on: https://code.wireshark.org/review/14851 Reviewed-by: João Valverde <j@v6e.pt>
2016-04-07autotools: Use AC_SUBST to set -Werror flagJoão Valverde1-3/+5
Change-Id: I34a90155ab613ca97bf58b72f56ec08eff87d3ab Reviewed-on: https://code.wireshark.org/review/14849 Reviewed-by: João Valverde <j@v6e.pt>
2016-04-07configure.ac: Move a testJoão Valverde1-2/+1
Change-Id: Icf9bd86583df43ab8b7748c9f6828d187ebbc0a4 Reviewed-on: https://code.wireshark.org/review/14847 Reviewed-by: João Valverde <j@v6e.pt>
2016-04-06configure.ac: fix a help stringMartin Kaiser1-1/+1
Change-Id: I9b079caae968dbccf5015da91d97f5a8881d2a1a Reviewed-on: https://code.wireshark.org/review/14833 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2016-04-05configure.ac: Update libtool macros (version bump)João Valverde1-24/+18
Obviate the need for libtool bug work around. Requires libtool 2.2.2 as the first fully working release of the 2.0 branch. Change-Id: I925f44f06b4c8e3bb06d356308afe1bde1b149f3 Reviewed-on: https://code.wireshark.org/review/14811 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-04-05Use AC_CONFIG_FILESJoão Valverde1-4/+6
AC_OUTPUT with arguments is obsolescent. Change-Id: Ibd53f5db1137ec34c70e22ac73385f379aa5d6e5 Reviewed-on: https://code.wireshark.org/review/14816 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-04-04Use AC_REPLACE_FUNCS and LTLIBOBJSJoão Valverde1-85/+23
Change-Id: I0f46167fe900c39d678560809cd5391c2a9bc4d2 Reviewed-on: https://code.wireshark.org/review/14809 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-04-04Avoid unnecessary replacement source file floorl.cJoão Valverde1-1/+0
Change-Id: If282cb22dcf099559cbe8acd5b1affd07155af8c Reviewed-on: https://code.wireshark.org/review/14808 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-04-04Include ws_diag_control.h in config.hJoão Valverde1-0/+2
Change-Id: Ia394071710ecda3b0e6686a51fbca45a8ff20317 Reviewed-on: https://code.wireshark.org/review/14749 Petri-Dish: João Valverde <j@v6e.pt> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2016-04-04autotools: Clean up libm testsJoão Valverde1-16/+9
Change-Id: I01bef4d6c2cf2280935d573166652d905948028d Reviewed-on: https://code.wireshark.org/review/14806 Reviewed-by: João Valverde <j@v6e.pt>
2016-04-04Remove synchronous DNS name resolutionJoão Valverde1-5/+3
Change-Id: Ie5e670b769eb0674950f3679ef511047641c2873 Reviewed-on: https://code.wireshark.org/review/14751 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: Anders Broman <a.broman58@gmail.com>
2016-04-02Use AC_PROG_SEDJoão Valverde1-40/+7
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-2/+2
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-1/+1
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-04-01configure.ac: Use AC_MSG_ERROR instead of AC_ERRORJoão Valverde1-1/+1
AC_ERROR is obsolete. Change-Id: If4d2a577863923c8a7aa9b6427c217fc9c1fa630 Reviewed-on: https://code.wireshark.org/review/14756 Reviewed-by: João Valverde <j@v6e.pt>
2016-03-29Use "old-style" moc options to ensure backward compatibility for Qt toolsJoão Valverde1-2/+4
Change-Id: Ic96df4ba521e0fbaf4ac34f23e3a89304ed5de5c Reviewed-on: https://code.wireshark.org/review/14662 Reviewed-by: João Valverde <j@v6e.pt>
2016-03-29Add GLib version info to configure status messageJoão Valverde1-1/+2
Change-Id: I279996e6713cad809a9487a83dc9692e7673f604 Reviewed-on: https://code.wireshark.org/review/14663 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-29configure.ac: Fix bogus variable nameJoão Valverde1-4/+4
Change-Id: Iaca06400a337340b679f4b017103f28af7155535 Reviewed-on: https://code.wireshark.org/review/14684 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-03-29configure: fix cache var handlingMike Frysinger1-16/+15
Need to use the AC_CACHE_CHECK macro in order for the cache vars to be loaded+checked, otherwise the vars here are just plain variables. This also allows people to control the various tests when cross-compiling. Bug: 9912 Change-Id: I119eb87807098c84520954dd34cbd0ddd1b6ccb0 Reviewed-on: https://code.wireshark.org/review/14683 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: 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-03-28configure: fix non-POSIX testMike Frysinger1-1/+1
The == operator is not in POSIX -- it's an extension some shells support. Change-Id: Idb2be90307de783b4220cc7d91222b462c98dee4 Reviewed-on: https://code.wireshark.org/review/14680 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-03-25autotools: Reorder extra compiler warnings to come lastJoão Valverde1-101/+100
Also try to improve check hf description. Change-Id: I7a1e5997dfc7a97cc62e2f2f9cc7c5026468451e Reviewed-on: https://code.wireshark.org/review/14623 Reviewed-by: João Valverde <j@v6e.pt>
2016-03-25Remove -W from compiler warningsJoão Valverde1-2/+2
Change-Id: I6d1aeab4fd9dce9b7a9804ac9099d318a2b434d2 Reviewed-on: https://code.wireshark.org/review/14622 Reviewed-by: João Valverde <j@v6e.pt>
2016-03-25Improve configure script messageJoão Valverde1-15/+11
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-28/+6
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-24Put pcapio.c into a writecap library, and use it.Guy Harris1-0/+2
Change-Id: Ib89f345c072a38bc01f0513366a4bdae3bf6f08e Reviewed-on: https://code.wireshark.org/review/14615 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-03-24Add basic PIDL MakefileJoão Valverde1-1/+0
Change-Id: I8f4c8e312df73b70f3cacd0df768375b46197ae6 Reviewed-on: https://code.wireshark.org/review/14507 Petri-Dish: João Valverde <j@v6e.pt> Reviewed-by: João Valverde <j@v6e.pt> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-03-24configure.ac: Fix missing quotesJoão Valverde1-6/+6
Change-Id: Ib2337bfb91be69bce85c3e69eaf3a4d91c5f3ed5 Reviewed-on: https://code.wireshark.org/review/14616 Reviewed-by: João Valverde <j@v6e.pt>
2016-03-24extcap: add ciscodump.Dario Lombardo1-15/+42
Ciscodump is a new extcap that allows packet capture on Cisco routers (IOS 12.4 and later) through SSH. Change-Id: Ic9c5be01d3bd0112116f7fc9fa10e26c1552b007 Reviewed-on: https://code.wireshark.org/review/13886 Reviewed-by: Roland Knall <rknall@gmail.com>
2016-03-23Set missing manpages in configure.acJoão Valverde1-2/+2
Change-Id: I09cea974f1da7a37bf633fd8f5eae30382f18628 Reviewed-on: https://code.wireshark.org/review/14581 Reviewed-by: João Valverde <j@v6e.pt>
2016-03-23Rename 'aclocal-fallback' directory to 'm4'João Valverde1-1/+1
Change-Id: Icac1c43264b6c6fd426d3c5146863a491b48b4ff Reviewed-on: https://code.wireshark.org/review/14569 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-03-23configure.ac: Remove --enable-usr-localJoão Valverde1-32/+0
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-23configure.ac: Add missing quotesJoão Valverde1-1/+1
Change-Id: Iecd2fa95104ac483a2babad1eaba8f9e9c4732c5 Reviewed-on: https://code.wireshark.org/review/13308 Reviewed-by: João Valverde <j@v6e.pt>
2016-03-21Remove ADNS supportJoão Valverde1-46/+5
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-21Fix building without extcap enabledJoão Valverde1-71/+84
Using cmake -DENABLE_EXTCAP=no or ./configure --without-extcap. Some documentation fixes too. Change-Id: Iebf9c843d67e10a32de1a62904de8f88b872ec99 Reviewed-on: https://code.wireshark.org/review/14522 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-03-18DocBook: Don't require xmllint.Gerald Combs1-5/+0
Remove dependencies on xmllint. We don't write DocBook by hand any more and we haven't used it in a long time in the CMake builds. Change-Id: Ic07f03b00c4554c058eece0462b0925d565b6da1 Reviewed-on: https://code.wireshark.org/review/14506 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-03-14Try to suppress a compiler feature that goes wrong.Guy Harris1-0/+16
-Warray-bounds + the macros for strcmp() = pain. Either the macro is doing something wrong or the compiler is confused, because if( strcmp(argv[i],"--")==0 ) dashdash = 1; should not produce array index 3 is past the end of the array (which contains 3 elements) Either 1) the macro is blithely running past the end of "--", which does, indeed, contain only 3 elements, or 2) the compiler mistakenly believes that the code generated by the macro is running past the end of "--" when it isn't. Change-Id: I4183e29272ba9e05b3b370efd90102f2226df7c3 Reviewed-on: https://code.wireshark.org/review/14469 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-03-13Move /asn1 to /epan/dissectorsJoão Valverde1-104/+104
Change-Id: I1208fe3c2ba428995526f561e8f792b8d871e9a9 Reviewed-on: https://code.wireshark.org/review/14388 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: João Valverde <j@v6e.pt>
2016-03-10autotools: Don't use AM_PROG_CC_C_OJoão Valverde1-1/+0
Try to fix OSX build after commit g2728f56: configure.ac:76: error: AC_PROG_CC cannot be called after AM_PROG_CC_C_O aclocal-fallback/ax_prog_cc_for_build.m4:125: AX_PROG_CC_FOR_BUILD is expanded from... Automake manual indicates this macro as obsolescent. Change-Id: Ia110ad34d65cab91a55b9d57673356d5c4b3bfe3 Reviewed-on: https://code.wireshark.org/review/14403 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-7/+8
(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-07Add conflict check filterAlexis La Goutte1-0/+8
Set ENABLE_CHECK_FILTER to 1 for get list of display filter with conflict... Ping-Bug:2402 Change-Id: I8d56b1573120d1a29d437aae1088be242e15e9a3 Reviewed-on: https://code.wireshark.org/review/13644 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> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-03-04extcap: add local_interfaces_to_list() to wsutil.Dario Lombardo1-0/+2
This new function abstracts the creation of a list of the local interfaces that will be used by future extcaps to generate specific filters. Sshdump now uses it to create a pcap filter. Change-Id: I5b75a266f81104b3c9bcb3e51de246b7cc8785ce Reviewed-on: https://code.wireshark.org/review/14092 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: Roland Knall <rknall@gmail.com>