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

in configure.in was much simpler
* libltdl/ltdl.c (objdir): ditto

diff --git a/ChangeLog b/ChangeLog
index 5a1c759c4646c4cfe1ecf7f6c4a62da58e40dad8..bba8db999bd3116c860452966cbbab6e4e05efeb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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?
 

diff --git a/libltdl/configure.in b/libltdl/configure.in
index 1f4a367f755bdcb383f05e459c8334ad2b425e11..0c9e55e7873ff87cd44208046d62d991b52c232c 100644 (file)
--- a/libltdl/configure.in
+++ b/libltdl/configure.in
@@ -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)

diff --git a/libltdl/ltdl.c b/libltdl/ltdl.c
index 97eb8735ae8c765114af9458d185806c497a2bf9..5dc826ef6da169ab07711c46356774d533aa8c37 100644 (file)
--- a/libltdl/ltdl.c
+++ b/libltdl/ltdl.c
@@ -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;