diff options
| author | Jakub Zawadzki <darkjames-ws@darkjames.pl> | 2017-04-01 21:07:37 +0200 |
|---|---|---|
| committer | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2017-04-03 05:23:02 +0000 |
| commit | ae3797ec11b043ef18b1fbbf3c3540f18adea768 (patch) | |
| tree | 73c019d5e052509f263324d8a7c65ea11f207aae /configure.ac | |
| parent | 12434e967808011b4bdffe727c0260ad783d68e6 (diff) | |
Don't compile plugins when configured --without-plugins.
--without-plugins didn't affect plugins_dir=, fix it.
Change-Id: I375aa15e38993008eaea9e311eed5cb1c3731e49
Reviewed-on: https://code.wireshark.org/review/20839
Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index d06eda760f..166c507bbd 100644 --- a/configure.ac +++ b/configure.ac @@ -1505,12 +1505,9 @@ LIBS="$ac_save_LIBS" ]) if test "$ac_cv_glib_supports_modules" = yes ; then have_plugins=yes - plugins_dir="plugins" else have_plugins=no - plugins_dir="" fi -AC_SUBST(plugins_dir) # # If we have <dlfcn.h>, check whether we have dladdr. @@ -2572,8 +2569,12 @@ AC_ARG_WITH(plugins, AM_CONDITIONAL(HAVE_PLUGINS, test "x$have_plugins" = "xyes") if test x$have_plugins = xyes then + plugins_dir="plugins" AC_DEFINE(HAVE_PLUGINS, 1, [Define if plugins are enabled]) +else + plugins_dir="" fi +AC_SUBST(plugins_dir) AC_SUBST(plugindir) # |