Attachment 147834 Details for Bug 222039 – use INST_LIB instead of hardcoding MODULES_PATH

[patch] use INST_LIB instead of hardcoding MODULES_PATH

ogdi-3.1.5-driversdir2.patch (text/plain), 1.34 KB, created by Patrice Dumas on 2007-02-10 13:56:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Patrice Dumas

Created: 2007-02-10 13:56:22 UTC

Size: 1.34 KB

patch

obsolete

>--- ogdi-3.1.5/ogdi/c-api/ecs_dyna.c.driverdir~	2004-02-18 22:50:21.000000000 +0100
>+++ ogdi-3.1.5/ogdi/c-api/ecs_dyna.c	2007-02-10 14:45:36.000000000 +0100
>@@ -76,9 +76,29 @@
>     return (void *) handle;
>   }
> #else
>+#if !defined(MODULES_PATH)
>+#define MODULES_PATH "/usr/lib/ogdi/"
>+#endif
>   void *handle;
> 
>   handle = dlopen(libname,RTLD_LAZY);
>+  if (handle != NULL)
>+    return handle;
>+
>+  if ((temp = (char *) malloc(strlen(MODULES_PATH)+strlen(libname)+1)) == NULL)
>+    return NULL;
>+  sprintf(temp,MODULES_PATH "%s",libname);
>+  handle = dlopen(temp,RTLD_LAZY);
>+  free(temp);
>+  if (handle != NULL)
>+    return handle;
>+
>+  if ((temp = (char *) malloc(strlen(MODULES_PATH)+strlen(libname)+7)) == NULL)
>+    return NULL;
>+  sprintf(temp,MODULES_PATH "lib%s.so",libname);
>+  handle = dlopen(temp,RTLD_LAZY);
>+  free(temp);
>+
>   if (handle == NULL) {
>     /* Try with the .so extension */
> 
>--- ogdi-3.1.5/ogdi/c-api/makefile.driverdir~	2007-02-10 14:40:29.000000000 +0100
>+++ ogdi-3.1.5/ogdi/c-api/makefile	2007-02-10 14:45:53.000000000 +0100
>@@ -23,7 +23,7 @@
> 		$(GRASS_INCLUDE) $(ZLIB_INCLUDE) $(PROJ_INCLUDE) \
> 		$(EXPAT_INCLUDE)
> 
>-CFLAGS 	= $(INCLUDES) $(COMMON_CFLAGS)
>+CFLAGS 	= $(INCLUDES) $(COMMON_CFLAGS) -DMODULES_PATH="\"$(INST_LIB)\""
> 
> LINK_LIBS= $(RPC_LINKLIB) $(ZLIB_LINKLIB) $(EXPAT_LINKLIB) $(WIN_LINKLIB) \
> 		$(PROJ_STATICLIB) $(MATH_LINKLIB)

Actions: View | Diff

Attachments on bug 222039: 147831 | 147834