aboutsummaryrefslogtreecommitdiffstats
path: root/cmake
AgeCommit message (Collapse)AuthorFilesLines
2014-12-16Add Wireshark_LIBRARY variableMaarten Bezemer2-0/+13
This variable can be used to obtain the wireshark library(ies) (from the correct location). Change-Id: I90cd5b098eb746ac573a2c611113287b06c3b82b Reviewed-on: https://code.wireshark.org/review/5251 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-16Add cmake helper files for finding wiresharkMaarten Bezemer3-0/+47
These files make it possible to use the cmake command find_package(Wirehark) to obtain information about the wireshark installation. Change-Id: I5af7c4e7b53b99cd473e04905a92bac267cd9b83 Reviewed-on: https://code.wireshark.org/review/5235 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>
2014-12-11CMake: Make it easier to generate the release notes & NEWS.Gerald Combs1-7/+14
Add convenience targets for generating the release notes and the NEWS file. Make sure we don't run multiple instances of a2x + AsciiDoc at the same time. Add the docbook directory to the build by default unless we're running Windows. Explain why we don't yet build docs on Windows. Make each docbook makefile target optional. Split the ENABLE_GUIDES option into ENABLE_HTML_GUIDES and ENABLE_PDF_GUIDES. Add a default "all_guides" target if either is on. Remove the Debian patch that hacked around the PDF requirement. Copy ws.css to the docbook build directory. Don't build PDF release notes. I'm not sure we ever used them and I don't want to install Java and FOP just to make a release. Change-Id: Ia2f710000c17f9e0b4b514fd373d9a5902889553 Reviewed-on: https://code.wireshark.org/review/5712 Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-12-04CMake: Don't cache LUA_LIBRARIES.Gerald Combs1-1/+1
Don't cache the LUA_LIBRARIES variable. This matches the behavior of the other library modules and fixes a compilation problem on my machine where /usr/local/lib/liblua.dylib wasn't showing up in the various build.make and link.txt files. Change-Id: Ib75ef303f2e67b266a246621718d0ea2ab885dca Reviewed-on: https://code.wireshark.org/review/5603 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-11-17cmake:Joerg Mayer1-0/+3
Avoide rebuilding the guides each and every time. Don't print the single file guides to stdout. Change-Id: Ie94fc4b24676e9abc7258c4ea1c7fd3049a96fb6 Reviewed-on: https://code.wireshark.org/review/5367 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-11-11Fix a problem that causes build failures with CMake on Yosemite.Guy Harris1-0/+20
Change-Id: I52e81656470df887eb3c53b2632bf5a310b1b063 Reviewed-on: https://code.wireshark.org/review/5229 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-20CMake: Use WIRESHARK_LIB_DIR. Fix GThread check on Windows.Gerald Combs2-7/+17
Have FindWSWinLibs check for WIRESHARK_LIB_DIR before WIRESHARK_BASE_DIR to match the behavior of config.nmake and the Windows buildbots, which set the former but not the latter. It looks like the latest GLib DLL contains GThread. Adjust FindGTHREAD2.cmake accordingly. Change-Id: I0232b1819eca9ba2c39ae6834daddf65af979d7d Reviewed-on: https://code.wireshark.org/review/4887 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-01cmake: update FindGTK2 to v3.0.1-1824-g0b12815Peter Wu1-146/+452
Current FindGTK2.cmake as included with Wireshark cannot do a 32-bit build even after setting CMAKE_LIBRARY_PATH=/usr/lib32. After an update to upstream FindGTK2 (v3.0.1-1824-g0b12815), things build again. Compared to upstream FindGTK2, FindWSWinLibs and related hints have been added (note that "${GTK2_HINTS}/lib" is not a typo, it is needed as some headers are includes in locations like lib/gtk-2.0/include/). The include paths have become relative again as there are no files like FindPackageHandleStandardArgs in the Wireshark source tree. Diff between upstream FindGTK2 and the version in this patch: diff --git a/cmake/modules/FindGTK2.cmake b/cmake/modules/FindGTK2.cmake index 72bb8eb..9b4f989 100644 --- a/cmake/modules/FindGTK2.cmake +++ b/cmake/modules/FindGTK2.cmake @@ -167,2 +167,5 @@ +include( FindWSWinLibs ) +FindWSWinLibs( "gtk2" "GTK2_HINTS" ) + #============================================================= @@ -176,4 +179,4 @@ -include(${CMAKE_CURRENT_LIST_DIR}/SelectLibraryConfigurations.cmake) -include(${CMAKE_CURRENT_LIST_DIR}/CMakeParseArguments.cmake) +include(SelectLibraryConfigurations) +include(CMakeParseArguments) @@ -289,2 +292,5 @@ function(_GTK2_FIND_INCLUDE_DIR _var _hdr) ${_suffixes} + HINTS + "${GTK2_HINTS}/include" + "${GTK2_HINTS}/lib" ) @@ -395,2 +401,4 @@ function(_GTK2_FIND_LIBRARY _var _lib _expand_vc _append_version) [HKEY_LOCAL_MACHINE\\SOFTWARE\\gtkmm\\2.4;Path]/lib + HINTS + "${GTK2_HINTS}/lib" ) @@ -409,2 +417,4 @@ function(_GTK2_FIND_LIBRARY _var _lib _expand_vc _append_version) [HKEY_LOCAL_MACHINE\\SOFTWARE\\gtkmm\\2.4;Path]/lib + HINTS + "${GTK2_HINTS}/lib" ) @@ -829,3 +839,3 @@ set(_GTK2_did_we_find_everything true) # This gets set to GTK2_FOUND -include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +include(FindPackageHandleStandardArgs) Change-Id: I02103409a79ea30d1bf7cc0dfb43a9e41f8a4db3 Reviewed-on: https://code.wireshark.org/review/4293 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-01cmake: use pkg-config for resolving dependenciesPeter Wu9-25/+106
Changes: * Fix glib2 search path. * Add pkg-config support to CAP, GEOIP, GNUTLS, LUA, PortAudio (API 19), zlib, kerberos. * Add pkg-config support to libnl3, libnl2 and libnl1 (but tested only with libnl3). This makes it easier to do 32-bit builds on 64-bit hosts by just setting `PKG_CONFIG_LIBDIR`. Due to how HINTS work, it is still fragile though: missing 32-bit libraries will cause a fallback to 64-bit libraries. A future patch could check for `<PREFIX>_FOUND` and remove the manual `find_path` and `find_library` hackery since the paths are already known. Change-Id: Ieb4fb74695c96afb1a4c70168e84abb1fa4612c6 Reviewed-on: https://code.wireshark.org/review/4292 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-28Add support for getting nanosecond time stamp resolution when capturing.Guy Harris1-0/+1
If we have pcap_set_tstamp_precision(), use it to request nanosecond time stamp resolution *if* we're writing a pcap-ng file; any code that reads those files and can't handle nanosecond time stamp resolution is broken and needs to be fixed. If we're writing a pcap file, don't ask for nanosecond resolution time stamps, as that requires a different magic number for pcap files, and not all code that reads pcap files can handle that. (Unlike pcap-ng, where the ability to have non-microsecond time stamp resolution was present from Day One, it's a relatively recent addition to pcap.) We could add a command-line option/GUI option for that, like the option recent versions of tcpdump have, if it matters. Change-Id: I8fa464eb929feecb9a70be70712502c9f0cc5270 Reviewed-on: https://code.wireshark.org/review/4355 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-09-18Having CmakeListsCustom.txt in git defeats the purpose of its existence:Joerg Mayer1-0/+20
If it is used, there is a modified file in git. Fix this by only including the file if it exists. Other changes: - Rename the existing Custom files to CMakeListsCustom.txt.example. - Move the plugins custom file to the top level (same level as its including parent). - Optionally allow a list of custom includes instead of the default one. Change-Id: I8960eac6222f741c045055d43d1d5a2d4979caf6 Reviewed-on: https://code.wireshark.org/review/4163 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-08-25As long as NEWS is still part of the git tree: At least don't differJoerg Mayer1-1/+1
because of different timezones. Change-Id: I93809447db29c2cc5f848edb438ee16372b57453 Reviewed-on: https://code.wireshark.org/review/3824 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-08-24Convert admon graphics to SVG.Gerald Combs1-6/+5
Use a common set of SVG files for AsciiDoc / DocBook admonition graphics. Put them in a common directory. According to http://caniuse.com/svg all common browsers have had SVG support for a while now. The graphics themselves were created with Inkscape. If you would like to refine them further you are more than welcome. Use variables to assemble xsltproc commands in Autotools and Nmake while we're here. Try to update Debian rules to reflect ga92c3fb. Change-Id: If82647af27a60117c517125dff0aca81c033be72 Reviewed-on: https://code.wireshark.org/review/3206 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-08-24CMake: More a2x / asciidoc fixes.Gerald Combs2-34/+50
Create graphics directories and copy files into them similar to Autotools and Nmake. Adjust some xsltproc arguments. Fix the --asciidoc-opts flag. Note: Admon graphics are broken pending change 3206. Change-Id: I94d498de36150a7cb4ffd080581523300b222bd4 Reviewed-on: https://code.wireshark.org/review/3805 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-08-23WSUG: Convert the "User Interface" chapter to AsciiDoc.Gerald Combs2-41/+74
Add the "asciidoc.conf" compatibility configuration file from Asciidoctor. Although we don't use Asciidoctor it gives us macros that keep us from losing some useful DocBook elements. Update various CMake files to support multiple AsciiDoc configuration files. Leave most of the content intact for now. Hopefully the other chapters aren't as laden with markup. Change-Id: Id69757342b86abb2b3130cb61e90f5695a26ea8a Reviewed-on: https://code.wireshark.org/review/3680 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-08-22Add WinSparkle to the CMake build to bring it into line withGraham Bloice1-0/+35
the nmake build Change-Id: I944d0fe15b396cad4d0054b6fc359acb42ae3c9c Reviewed-on: https://code.wireshark.org/review/3755 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2014-08-22Move generating HAVE_AIRPCAP to main CMakeLists.txt as is done withJoerg Mayer1-2/+0
other liberaries. Also: After set( variable 0 ) the variable is defined. Change-Id: Id26a771875b7643c19f173ce77bb29a4059a1bd0 Reviewed-on: https://code.wireshark.org/review/3793 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-08-21Fix CMake checks of PCap functions, along with AirPCapGraham Bloice2-2/+5
Change-Id: If55498167d5e357258841f2194962749c0dfc81e Reviewed-on: https://code.wireshark.org/review/3787 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Reviewed-by: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-08-12Remove a bogus make-dissector-reg dependency from UseMakeDissectorReg.cmakeРоман Донченко1-1/+0
The shell script is not used in the CMake build system. Change-Id: I97d3d750f2521c626594200da8fc9a4453414576 Reviewed-on: https://code.wireshark.org/review/3530 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-07Win flex-bison and Chocolatey updates.Gerald Combs3-25/+12
Chocolatey's latest winflexbison package is usable. Update config.nmake, FindLEX.cmake, and FindYACC.cmake accordingly. Rename CHOCOLATEY_INSTALL_PATH to CHOCOLATEY_BIN_PATH since that's what we're finding. Change-Id: I39973fba0531b3f7a1315ca010a8bd70581db3fb Reviewed-on: https://code.wireshark.org/review/3479 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-08-01Fix comparison.Gerald Combs1-1/+1
Change-Id: If2af35c8a49f405bee70eb144e26e539a7dc61f2 Reviewed-on: https://code.wireshark.org/review/3335 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-08-01Fix the CMake WinPcap library path check.Gerald Combs1-1/+7
Look for wpcap.lib in WpdPack/Lib/x64 when our target platform is Win64. Change-Id: I9a1bac22106bcb6a1f155ce83c02e344e6ec0d55 Reviewed-on: https://code.wireshark.org/review/3331 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-07-30Add libgpg-error6-0 to the GCRYPT_ERROR_LIBRARY search list.Gerald Combs1-1/+1
(Does FIND_LIBRARY support wildcards?) Change-Id: I240e93070091e445446478b082ad284267c977a6 Reviewed-on: https://code.wireshark.org/review/3272 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-07-30Fix cmake build for portaudio V18Peter Wu1-1/+17
Note that the cache file (CMakeCache.txt) must be cleared when the include or library paths change, otherwise the cached result of CHECK_FUNCTION_EXISTS will be re-used. Change-Id: Ia18ed4f1b6b162499aeae6e66f612a4945390c2a Reviewed-on: https://code.wireshark.org/review/3245 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-07-12Remove some $Id$ linesJoerg Mayer1-2/+0
Change-Id: Idec3769750f5a433b184e6e9fb44cbad23a29c60 Reviewed-on: https://code.wireshark.org/review/3023 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-07-10Fix a small typo in the FindChocolatey.cmake moduleGraham Bloice1-1/+1
Change-Id: Idefea86a9f65f59432db4bf32b9f702298409cdb Reviewed-on: https://code.wireshark.org/review/2980 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2014-07-09Cmake : (Find XLST Proc) fix indent (use 4spaces)Alexis La Goutte1-47/+47
Change-Id: Ic8abdc9aaae899dcc5d870bc023c52dc7a2bbfe6 Reviewed-on: https://code.wireshark.org/review/2952 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-24Fix OS X CMake build.Guy Harris1-0/+21
I have ***NO*** idea why this makes a difference, but, without this change, APPLE_CORE_FOUNDATION_LIBRARY is apparently *not* set correctly for wsutil/CMakeLists.txt, and, with this change, it is. I guess there's something magic involved here with "global" CMake variables or something crazy such as that. Change-Id: I7a0046b9c249568cd666720838104f48e854e203 Reviewed-on: https://code.wireshark.org/review/2612 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-18Another message from Clang for unknown -f and -m flags.Guy Harris1-0/+1
For -f and -m flags that don't apply to the target architecture(?), Clang doesn't fail but does print a warning "argument unused during compilation: '-{flag}'". Catch that and treat it as a failure indication, so we don't use that flag. Change-Id: I65948ada41fa44fb62f9a2b8b320f137a5902b8f Reviewed-on: https://code.wireshark.org/review/2399 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-18Don't put c-comments into cmake files. Won't work at midnight either.Joerg Mayer1-2/+2
Change-Id: I80efce78a044f477af56f82cc9d8e85c8544ffbc Reviewed-on: https://code.wireshark.org/review/2372 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-18Fix building uiqt on Windows with the cmake build system:Joerg Mayer1-1/+5
Protecting HAVE_PCAP_CREATE was not enough for the moc run in qt, maybe it doesn't have _WIN32 set? Don't even try to detect this function on WIN32 for now. Change-Id: I0d8a8b5b110cec164f86fe11f26a7add558eee1b Reviewed-on: https://code.wireshark.org/review/2370 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-17It's so simple: If we require a package but provide alternative methodsJoerg Mayer2-15/+10
of finding the package don't allow the first method to fail terminally. Todo: Fix this in all other places as well. Change-Id: I5a343fac33f6a5d6e50ff353d739459b2e36711a Reviewed-on: https://code.wireshark.org/review/2300 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-16Undo Graham's change to find the "correct" fixJoerg Mayer1-6/+6
Change-Id: Ifc368687da972231298ab5935d071a84edd3e56e Reviewed-on: https://code.wireshark.org/review/2261 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-16Undo Graham's change to move find-package down.Joerg Mayer1-10/+15
Fix detection of Homebrew on APPLE Change-Id: I96506bb57d4772c5c90b1117c37e8350cda376ee Reviewed-on: https://code.wireshark.org/review/2257 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-16Detecting gmodule2 on Homebrew almost worked... it behaves more likeJoerg Mayer1-4/+9
non-apple platforms Change-Id: I1acf8d05c918121fe1a76c8fbd3ac119f624ee8b Reviewed-on: https://code.wireshark.org/review/2256 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-08Update CMake build for win32 to build QT again, and to findGraham Bloice3-16/+25
GLib and GThread libs Change-Id: If7e8ebc46f42389d174959303e13cde20687ae8a Reviewed-on: https://code.wireshark.org/review/2010 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Graham Bloice <graham.bloice@trihedral.com> Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-06Upgrade Windows builds to GnuTLS 3.1.22 and Gcrypt 1.6.0Pascal Quantin2-4/+4
Change-Id: I7650a3ec31120ac5e7954f4c1ca985ad55d189b4 Reviewed-on: https://code.wireshark.org/review/1978 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-06-04Fix message about detection of asciidoc package (would always reportJoerg Mayer1-2/+2
not found before). Change-Id: Iaac974e5db3e605e0b9f7256d2724ae777eaebc3 Reviewed-on: https://code.wireshark.org/review/1963 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-05-30cmake: Not all system have HtmlViewerMichal Labedzki1-0/+5
Not all system have HtmlViewer, but we support that case by inform user about file/website, so we "have" HtmlViewer. Change-Id: I46e16a86b5c7f9dd47e1d1ded9d10fd4f565660f Reviewed-on: https://code.wireshark.org/review/1875 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-05-27CMake: Remove FeatureSummary.cmake and fix display of featureAlexis La Goutte1-78/+0
Bug:8819 Change-Id: I35778a4ce198245fbe86eaded2b733745ff8e934 Reviewed-on: https://code.wireshark.org/review/1728 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-03-31Continue to remove $Id$ from top of fileAlexis La Goutte43-86/+0
(Using sed : sed -i '/^\# \$Id\$/,+1 d') (start with dash) Change-Id: Ia4b5a6c2302f6a531f6a86c1ec3a2f8205c8c2dd Reviewed-on: https://code.wireshark.org/review/881 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-31Continue to remove $Id$ from top of fileAlexis La Goutte1-2/+0
(Using sed : sed -i '/^\$Id\$/,+1 d') (No space or star before $Id$) Change-Id: I0801bd7cf234d32487008a8b6dcee64875b07688 Reviewed-on: https://code.wireshark.org/review/876 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-03-16Fix GTK3 detection (or more specific: the include paths) on WindowsJoerg Mayer1-2/+2
Change-Id: Ia0aef096849d1935ca4a6d1d31aabd099087cf29 Reviewed-on: https://code.wireshark.org/review/694 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-03-04Remove all $Id$ from top of fileAlexis La Goutte3-6/+0
(Using sed : sed -i '/^ \* \$Id\$/,+1 d') Fix manually some typo (in export_object_dicom.c and crc16-plain.c) Change-Id: I4c1ae68d1c4afeace8cb195b53c715cf9e1227a8 Reviewed-on: https://code.wireshark.org/review/497 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-02-17Add Bluetooth SBC Codec support in cmakeMichal Labedzki1-0/+35
SBC Codec can be optionally linked with Wireshark to provide ability to playing RTP/SBC stream by RTP Player. Change-Id: Iffbae16a741ffbfd0fb55a300064739d2c27c2e5 Reviewed-on: https://code.wireshark.org/review/223 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Evan Huus <eapache@gmail.com>
2014-02-11Finish converting the Developer's Guide to AsciiDoc.Gerald Combs1-3/+6
Add developer-guide-docinfo.xml, which lets us carry over DocBook front matter. Remove the meta_info chapter. Most of its contents are now in developer-guide-docinfo.xml. Add a DocBook revision history based on hints from the Git/SVN/CVS revision history. Comment out or note makefile content that's no longer necessary for converting the Developer's Guide but will be useful for converting the User's Guide. Fix building the release notes with CMake. Other minor changes. Tested with Autotools, nmake, and CMake. Change-Id: Ib6d50c821ca906fff50a84ad4d6af3212ebdff0a Reviewed-on: https://code.wireshark.org/review/155 Reviewed-by: Gerald Combs <gerald@wireshark.org> Tested-by: Gerald Combs <gerald@wireshark.org>
2014-01-25Try to get CMake to build the Developer Guide again. I don't haveGerald Combs1-40/+0
dblatex installed so the release notes fail to build but the WSDG targets appear to work. svn path=/trunk/; revision=54952
2014-01-24Prepare for conversion of Guide chapters to AsciiDoc.Gerald Combs1-0/+39
svn path=/trunk/; revision=54936
2014-01-19Add option to specify special permissions for dumpcap during cmake phase:Jörg Mayer1-0/+21
set(DUMPCAP_INSTALL_OPTION <val>) where val is one of "normal" "suid" "capabilities" Some things left to do: - Error out in cmake if setcap isn't found or libcap isn't found. - Move multivalue option handling into it's own macro (-file) with value checking svn path=/trunk/; revision=54840
2014-01-16Look for win_flex and win_bison.Gerald Combs2-0/+2
svn path=/trunk/; revision=54830