diff options
| author | Guy Harris <guy@alum.mit.edu> | 2005-03-17 05:09:42 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2005-03-17 05:09:42 +0000 |
| commit | 61c7ec6534777e373f99633d2788443f9f97dab9 (patch) | |
| tree | 0f910211c083f2181df0e66da0da0dbdffac33e3 /acinclude.m4 | |
| parent | 2ebd49cd2c44cbee43321b40e041e18611ad0fd0 (diff) | |
| download | wireshark-61c7ec6534777e373f99633d2788443f9f97dab9.tar.gz wireshark-61c7ec6534777e373f99633d2788443f9f97dab9.tar.bz2 wireshark-61c7ec6534777e373f99633d2788443f9f97dab9.zip | |
Fix the display of help information for various --with arguments (for
whatever reason, the changequote() hack doesn't seem to be working, at
least on OS X; the square brackets were simply being removed from the
messages).
Rename the "ifpresent" value for the --with variables to "ifavailable",
to match the help messages.
At least for the SNMP libraries, have the "checking" message just say
"whether to use XXX" and have the result message say "yes, if available"
if the user didn't explicitly specify "--with" or "--without", as the
default just leaves the library out if it doesn't work, but explicitly
specifying "--with" means you get an error if it doesn't work.
Make "--with-net-snmp" fail if the headers aren't present (if the user
explicitly asks for something, we should fail if we can't give it to
them, as they presumably really wanted it).
svn path=/trunk/; revision=13789
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 33 |
1 files changed, 11 insertions, 22 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index eab3ab5887..8051483f78 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -793,13 +793,17 @@ AC_DEFUN([AC_ETHEREAL_NETSNMP_CHECK], have_net_snmp="yes" fi else - # - # Restore the versions of CFLAGS and CPPFLAGS before - # we added the output of '$NETSNMPCONFIG --cflags", - # as we didn't actually find Net-SNMP there. - # - CFLAGS="$ethereal_save_CFLAGS" - CPPFLAGS="$ethereal_save_CPPFLAGS" + if test "x$want_netsnmp" = "xyes" ; then + AC_MSG_ERROR(Net-SNMP not found) + else + # + # Restore the versions of CFLAGS and CPPFLAGS before + # we added the output of '$NETSNMPCONFIG --cflags", + # as we didn't actually find Net-SNMP there. + # + CFLAGS="$ethereal_save_CFLAGS" + CPPFLAGS="$ethereal_save_CPPFLAGS" + fi fi ]) @@ -983,21 +987,6 @@ AC_DEFUN([AC_ETHEREAL_ADNS_CHECK], [ want_adns=defaultyes - AC_ARG_WITH(adns, -changequote(<<, >>)dnl -<< --with-adns[=DIR] use GNU ADNS (located in directory DIR, if supplied). [default=yes, if present]>>, -changequote([, ])dnl - [ - if test "x$withval" = "xno"; then - want_adns=no - elif test "x$withval" = "xyes"; then - want_adns=yes - elif test -d "$withval"; then - want_adns=yes - AC_ETHEREAL_ADD_DASH_L(LDFLAGS, ${withval}/lib) - fi - ]) - if test "x$want_adns" = "xdefaultyes"; then want_adns=yes withval=/usr/local |