diff options
| author | Richard van der Hoff <richardv@mxtelecom.com> | 2007-08-24 00:03:02 +0000 |
|---|---|---|
| committer | Richard van der Hoff <richardv@mxtelecom.com> | 2007-08-24 00:03:02 +0000 |
| commit | 58b39bde744880d842e54be84f0990b7c58fa4fa (patch) | |
| tree | e2640c4fa397f32cadc50a37baee0ba40aed2181 /epan/filesystem.c | |
| parent | 31f01281883368ee6b9cf930e8e788000f921cb3 (diff) | |
| download | wireshark-58b39bde744880d842e54be84f0990b7c58fa4fa.tar.gz | |
Don't build in init_plugin_dir if HAVE_PLUGINS is not defined, which
means that we aren't reliant on PLUGIN_DIR having a sensible value.
svn path=/trunk/; revision=22616
Diffstat (limited to 'epan/filesystem.c')
| -rw-r--r-- | epan/filesystem.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/epan/filesystem.c b/epan/filesystem.c index 98aec53936..f58e1e32f1 100644 --- a/epan/filesystem.c +++ b/epan/filesystem.c @@ -618,6 +618,7 @@ get_datafile_dir(void) return datafile_dir; } +#ifdef HAVE_PLUGINS /* * Find the directory where the plugins are stored. * @@ -687,6 +688,7 @@ init_plugin_dir(void) plugin_dir = PLUGIN_DIR; #endif } +#endif /* HAVE_PLUGINS */ /* * Get the directory in which the plugins are stored. @@ -694,8 +696,12 @@ init_plugin_dir(void) const char * get_plugin_dir(void) { +#ifdef HAVE_PLUGINS if (!plugin_dir) init_plugin_dir(); return plugin_dir; +#else + return NULL; +#endif } /* |