Fixed dynamic loading on current HP/UX systems (bug #302732).

ChangeLog

@@ -1,3 +1,8 @@
+2005-12-20  Henning Meier-Geinitz <henning@meier-geinitz.de>
+
+	* backend/dll.c doc/descriptions/dll.desc: Fixed dynamic loading
+	  on current HP/UX systems (bug #302732).
+
 2005-12-18  Henning Meier-Geinitz <henning@meier-geinitz.de>
 
 	* Makefile.in: List ChangeLog-1.0.17 in DISTFILES.

backend/dll.c

@@ -44,7 +44,7 @@
 
 /* Please increase version number with every change 
    (don't forget to update dll.desc) */
-#define DLL_VERSION "1.0.11"
+#define DLL_VERSION "1.0.12"
 
 #ifdef _AIX
 # include "lalloca.h"		/* MUST come first for AIX! */
@@ -382,6 +382,7 @@ load (struct backend *be)
 # define PREFIX "libsane-"
 # ifdef __hpux
 #   define POSTFIX ".sl.%u"
+#   define ALT_POSTFIX ".so.%u"
 #elif defined (HAVE_WINDOWS_H)
 #   undef PREFIX
 #   define PREFIX "cygsane-"
@@ -461,6 +462,18 @@ load (struct backend *be)
 	break;
       DBG (4, "load: couldn't open `%s' (%s)\n", libname, strerror (errno));
 
+#ifdef ALT_POSTFIX      
+      /* Some platforms have two ways of storing their libraries, try both
+	 postfixes */
+      snprintf (libname, sizeof (libname), "%s/" PREFIX "%s" ALT_POSTFIX,
+		dir, be->name, V_MAJOR);
+      DBG (4, "load: trying to load `%s'\n", libname);
+      fp = fopen (libname, "r");
+      if (fp)
+	break;
+      DBG (4, "load: couldn't open `%s' (%s)\n", libname, strerror (errno));
+#endif
+
       dir = strsep (&src, DIR_SEP);
     }
   if (orig_src)

doc/descriptions/dll.desc

@@ -1,5 +1,5 @@
 :backend "dll"               ; name of backend
-:version "1.0.11"
+:version "1.0.12"
 :manpage "sane-dll"
 :url "mailto:henning@meier-geinitz.de"