summaryrefslogtreecommitdiff
path: root/configure.ac
AgeCommit message (Collapse)AuthorFilesLines
2013-08-21Arrange that "make distcheck" use the GUI configure flags used toGuy Harris1-1/+5
configure Wireshark, so we don't, for example, do "make distcheck" with no options, and thus default to GTK+ 3, on a system without GTK+ 3 where Wireshark was configured with --with-gtk2. (This also means that if we're configuring only with Qt, or with GTK+ *and* Qt, "make distcheck" will check with those.) svn path=/trunk/; revision=51456
2013-08-13Add in more comments on the whole "get the path of the executable fromGuy Harris1-0/+9
the kernel" thing, and add the NetBSD and DragonFly BSD /proc links (if they don't mount /proc, that doesn't work, but it doesn't get in the way). On Solaris, check for getexecname, just in case somebody tries to build on an old Solaris that doesn't support it (that could well end up being the least of their problems, but at least they won't ask us to diagnose that one). svn path=/trunk/; revision=51343
2013-08-12If we're looking for some version of GTK+, and don't find it, fail. Guy Harris1-4/+6
That way, if somebody specifies --with-gtk[23] and that version of GTK+ isn't found, we fail with an indication that the version of GTK+ they asked for isn't there, and if no GUI toolkit was specified, and they didn't explicitly say "don't build Wireshark", we look for GTK+ 3 and, if it's not found, let the user know explicitly. svn path=/trunk/; revision=51323
2013-08-12Just check whether dladdr() is available; we check in the code whetherGuy Harris1-9/+20
it succeeds, so there's no point in checking whether it succeeds in a sample program. svn path=/trunk/; revision=51322
2013-08-12On some platforms, to get dladdr() you need to link with -ldl. FirstGuy Harris1-24/+7
try it without -ldl (in case the OS doesn't have it - not a good idea, as it complicates the build process for cross-platform tools that might require it on other platforms, but "not a good idea" never stopped UN*X vendors in the past) and, if that fails, try it with -ldl. svn path=/trunk/; revision=51309
2013-08-08From Mathias Guettler:Anders Broman1-0/+3
New dissector for Air/Ground Datalink ICAO doc 9705 Ed2: ULCS, CM, CPDLC. Add the files to the distribution. svn path=/trunk/; revision=51212
2013-08-05Fix the Python version check. Hopefully no one is running 1.5 or 1.6.Gerald Combs1-3/+3
svn path=/trunk/; revision=51161
2013-08-05Don't force the use of Python 2.x, similar (but not identical to)Gerald Combs1-14/+7
r51128. Print a warning if we're building with Python < 2.5. svn path=/trunk/; revision=51158
2013-07-31Check the Python major version number in a way that works in Python 2Guy Harris1-1/+1
and Python 3. svn path=/trunk/; revision=51077
2013-07-31Get rid of extra comment line.Guy Harris1-1/+0
svn path=/trunk/; revision=51075
2013-07-31Only use sw_vers if we're on OS X.Guy Harris1-6/+16
svn path=/trunk/; revision=51074
2013-07-31Set the minimum OS X version in the installer package based on theGuy Harris1-0/+17
deployment target; if --disable-osx-deploy-target was specified, set it to the OS version on which we're building - minor/dot-dot version and all - as there's no guarantee that it'll work on *any* version earlier than that. svn path=/trunk/; revision=51060
2013-07-31If you use --enable-osx-deploy-target or --disable-osx-deploy-target onGuy Harris1-100/+147
anything other than OS X, fail; whatever it is you're trying to do won't work (unless and until there exists a platform that fully supports cross-development for OS X, *including* building against SDKs and building with -mmacosx-version-min). If you use neither on OS X, default to the OS major version on which you're building. If you use --disable-osx-deploy-target, don't build against an SDK and don't use -mmacosx-version-min. svn path=/trunk/; revision=51057
2013-07-24The files in aclocal-fallback are copies of .m4 files from variousGuy Harris1-1/+1
packages, providing macros that we use in our configure script in case somebody building from SVN doesn't happen to have the package installed and thus doesn't happen to have those macros defined. In the case of Qt, there *isn't* such a .m4 file, so we had to create the macro. Move it to acinclude.m4, and rename it to AC_WIRESHARK_QT_CHECK to indicate that it's our own check. svn path=/trunk/; revision=50881
2013-07-24Add a comment.Guy Harris1-0/+4
svn path=/trunk/; revision=50879
2013-07-24If none of --with-gtk2, --with-gtk3, or --with-qt are specified, andGuy Harris1-13/+30
--disable-wireshark was not specified, build with GTK+ 3. If any of --with-gtk2 or --with-qt are specified, and --with-gtk3 wasn't specified, *don't* look for GTK+ 3 and don't build with it. If *both* --with-gtk2 and --with-gtk3, fail. svn path=/trunk/; revision=50872
2013-07-24Change default gtk build from version 2 to version 3 forJörg Mayer1-2/+2
autotool, cmake and nmake. No idea what it takes to change the visual project stuff svn path=/trunk/; revision=50863
2013-07-16set HAVE_GETOPT_H and HAVE_GETOPT variablesMartin Kaiser1-1/+1
for both autotools and cmake builds (in order to use getopt_long(), we have to check if we can include getopt.h) svn path=/trunk/; revision=50680
2013-07-15Revert r50150. I suspect the problem was Ubuntu's transition to qt5 as default,Evan Huus1-4/+4
since now the defaults work as they should. svn path=/trunk/; revision=50644
2013-07-13On OS X, set the rpath for executables to includeGuy Harris1-2/+9
@executable_path/../lib as well as /usr/local/lib, so we can use @rpath in the install names in the executables and libraries in the application bundle. Have the osx-app.sh script tweak all references to libraries from /usr/local/lib in all executables, libraries, and plugins in the app bundle to use @rpath. (The "all" is important; it fixes the GTK+ crash mentioned in the comment in osx-app.sh. The notion of doing all of them came from the osx-app.sh script in a newer version of Inkscape.) This renders the setting of DYLD_LIBRARY_PATH in the wrapper scripts in the bundle unnecessary; remove it. (Ideally, we should try to get rid of the wrapper scripts entirely, but that might have to wait for us to switch to using Qt.) svn path=/trunk/; revision=50560
2013-07-09CPPFLAGS contains the flags for the C preprocessor; CXXFLAGS containsGuy Harris1-1/+16
the flags for the C++ compiler. If we're building for 10.5, force a 32-bit build. svn path=/trunk/; revision=50459
2013-07-07Clean up comments.Guy Harris1-10/+8
svn path=/trunk/; revision=50440
2013-07-06Check for an OS X deployment target early, so that as manyGuy Harris1-90/+105
tests using the compiler are done using the flags that we'll be using when building. Add a -mmacosx-version-min flag to CFLAGS/CPPFLAGS/LDFLAGS so that the compiler tests use them. This may, or may not, obviate the need to set MACOSX_DEPLOYMENT_TARGET in OSX_DEPLOY_TARGET. svn path=/trunk/; revision=50426
2013-07-06Add a --enable-osx-deploy-target option to set the deployment targetGuy Harris1-0/+98
when building for OS X; that causes the MACOSX_DEPLOYMENT_TARGET environment variable to be set when building (so that, for example, we don't use linker features available on the version on which we're building but not on the minimum OS version for which we're building), and causes the SDK for that version to be used (so that, for example, we don't link with libraries with later version numbers than the ones provided with the OS version for which we're building). svn path=/trunk/; revision=50410
2013-06-28Rename AC_WIRESHARK_GCC_CFLAGS_CHECK toGuy Harris1-40/+40
AC_WIRESHARK_COMPILER_FLAGS_CHECK, because it doesn't just affect CFLAGS and it doesn't just affect the flags for GCC. svn path=/trunk/; revision=50222
2013-06-28Do the "is $CXX actually a C++ compiler" test as early as possible, soGuy Harris1-26/+39
that it doesn't fail due to the C++ compiler not supporting -W options that the C compiler does. (We should fix that, too, by having separate checks for whether the C and C++ compilers support particular options.) svn path=/trunk/; revision=50215
2013-06-28Standard C++ header files don't have .h in their name: #include <iostream>Jeff Morriss1-3/+3
rather than #include <iostream.h>. Also reference cout as std::cout in the test program. svn path=/trunk/; revision=50206
2013-06-28AC_LANG_PROGRAM's second argument is put inside "int main(){"/"}" by theGuy Harris1-4/+0
macro, and mustn't include that itself. svn path=/trunk/; revision=50205
2013-06-28AC_PROG_CXX doesn't actually check whether what it finds is a real liveGuy Harris1-4/+27
C++ compiler (it might not be one on, for example, OS X, due to "cc" being a C compiler, "CC" referring to "cc" due to the case-insensitivity of the default OS X file system, and "CC" being one of the names checked for in AC_PROG_CXX), so if we really need a C++ compiler, test it with a program that a C compiler won't compile. svn path=/trunk/; revision=50204
2013-06-27Suppress "Of *COURSE* you're developing a Mac-only application - you'reGuy Harris1-1/+13
on a Mac, right? So of *COURSE* you want to use our shiny new frameworks rather than those ugly old open-source multi-platform libraries, right?" warnings. svn path=/trunk/; revision=50200
2013-06-27For now, don't turn on -Wcast-align by default. There are at least someGuy Harris1-1/+5
bugs it points out that probably mean the code won't work on machines that require alignment (e.g., SPARC machines), but we'll turn it on once we fix them. (clang is fussier than GCC about this.) svn path=/trunk/; revision=50187
2013-06-27Don't assume that compilers not named "clang" will, by default, reportGuy Harris1-8/+2
an error, or not issue warnings, by default if you give them an unknown -f flag. Instead, test that flag with all compilers, and use -Werror to force it to error out. As with C/C++ flags, so with C++-only flags. svn path=/trunk/; revision=50178
2013-06-26Don't assume that compilers that need an extra option to report errors,Guy Harris1-0/+6
rather than just warnings, for unknown warning options are named "clang"; they might not be. svn path=/trunk/; revision=50177
2013-06-26echld is not an optional package, it's an optional Wireshark feature: useJeff Morriss1-11/+6
--enable-echld rather than --with-echld to control whether it is built. svn path=/trunk/; revision=50168
2013-06-26If the user enables gtk3, (silently) disable gtk2 rather than forcing the userJeff Morriss1-16/+20
to also specify --without-gtk2 or complaining that they have specified both. svn path=/trunk/; revision=50167
2013-06-26Nothing uses the HAVE_GTK #define, so get rid of it. (Keep theGuy Harris1-5/+0
Makefile.am conditional, however.) svn path=/trunk/; revision=50162
2013-06-25Last changes to autofoo, rename the files as they live now in their own dir...Luis Ontanon1-0/+3
svn path=/trunk/; revision=50152
2013-06-25Look for moc-qt4 before moc and uic-qt4 before uic, because (at least on myEvan Huus1-4/+4
machine, with both qt4 and qt5 development tools installed), moc and uic are the qt5 versions, but the rest of the configuration process grabs qt4 headers and link paths, leading to a lot of weird errors. svn path=/trunk/; revision=50150
2013-06-25Of course I forgot to test the normal/default case (where no --with argumentsJeff Morriss1-1/+1
are given)... Actually default --with-gtk2 to "yes". svn path=/trunk/; revision=50149
2013-06-25Allow the Gtk+ and Qt versions to be built simultaneously (with autotools).Jeff Morriss1-106/+112
./configure now accepts: --with-gtk2 : enabled by default; exclusive of --with-gtk3 --with-gtk3 : disabled by default; exclusive of --with-gtk2 --with-qt : disabled by default, can be specified with gtk --enable-wireshark : controls whether *any* GUI is built If Qt is enabled then a new program is created: "wireshark-qt". "wireshark" remains the Gtk+ version. svn path=/trunk/; revision=50147
2013-06-25This should get cmake to ignore echld...Luis Ontanon1-0/+28
svn path=/trunk/; revision=50141
2013-06-25Revert --with-echld until I find out how to get it to work with Cmake...Luis Ontanon1-28/+0
: svn path=/trunk/; revision=50138
2013-06-25--with-echldLuis Ontanon1-0/+28
svn path=/trunk/; revision=50137
2013-05-20Make the minimum supported GLib version 2.16.Gerald Combs1-1/+1
svn path=/trunk/; revision=49444
2013-05-12HTML_VIEWER isn't used in the build process, it's run by Wireshark.Guy Harris1-0/+4
svn path=/trunk/; revision=49257
2013-05-11Add some comments describing what programs are being checked for.Guy Harris1-4/+8
Move DESKTOP_FILE_INSTALL into the group of programs used for packaging; it's used when you install a source package. (It's not used to *build* a source package, but....) svn path=/trunk/; revision=49256
2013-05-11Don't just look for python2. Instead, first look for python, and thenGuy Harris1-9/+31
see whether it's Python 2 or not; if it's not, *then* look for Python 2. That way, you can use Python on systems where python is Python 2 and python2 doesn't exist. Move the check for Python up after the check for Perl. (All the program checks arguably belong together.) AC_PATH_PROG() does AC_SUBST() for you; don't do it ourselves. svn path=/trunk/; revision=49253
2013-05-09From Jeroen RooversMartin Kaiser1-0/+10
call PKG_PROG_PKG_CONFIG explicitly in configure.ac AC_REQUIRE(PKG_PROG_PKG_CONFIG) may be expanded only under an if statement that's not true and thus PKG_PROG_PKG_CONFIG will never be called. ./configure --without-gnutls --with-libnl demonstrates the problem https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8634 svn path=/trunk/; revision=49215
2013-05-02Add a link to the Survey of Commonly Available C System Header Files. ItGerald Combs1-0/+1
looks like we might be able to get rid of a few header checks. svn path=/trunk/; revision=49139
2013-05-02As suggested by Evan:Jeff Morriss1-3/+9
Point users to https://code.google.com/p/pyreshark/ as an alternative to the current Python support. While we're in there, make it harder to enable Python: change it from "--with-python" to "--with-broken-python" just to prevent people from enabling unless they really mean it (are going to work on fixing it). svn path=/trunk/; revision=49138
generated by cgit v1.2.1 (git 2.18.0) at 2024-06-27 20:54:16 +0000