aboutsummaryrefslogtreecommitdiffstats
path: root/configure.ac
AgeCommit message (Collapse)AuthorFilesLines
2015-03-191.99.4 → 1.99.5.Gerald Combs1-1/+1
Change-Id: Ifa1a57ac2db5d921d9b53dbe997cfa1916720c26 Reviewed-on: https://code.wireshark.org/review/7759 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-03-08Revert "[Qt translations] create the .qm files during the build"Martin Kaiser1-23/+0
This reverts commit 7d01a84d0e2833f685b7e70c3a52097891286566. cmake doesn't get the dependencies right if the .qm files are gone I'll work on this off-line and resubmit it as one commit rather than trying to approach this step-by-step Change-Id: Ibbd60163f910adbd571b3df2a980d64dbf1ea924 Reviewed-on: https://code.wireshark.org/review/7596 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2015-03-07[Qt translations] create the .qm files during the buildMartin Kaiser1-0/+23
create the .qm files from the .ts files at compile time for now, this works for autotools only don't fail if Qt's lrelease tool is not available, skip building the .qm files in this case Change-Id: I869a6dc8220eb03e7ffc8bfdb2b6f3930f6cac72 Reviewed-on: https://code.wireshark.org/review/7460 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2015-03-051.99.3 → 1.99.4.Gerald Combs1-1/+1
Change-Id: I96953b6ca34140972a783c3066614399981ca1e2 Reviewed-on: https://code.wireshark.org/review/7549 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-03-03Look for and use gethostbyname() if we don't have getaddrinfo(). Fail toJeff Morriss1-6/+27
configure if we can't find any name resolver (autotools only). This puts back the gethostbyname()/gethostbyname2() code removed in I3348179626e97daaddfbc89e3ed21e39915e3de4 and If59ce8a038776eadd6cd1794ed0e2dad8bf8a22c but as a last-resort option (only if we don't have a better or more modern name resolver). As suggested/requested by Guy in https://code.wireshark.org/review/#/c/7423/ Change-Id: I706dbbd65135f47c67d3d8d88a61ad7273914c47 Reviewed-on: https://code.wireshark.org/review/7447 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-02-27wmem, unlike emem, doesn't use mmap(); remove some no-longer-needed checks.Guy Harris1-1/+1
Change-Id: Ic9b57c7c7042fadf938bfa48a3aabe23ad33370f Reviewed-on: https://code.wireshark.org/review/7432 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-02-27We don't use gethostbyname2(), don't check for it.Guy Harris1-1/+1
Change-Id: Iff2e5ffe31692b06e1fd07ec0b259ac885a7ed63 Reviewed-on: https://code.wireshark.org/review/7431 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-02-19Qt: Add more version and packaging information to the main window.Gerald Combs1-0/+2
Add a "flavor" (for lack of a better word) banner, which can be set at build time via WIRESHARK_VERSION_FLAVOR / VERSION_FLAVOR. Set it to "Development Build" by default. This effectively migrates the "DEVELOPMENT VERSION" logo image text from the GTK+ UI. Add full release and automatic update information at the bottom. Remove the short version from the welcome banner (top left). To do: - Add back support for gui_version_placement. - Move the version and repository branch to the flavor label? - Add update links as appropriate to the bottom. - Clean up layout and spacing. Change-Id: I28af33e6c2beb855f803a2dfedef49f3e8389057 Reviewed-on: https://code.wireshark.org/review/7071 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-02-19Check whether emmintrin.h can be used *without* -msse4.2.Guy Harris1-19/+45
If not, we can't use SSE 4.2, as we need to be able to include it in files that use tvb_pbrk_compile()/tvb_pbrk_exec() even if they're not compiled with -msse4.2 (most files aren't, as we need to isolate SSE 4.2 instructions to a small bit of code that uses them only if running on hardware that supports them). Change-Id: I62262a3c45fa14e200967916ac0ffc283f8e322c Reviewed-on: https://code.wireshark.org/review/7246 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-02-18Add AddressSanitizer (ASAN) build optionAlexis La Goutte1-0/+18
--enable-asan for autotools -D ENABLE_ASAN:BOOL=TRUE for CMake Need Clang/LLVM >= 3.1 or GCC >= 4.9 More information about ASAN https://code.google.com/p/address-sanitizer/wiki/AddressSanitizer Change-Id: I833d4216d9508b8f7550ebc1dff6326734bdb53a Reviewed-on: https://code.wireshark.org/review/1727 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-02-17Added JSON native file support.Dario Lombardo1-1/+0
libjsmn has also been moved from epan/ to wsutil/ to make it visible from wiretap. Change-Id: I59abb3419acb1baa83194b38152d3651ed5c123c Bug: 10878 Reviewed-on: https://code.wireshark.org/review/6716 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-02-16OK, at least on my system uic is called uic-qt5, same for moc and rcc.Joerg Mayer1-51/+63
Found while doing an accidental autofoo build instead of cmake build. Change-Id: Ie8ab648561f88e0a28a64c06d4d78652643c91dd Reviewed-on: https://code.wireshark.org/review/7187 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2015-02-16Trivial Dead assignment fixes in configurePeter Wu1-4/+5
Fixes a Dead assignment and unused variable warning. With this patch and http://www.cmake.org/Bug/view.php?id=15203, `scan-build cmake` will give zero warnings! Change-Id: Idc7a03fbf1e8196bc139a2c6663ec48b897f2897 Reviewed-on: https://code.wireshark.org/review/7144 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>
2015-02-14Try to fix diagnostic suppression.Gerald Combs1-1/+1
Test the compiler for "-Wpedantic" instead of "-pedantic" since DIAG_OFF and DIAG_ON expect a "-W" flag prefix. Be more strict about the compiler versions that DIAG_OFF and DIAG_ON support. Change-Id: I9304c544912102f1719b79e9250f97b40a324430 Reviewed-on: https://code.wireshark.org/review/7123 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-02-14Note why some header checks are done even if unnecessary on UN*X.Guy Harris1-0/+13
Change-Id: I0ea8cbaed65922e4dd5e49bbb7578b392deb8c02 Reviewed-on: https://code.wireshark.org/review/7125 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-02-14Don't check for C89 headers.Guy Harris1-1/+1
1988 called, they want their lack of a C standard back. We don't need to check whether we have stdarg.h, stddef.h, stdlib.h, or string.h, as they're specified by C89 and I don't think there are any platforms we care about that don't have a C89 environment in which we could be built. Change-Id: I447551181284fab7722354b62774625ed8ee94bc Reviewed-on: https://code.wireshark.org/review/7110 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-02-14We use GLib's directory-reading routines, so we don't need <dire[cn]t.h>.Guy Harris1-1/+1
Change-Id: Id86e5d6d0ab24adb1bfff0688f33a40f2fdaed8d Reviewed-on: https://code.wireshark.org/review/7108 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-02-06More emem removal.Jeff Morriss1-22/+0
Remove emem's 8-byte-memory-alignment configure check as well as references to all the environment variables emem used. Change-Id: I897aec9e9c68e064454561e7a9f066b18892ec66 Reviewed-on: https://code.wireshark.org/review/6950 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-02-06Remove gethostbyaddr and gethostbyaddr2.Gerald Combs1-3/+3
They've been deprecated for a very long time. Replace them with getaddrinfo. Note that we might not want to do synchronous name resolution at all. Add HAVE_GETADDRINFO to the KfW win-mac.h collision list. Change-Id: If59ce8a038776eadd6cd1794ed0e2dad8bf8a22c Reviewed-on: https://code.wireshark.org/review/6958 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-02-041.99.2 → 1.99.3.Gerald Combs1-1/+1
Change-Id: Id03d0243f20b33873a92be7444b61952d0b18638 Reviewed-on: https://code.wireshark.org/review/6956 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-02-04Only set HAVE_LUA if we, er, have Lua.Jeff Morriss1-0/+3
Change-Id: Idb6f1dfa06c2b4e5d9e1f77743f13b4e0a6d8afe Reviewed-on: https://code.wireshark.org/review/6942 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2015-02-04Simplify how we find Lua and expand the places we look.Jeff Morriss1-14/+12
First, it appears some packagers actually ship a pkg-config file for Lua. Try to use it. (Unfortunately the package name varies so we have to try several package names.) If that fails, try to find Lua directly, accounting for the various naming conventions we've seen. Bug: 10475 Bug: 10572 Change-Id: I82e789c466a488dc12431cdd90c49b4c1052414a Reviewed-on: https://code.wireshark.org/review/6756 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2015-01-22Get us building with the subdir-objects automake option.Jeff Morriss1-1/+1
subdir-objects will be enabled unconditionally in automake-2.0 and automake-1.14 gives us warnings about the upcoming change. Rework I1b3c517f08d3c752ee03cb89482ee4951ceb5bf3 (and I416f2d3611fb61659b9a7f7285e5f54a354fbe7d) to give wslua/make-reg.pl the directory of the source files rather than the full path to each. In echld don't use sources in the top-level directory in libechld: it breaks distclean with subdir-objects turned on. Bug: 10648 Change-Id: I404b074f1558376064c35d8fc96aea7e3d042a76 Reviewed-on: https://code.wireshark.org/review/6697 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-01-21Link only the GUIs with SBC (if we have SBC). The other programs don'tJeff Morriss1-2/+0
(yet) use libcodec. Also, there's no need to explicitly call pkg-config to get SBC's CFLAGS and LIBS: PKG_CHECK_MODULES does that for you. Change-Id: Ia7aa84bb81b8223773661ae2dc663731acaf6c6b Reviewed-on: https://code.wireshark.org/review/6700 Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-21Also support -xarch=sse_42 in the Sun C compiler for x86(-64).Guy Harris1-2/+25
Change-Id: Ib6d0ae9c237b96568e2522d2077b311b3ac5af2e Reviewed-on: https://code.wireshark.org/review/6706 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-21Get rid of trailing blank.Guy Harris1-1/+1
Change-Id: Ia1bbd632fe00cfe6b919aacc0cd198953211fe7f Reviewed-on: https://code.wireshark.org/review/6699 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-21Handle CFLAGS disabling SSE 4.2.Guy Harris1-4/+24
When checking whether nmmintrin.h works, add -msse4.2 at the *beginning* of CFLAGS, so that user (or Gentoo build process) settings with -mno-sse4.2 override it. Bug: 10792 Change-Id: I1b77c2a092360a86bc7012d29642ff3303b60812 Reviewed-on: https://code.wireshark.org/review/6696 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-19JSON dissector changed into heuristic dissector.Dario Lombardo1-0/+1
To check if a payload is json, the library libjsmn has been added to the source tree, with its licence (MIT). TODO: the libjsmn can be used to extract tokens in the standard dissection other than heurisitic part. HPFEEDS dissector has also been changed in order to leverage the new json dissector. Bug: 10834 Change-Id: Ib1df2a699982dbdd2b5418e97edbdb5cbd9c8978 Reviewed-on: https://code.wireshark.org/review/6350 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-01-12Error out if the user requests the SBC library but it's not found.Jeff Morriss1-3/+6
Change-Id: I7c152420703d0d37c7b29d3c8f535b17180e020a Reviewed-on: https://code.wireshark.org/review/6455 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2015-01-08autotools: Add possibility to build without optional codec SBCMichal Labedzki1-4/+13
SBC is optional but build any time if configure script detect it, so let user choose if it really want it. Default to build with SBC. Bug: 10794 Change-Id: I1b936c628c9de0179aa3d5da5ac547bd910af8ba Reviewed-on: https://code.wireshark.org/review/6399 Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Tested-by: Michal Labedzki <michal.labedzki@tieto.com> Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-01-06Revert e65f581ffa86f6bfd566a9b66ca2c882f465727f, whichJoerg Mayer1-0/+4
reverts commit 89291ad4f3293893387b385a0800cad42215ddd4 Protect the new macro with "m4_ifdef" instead. Add comments to keep the old and the new flags in sync. Change-Id: I37dea1a5c8d743f5dcf4a4d9ff38ff92200271d0 Reviewed-on: https://code.wireshark.org/review/6343 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2015-01-05In CMake, check for thousands-grouping support in the GLib printf routines.Guy Harris1-1/+1
We do that with the autotools; do it with CMake as well. We could, in theory, handle thosands-grouping ourselves, on all platforms supporting ANSI C (for which read "all platforms we care about") by using localeconv()'s thousands_sep and grouping items, but that's a bit more work. Fix autotools' comment for that item while we're at it (it checks the GLib printf routines, not the system printf routines). Change-Id: I000f0f3b955d9b192ade15e3fabc46d6b48a052e Reviewed-on: https://code.wireshark.org/review/6317 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-27We require pkg-config to check for, for example, GLib.Guy Harris1-0/+3
If the check for pkg-config fails, quit immediately; don't leave the failure message for later, as the error message in question might not be as blunt. Change-Id: I530e8b62f5adff228ae8ff6f9798ac538c2ad684 Reviewed-on: https://code.wireshark.org/review/6084 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-26Use getopt_long() for the first pass through the argument list.Guy Harris1-0/+19
That way: 1) we don't have to worry about the system getopt() and our getopt_long(), on platforms that have getopt() but not getopt_long() (Solaris prior to Solaris 10, HP-UX, AIX), not working well together; 2) if necessary, we can handle long options in the first pass. Switch to using getopt_long() for the *second* pass for the GTK+ version of Wireshark. Use the documented mechanism for resetting the argument parser for the glibc version of getopt_long(); use the mostly-undocumented-but-at-least- they-documented-optreset mechanism for the *BSD version. (We should look into doing only one pass, saving away arguments that can't fully be processed in the first pass for further processing after initializing libwireshark.) Change-Id: Ide5069f1c7c66a5d04acc712551eb201080ce02f Reviewed-on: https://code.wireshark.org/review/6063 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-25Check for getopt_long(), not getopt().Guy Harris1-2/+2
We support three types of platforms: 1) UN*Xes that have both getopt() and getopt_long(); 2) UN*Xes that have getopt() but not getopt_long(); 3) Windows, which has neither. Checking for getopt_long() lets us distinguish between 1) and 2) and build getopt_long() for them. Change-Id: Iaf0f142f9bebaa2eed2128d544ec9786711def45 Reviewed-on: https://code.wireshark.org/review/6045 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-23Move popcount() to an optionally built part of wsutil for systems thatStephen Fisher1-0/+8
provide their own popcount(). Change-Id: Ic26f3b50cf0bd2b4af0d42e9c27488ebbac1ab33 Reviewed-on: https://code.wireshark.org/review/5998 Petri-Dish: Stephen Fisher <sfisher@sdf.org> Reviewed-by: Stephen Fisher <sfisher@sdf.org>
2014-12-20Use AC_SEARCH_LIBS() for math functions.Guy Harris1-8/+17
Use it to check whether we need -lm for various math functions - including floorl(). Let it handle adding -lm, rather than having that in the various _LDADD macros. Change-Id: Ic5d24ec35e060306351f4981c92e26879e597d81 Reviewed-on: https://code.wireshark.org/review/5908 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-20Handle floorl() the same way we handle other not-on-all-platforms functions.Guy Harris1-1/+8
Use AC_CHECK_FUNC() for it, define FLOORL_LO to floorl.lo if we *don't* have it, add FLOORL_LO to the list of items conditionally built in libwsutil, and include "wsutil/floor.h" only if HAVE_FLOORL is *not* defined, as that means it's *not* supplied by the platform and thus *not* declared in <math.h>. Also, use the standard export stuff in wsutil/floor.h. Change-Id: Ic24aa69f65f2d15450d8b84b0c2b0c58f38edebe Reviewed-on: https://code.wireshark.org/review/5901 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-19Add a missing line related to previous two commitsStephen Fisher1-0/+1
(I messed up my local git repo using git branches and stash/stash pops, sorry for all of the extra commits for one change) Change-Id: Ib031ae7d57ba9ea4b19fe13121643799e7563046 Reviewed-on: https://code.wireshark.org/review/5893 Reviewed-by: Stephen Fisher <sfisher@sdf.org>
2014-12-19Revert "Provide a floorl() function (which is currently only able to call ↵Stephen Fisher1-1/+0
GCC's __builtin_floorl() function) for systems which don't provide one." because I left off the new wsutil/floor.[ch] files This reverts commit e2586ec36d0d924b933d2127e809918b980cb413. Change-Id: Ie38b7f32b2d21e3beba5173eec22ca12b7f5da91 Reviewed-on: https://code.wireshark.org/review/5891 Reviewed-by: Stephen Fisher <sfisher@sdf.org>
2014-12-19Provide a floorl() function (which is currently only able to call GCC'sStephen Fisher1-0/+1
__builtin_floorl() function) for systems which don't provide one. Change-Id: Ie0140ff195f0eae525c7bd70c7c3e23039fde569 Reviewed-on: https://code.wireshark.org/review/5889 Reviewed-by: Stephen Fisher <sfisher@sdf.org>
2014-12-101.99.1 → 1.99.2.Gerald Combs1-1/+1
Change-Id: Ie2e9e81ce1b1d876ae550fc0c17c4367aaa35d98 Reviewed-on: https://code.wireshark.org/review/5705 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-12-05Look for python3 in addition to python in configure script.Stephen Fisher1-1/+1
Change-Id: I77ff22aabdbbbf7376483b53d8795e7fbf0c0433 Reviewed-on: https://code.wireshark.org/review/5627 Reviewed-by: Stephen Fisher <sfisher@sdf.org>
2014-12-04Don't do the desktop integration stuff if we're not building Wireshark.Guy Harris1-0/+1
Wireshark is the desktop app; if we're not building it (i.e., we're only building the command-line TShark), we don't need any desktop files. Change-Id: Id8244b417fd53c9d55b4d77fe3ad748c98868ad7 Reviewed-on: https://code.wireshark.org/review/5615 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-04Don't do all the fd.o desktop integration stuff on OS X.Guy Harris1-0/+8
It doesn't need it, so don't install those files, or uninstall them, or suggest running various unnecessary commands after the installation finishes. Change-Id: Ieecab22884723670f47f2fc7cc1ac827f48c1967 Reviewed-on: https://code.wireshark.org/review/5614 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-11-16Add unused-const-variable (enable by default on new clang release)Alexis La Goutte1-1/+1
Change-Id: I1d882e02188ba38ec1b5583c5933d0c92f0539e4 Reviewed-on: https://code.wireshark.org/review/5068 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Balint Reczey <balint@balintreczey.hu>
2014-11-05Allow the environment variable RCC to set before running configure toStephen Fisher1-0/+26
allow for unusual paths for Qt's rcc program (FreeBSD ports puts it in /usr/local/lib/qt5/bin). This matches the existing functionality of the MOC and UIC variables/programs. Change-Id: I885d61bce54d9e893e0c2fc496a9ff767a096ae6 Reviewed-on: https://code.wireshark.org/review/5139 Petri-Dish: Stephen Fisher <stephenfisher@centurylink.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stephen Fisher <stephenfisher@centurylink.net>
2014-11-04Revert "Follow a suggestion from libtoolize:"Guy Harris1-2/+0
Sadly, older versions of autoconf - such as the ones on the OS X buildbots - don't know about AC_CONFIG_MACRO_DIRS. This reverts commit 89291ad4f3293893387b385a0800cad42215ddd4. Change-Id: Ie4fa71062886f58c7f6014f6b7969921f0b824ae Reviewed-on: https://code.wireshark.org/review/5116 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-11-04Follow a suggestion from libtoolize:Stephen Fisher1-0/+2
libtoolize: Consider adding 'AC_CONFIG_MACRO_DIRS([./aclocal-fallback])' to configure.ac This is explained in the libtool manual: "In the future other Autotools will automatically check the contents of AC_CONFIG_MACRO_DIRS, but at the moment it is more portable to add the macro directory to ACLOCAL_AMFLAGS in Makefile.am, which is where the tools currently look. If libtoolize doesn't see AC_CONFIG_MACRO_DIRS, it too will honour the first -I argument in ACLOCAL_AMFLAGS when choosing a directory to store libtool configuration macros in. It is perfectly sensible to use both AC_CONFIG_MACRO_DIRS and ACLOCAL_AMFLAGS, as long as they are kept in synchronisation." Change-Id: Ic203b0b5104ea3423cf8c0042b2278e82bcea332 Reviewed-on: https://code.wireshark.org/review/5113 Reviewed-by: Stephen Fisher <stephenfisher@centurylink.net>
2014-10-31For OS X, don't rigidly tie the SDK version to the minimum target version.Guy Harris1-7/+60
According to https://developer.apple.com/library/mac/documentation/DeveloperTools/Conceptual/cross_development/Configuring/configuring.html#//apple_ref/doc/uid/10000163i-CH1-SW1 the deployment target (minimum target OS version) and SDK version aren't necessarily the same and, in fact, Apple typically only ship two SDKs with each Xcode release, so if you want to build for 10.6 with the 10.6 SDK, you have to use a version of Xcode sufficiently old to have the 10.6 SDK. Here, we instead search for the oldest SDK for an OS whose version is greater than or equal to the deployment target. Note that this may not work for X11-based Wireshark, as the X11 libraries can change incompatibly between releases. (Fortunately, our plan is to kick X11-based Wireshark to the curb for OS X, removing a large pile of aggravation for users.) This also requires some fixes when building Qt and gdk-pixbuf, as some cases where we were using the minimum OS target version we needed to be using the SDK version. For CMake, we're using its native "deployment target" support for OS X, and hope that it will somehow do the right thing. Change-Id: Ie8f42c5e4719e7ebdc56b9ba5a330665bee06280 Reviewed-on: https://code.wireshark.org/review/5031 Reviewed-by: Guy Harris <guy@alum.mit.edu>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-23 18:41:31 +0000