Lua: Remove autotools specific code for build path

Change-Id: I541bd728c159e95c2d5daa8ce0bfea3961ff1db9
Reviewed-on: https://code.wireshark.org/review/27203
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: João Valverde <j@v6e.pt>

diff --git a/epan/wslua/wslua_dir.c b/epan/wslua/wslua_dir.c
index 9e9914749469c6e902e37693dd5a768c59eab5cd..a829f31379b140349de308ee24c40efe163478ed 100644 (file)
--- a/epan/wslua/wslua_dir.c
+++ b/epan/wslua/wslua_dir.c
@@ -290,18 +290,7 @@ WSLUA_CONSTRUCTOR Dir_global_config_path(lua_State* L) {
     const char *fname = luaL_optstring(L, WSLUA_OPTARG_global_config_path_FILENAME,"");
     char* filename;
 
-    if (running_in_build_directory()) {
-        /* Running in build directory, try the source directory (Autotools) */
-        filename = g_build_filename("epan", "wslua", get_datafile_dir(), fname, (char *)NULL);
-        if (( ! file_exists(filename))) {
-            /* Try the CMake output directory */
-            g_free(filename);
-            filename = get_datafile_path(fname);
-        }
-    } else {
-        filename = get_datafile_path(fname);
-    }
-
+    filename = get_datafile_path(fname);
     lua_pushstring(L,filename);
     g_free(filename);
     WSLUA_RETURN(1); /* The full pathname for a file in wireshark's configuration directory. */