diff options
| author | Richard van der Hoff <richardv@mxtelecom.com> | 2007-08-24 00:06:30 +0000 |
|---|---|---|
| committer | Richard van der Hoff <richardv@mxtelecom.com> | 2007-08-24 00:06:30 +0000 |
| commit | bea90e8c3342d0f042772d1ae898b650d492323c (patch) | |
| tree | c70ebfa5637b0981e8d096c5b8ed98e2f397d2d2 /configure.in | |
| parent | 58b39bde744880d842e54be84f0990b7c58fa4fa (diff) | |
| download | wireshark-bea90e8c3342d0f042772d1ae898b650d492323c.tar.gz wireshark-bea90e8c3342d0f042772d1ae898b650d492323c.tar.bz2 wireshark-bea90e8c3342d0f042772d1ae898b650d492323c.zip | |
In keeping with all the other path variables (eg, libdir), don't resolve
plugindir at configure time. Instead leave it to be defined at make
time, which means it can then be changed by, eg, changing $prefix. This
also means moving the definition of PLUGIN_DIR from config.h to a -D in
CPPFLAGS.
svn path=/trunk/; revision=22617
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/configure.in b/configure.in index b7ffb2b583..cbc2ab57c7 100644 --- a/configure.in +++ b/configure.in @@ -1443,7 +1443,8 @@ dnl dnl check whether plugins should be enabled and, if they should be, dnl check for plugins directory - stolen from Amanda's configure.in dnl -plugindir="$libdir/wireshark/plugins/$VERSION" +dnl we don't wish to expand ${libdir} yet +plugindir='${libdir}/wireshark/plugins/${VERSION}' AC_ARG_WITH(plugins, AC_HELP_STRING( [--with-plugins@<:@=DIR@:>@], [support plugins (installed in DIR, if supplied). @<:@default=yes, if possible@:>@]), @@ -1461,16 +1462,9 @@ AM_CONDITIONAL(HAVE_PLUGINS, test "x$have_plugins" = "xyes") if test x$have_plugins = xyes then AC_DEFINE(HAVE_PLUGINS, 1, [Define if plugins are enabled]) - plugindir=`( - test "x$prefix" = xNONE && prefix=$ac_default_prefix - test "x$exec_prefix" = xNONE && exec_prefix=${prefix} - eval echo "$plugindir" - )` - AC_DEFINE_UNQUOTED(PLUGIN_DIR, "$plugindir", [Plugin installation directory]) -else - AC_DEFINE(PLUGIN_DIR, NULL, [Plugin installation directory]) fi AC_SUBST(plugindir) +CPPFLAGS="$CPPFLAGS '-DPLUGIN_DIR=\"\$(plugindir)\"'" # # The plugin dissectors reside in ./plugins/PROTO/ |