Library version definition fixes

ChangeLog

@@ -1,3 +1,7 @@
+2008-02-20  Mattias Ellert <mattias.ellert@tsl.uu.se>
+	* backend/Makefile.in, ltmain.sh: Library version definition fixes
+	* backend/coolscan3.c: Fix format warnings
+
 2008-02-18  Alessandro Zummo <a.zummo@towertech.it>
 	* backend/coolscan3.c: added new coolscan3 backend
 	with improved stability and infrared support.

backend/Makefile.in

@@ -214,7 +214,7 @@ DISTFILES = Makefile.in saned.conf.in sane_strstatus.c stubs.c \
 libsane-%.la: %.lo %-s.lo $(EXTRA) $(LIBOBJS)
 	@$(LIBTOOL) $(MLINK) $(CC) -export-dynamic -o $@ $($*_LIBS) \
 	$(LDFLAGS) $(BACKENDLIBS) $^ @LIBTOOL_LINK_EXTRA@ -rpath $(libsanedir) \
-	-version-info $(V_MAJOR):$(V_REV):$(V_MINOR) $(DYNAMIC_FLAG)
+	-version-number $(V_MAJOR):$(V_MINOR):$(V_REV) $(DYNAMIC_FLAG)
 
 %-s.lo:	%-s.c
 	@$(LIBTOOL) $(MCOMP) $(COMPILE) -DSTUBS -DBACKEND_NAME=$* $<
@@ -321,7 +321,7 @@ dll-preload.c:
 libsane.la: dll.lo dll-s.lo $(EXTRA) $(addsuffix .lo,$(DLL_PRELOAD)) $(LIBOBJS)
 	@$(LIBTOOL) $(MLINK) $(CC) -o $@ $(LDFLAGS) $(BACKENDLIBS)  $^ \
 		$(addsuffix .lo,$(DLL_PRELOAD_EXTRAS)) @LIBTOOL_LINK_EXTRA@ \
-		-rpath $(libdir) -version-info $(V_MAJOR):$(V_REV):$(V_MINOR)
+		-rpath $(libdir) -version-number $(V_MAJOR):$(V_MINOR):$(V_REV)
 
 # Generate .conf files for all existing .conf.in files
 becfg: $(patsubst %.conf.in,%.conf,$(wildcard *.conf.in)) 

ltmain.sh

@@ -27,7 +27,6 @@
 # Local changes for sane-backends (search for "Local change"):
 # 2003-04-30: Henning Meier-Geinitz
 #   * soname changed to "libsane" for every backend (all systems but AIX)
-#   * fix version number for Irix
 
 basename="s,^.*/,,g"
 
@@ -3277,11 +3276,7 @@ EOF
 	  ;;
 
 	irix | nonstopux)
-	  # Local change for sane-backends: old version:
-	  # major=`expr $current - $age + 1`
-	  # New version:
-	  major=`expr $current - $age`
-	  # End of local change.
+	  major=`expr $current - $age + 1`
 
 	  case $version_type in
 	    nonstopux) verstring_prefix=nonstopux ;;