osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Get rid of stuff that checks for a .libs directory. 

.libs is a libtoolism, and we're not using autotools or libtool any
more, so there aren't any more libtoolisms.

Change-Id: Idc9ef37f9650197da096cc8e3cb3ed459b71dea0
Reviewed-on: https://code.wireshark.org/review/27137
Reviewed-by: Guy Harris <guy@alum.mit.edu>
This commit is contained in:
Guy Harris 2018-04-24 20:46:25 -07:00
parent f07fb6cdfc
commit 8c959fcc35
2 changed files with 4 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
wsutil/filesystem.c
View File

@ -675,33 +675,11 @@ DIAG_ON(pedantic)
*dir_end = '\0';
/*
* Is there a "/.libs" at the end?
* Is there a "/run" at the end?
*/
dir_end = strrchr(prog_pathname, '/');
if (dir_end != NULL) {
if (strcmp(dir_end, "/.libs") == 0) {
/*
* Yup, it's ".libs".
* Strip that off; it's an
* artifact of libtool.
*/
*dir_end = '\0';
/*
* This presumably means we're run from
* the libtool wrapper, which probably
* means we're being run from the build
* directory. If we weren't started
* with special privileges, set
* running_in_build_directory_flag.
*
* XXX - should we check whether what
* follows ".libs/" begins with "lt-"?
*/
if (!started_with_special_privs())
running_in_build_directory_flag = TRUE;
}
else if (!started_with_special_privs()) {
if (!started_with_special_privs()) {
/*
* Check for the CMake output directory. As people may name
* their directories "run" (really?), also check for the

17
wsutil/plugins.c
View File

@ -219,22 +219,9 @@ scan_plugins_build_dir(GHashTable *plugins_module, plugin_type_e type)
if (strcmp(name, ".") == 0 || strcmp(name, "..") == 0)
continue; /* skip "." and ".." */
/*
* Get the full path of a ".libs" subdirectory of that
* directory.
* Get the full path of that directory.
*/
plugin_folder = g_build_filename(dirpath, name, ".libs", (gchar *)NULL);
if (test_for_directory(plugin_folder) != EISDIR) {
/*
* Either it doesn't refer to a directory or it
* refers to something that doesn't exist.
*
* Assume that means that the plugins are in
* the subdirectory of the plugin directory, not
* a ".libs" subdirectory of that subdirectory.
*/
g_free(plugin_folder);
plugin_folder = g_build_filename(get_plugins_dir(), name, (gchar *)NULL);
}
plugin_folder = g_build_filename(get_plugins_dir(), name, (gchar *)NULL);
scan_plugins_dir(plugins_module, plugin_folder, type, FALSE);
g_free(plugin_folder);
}