* libltdl/ltdl.c (objdir): string collation isn't portable; strcat

"/" explicitly.  Or should this be moved to configure.in?

diff --git a/ChangeLog b/ChangeLog
index 1dc4954b9cb1e3541b7c37b3f4d1eeaa85839767..5a1c759c4646c4cfe1ecf7f6c4a62da58e40dad8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+1999-01-25  Alexandre Oliva  <oliva@dcc.unicamp.br>
+
+       * libltdl/ltdl.c (objdir): string collation isn't portable; strcat 
+       "/" explicitly.  Or should this be moved to configure.in?
+
 1999-01-25  Thomas Tanner  <tanner@gmx.de>
 
        * libltdl/ltdl.c: allocate the variables in lt_dlopen() dynamically

diff --git a/libltdl/ltdl.c b/libltdl/ltdl.c
index da53c8a0fa9060b7268181bd7f609eda4f1611ac..97eb8735ae8c765114af9458d185806c497a2bf9 100644 (file)
--- a/libltdl/ltdl.c
+++ b/libltdl/ltdl.c
@@ -75,7 +75,7 @@ Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 /* This accounts for the _LTX_ separator */
 #define LTDL_SYMBOL_OVERHEAD   5
 
-static const char *objdir = LTDL_OBJDIR "/";
+static const char *objdir = LTDL_OBJDIR;
 static const char *shlib_ext = LTDL_SHLIB_EXT;
 
 static const char *unknown_error = "unknown error";
@@ -823,10 +823,11 @@ find_module (handle, dir, libdir, dlname, old_name, installed)
                }
                /* try to open the not-installed module */
                if (!installed &&
-                   strlen(dir)+strlen(objdir)+strlen(dlname)
+                   strlen(dir)+strlen(objdir)+1+strlen(dlname)
                                < LTDL_FILENAME_MAX) {
                        strcpy(filename, dir);
                        strcat(filename, objdir);
+                       strcat(filename, "/");
                        strcat(filename, dlname);
                        if (tryall_dlopen(handle, filename) == 0)
                                return 0;