* libltdl/configure.in (libltdl_cv_objdir): yes, appending the "/"

in configure.in was much simpler
* libltdl/ltdl.c (objdir): ditto
This commit is contained in:
Alexandre Oliva 1999-01-25 15:59:56 +00:00 committed by Alexandre Oliva
parent f1d990faa4
commit 3a2cf81834
3 changed files with 6 additions and 3 deletions

View File

@ -1,5 +1,9 @@
1999-01-25 Alexandre Oliva <oliva@dcc.unicamp.br>
* libltdl/configure.in (libltdl_cv_objdir): yes, appending the "/"
in configure.in was much simpler
* libltdl/ltdl.c (objdir): ditto
* libltdl/ltdl.c (objdir): string collation isn't portable; strcat
"/" explicitly. Or should this be moved to configure.in?

View File

@ -75,7 +75,7 @@ libltdl_cv_objdir=`cat conftest`
rm -f conftest
])
test -z "$libltdl_cv_objdir" && libltdl_cv_objdir=".libs"
AC_DEFINE_UNQUOTED(LTDL_OBJDIR, "$libltdl_cv_objdir")
AC_DEFINE_UNQUOTED(LTDL_OBJDIR, "$libltdl_cv_objdir/")
AC_HEADER_STDC
AC_CHECK_HEADERS(malloc.h memory.h stdlib.h stdio.h ctype.h dlfcn.h dl.h)

View File

@ -823,11 +823,10 @@ find_module (handle, dir, libdir, dlname, old_name, installed)
}
/* try to open the not-installed module */
if (!installed &&
strlen(dir)+strlen(objdir)+1+strlen(dlname)
strlen(dir)+strlen(objdir)+strlen(dlname)
< LTDL_FILENAME_MAX) {
strcpy(filename, dir);
strcat(filename, objdir);
strcat(filename, "/");
strcat(filename, dlname);
if (tryall_dlopen(handle, filename) == 0)
return 0;