diff --git a/configure.in b/configure.in index 26f4f7484c..f2bd21bb7e 100644 --- a/configure.in +++ b/configure.in @@ -615,6 +615,7 @@ AC_FUNC_SETPGRP AC_CHECK_FUNCS(setpgid) AC_FUNC_GETPGRP AC_CHECK_FUNCS(flock) +AC_CHECK_FUNCS(dladdr) AC_CHECK_FUNCS(initgroups) AC_CHECK_FUNCS(getpagesize) AC_CHECK_FUNCS(pread pwrite) diff --git a/src/jrd/fun.epp b/src/jrd/fun.epp index 91b36ef7cc..7899612dc4 100644 --- a/src/jrd/fun.epp +++ b/src/jrd/fun.epp @@ -87,6 +87,7 @@ namespace #ifdef WIN_NT libUtilPath->assign("ib_util"); #else +#ifdef HAVE_DLADDR Dl_info info; if (dladdr((void*) IbUtil::initialize, &info) != 0) { @@ -104,8 +105,9 @@ namespace PathUtils::concatPath(libUtilPath, temp3, "../lib/libib_util"); } else +#endif // HAVE_DLADDR libUtilPath->assign("libib_util"); -#endif +#endif // WIN_NT ModuleLoader::doctorModuleExtention(libUtilPath); }