Restore the removed DYNAMIC_FLAG configuration.

ChangeLog

@@ -1,3 +1,7 @@
+2009-02-11  Mattias Ellert <mattias.ellert@fysast.uu.se>
+	* acinclude.m4, backend/Makefile.am: Restore the removed
+	DYNAMIC_FLAG configuration.
+
 2009-01-31 Chris Bagwell <cbagwell-guest at users.alioth.debian.org>
 	* backend/Makefil.am: Add missing math library to coolscan2
 	and coolscan3.

Makefile.in

@@ -115,6 +115,7 @@ DISTCLEAN_FILES = @DISTCLEAN_FILES@
 DLLTOOL = @DLLTOOL@
 DL_LIBS = @DL_LIBS@
 DVIPS = @DVIPS@
+DYNAMIC_FLAG = @DYNAMIC_FLAG@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@

acinclude.m4

@@ -160,6 +160,12 @@ AC_DEFUN([SANE_CHECK_DLL_LIB],
       fi
   fi
   AC_SUBST(DL_LIBS)
+
+  DYNAMIC_FLAG=
+  if test "${enable_dynamic}" = yes ; then
+    DYNAMIC_FLAG=-module
+  fi
+  AC_SUBST(DYNAMIC_FLAG)
 ])
 
 #

backend/Makefile.am

@@ -21,7 +21,7 @@ AM_LDFLAGS = @STRICT_LDFLAGS@ @NO_UNDEFINED_LDFLAGS@
 # The -rpath option is added because we are creating _LTLIBRARIES based
 # on configure substitution.  This causes automake to not know the
 # correct $libdir and must be added here.
-DIST_SANELIBS_LDFLAGS = $(AM_LDFLAGS) -rpath '$(libdir)/sane' -version-number $(V_MAJOR):$(V_MINOR):$(V_REV)
+DIST_SANELIBS_LDFLAGS = $(AM_LDFLAGS) -rpath '$(libdir)/sane' -version-number $(V_MAJOR):$(V_MINOR):$(V_REV) $(DYNAMIC_FLAG)
 DIST_LIBS_LDFLAGS = $(AM_LDFLAGS) -rpath '$(libdir)' -version-number $(V_MAJOR):$(V_MINOR):$(V_REV)
 
 # LIBTOOL install is a little to noisy for my liking.

backend/Makefile.in

@@ -1294,6 +1294,7 @@ DISTCLEAN_FILES = @DISTCLEAN_FILES@
 DLLTOOL = @DLLTOOL@
 DL_LIBS = @DL_LIBS@
 DVIPS = @DVIPS@
+DYNAMIC_FLAG = @DYNAMIC_FLAG@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -1432,7 +1433,7 @@ AM_LDFLAGS = @STRICT_LDFLAGS@ @NO_UNDEFINED_LDFLAGS@
 # The -rpath option is added because we are creating _LTLIBRARIES based
 # on configure substitution.  This causes automake to not know the
 # correct $libdir and must be added here.
-DIST_SANELIBS_LDFLAGS = $(AM_LDFLAGS) -rpath '$(libdir)/sane' -version-number $(V_MAJOR):$(V_MINOR):$(V_REV)
+DIST_SANELIBS_LDFLAGS = $(AM_LDFLAGS) -rpath '$(libdir)/sane' -version-number $(V_MAJOR):$(V_MINOR):$(V_REV) $(DYNAMIC_FLAG)
 DIST_LIBS_LDFLAGS = $(AM_LDFLAGS) -rpath '$(libdir)' -version-number $(V_MAJOR):$(V_MINOR):$(V_REV)
 FIRMWARE_DIRS = artec_eplus48u gt68xx snapscan epjitsu
 

configure

@@ -844,6 +844,7 @@ CAM_LIBS
 SCSI_LIBS
 MATH_LIB
 DL_LIBS
+DYNAMIC_FLAG
 effective_target
 LINKER_RPATH
 STRICT_LDFLAGS
@@ -7961,6 +7962,12 @@ done
   fi
 
 
+  DYNAMIC_FLAG=
+  if test "${enable_dynamic}" = yes ; then
+    DYNAMIC_FLAG=-module
+  fi
+
+
 { $as_echo "$as_me:$LINENO: checking for sqrt in -lm" >&5
 $as_echo_n "checking for sqrt in -lm... " >&6; }
 if test "${ac_cv_lib_m_sqrt+set}" = set; then

lib/Makefile.in

@@ -101,6 +101,7 @@ DISTCLEAN_FILES = @DISTCLEAN_FILES@
 DLLTOOL = @DLLTOOL@
 DL_LIBS = @DL_LIBS@
 DVIPS = @DVIPS@
+DYNAMIC_FLAG = @DYNAMIC_FLAG@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@