When using pkg-config to get library flags for gphoto2, any

extra flags (such as -L) must be passed to sane-config.in so
that it can find the libraries in a non-standard location.
(Bug #300686)

ChangeLog

@@ -1,3 +1,10 @@
+2004-07-03  Peter Fales <peter@fales-lorenz.net>
+	* acinclude.m4, aclocal.m4, configure, tools/sane-config.in: 
+	  When using pkg-config to get library flags for gphoto2, any
+	  extra flags (such as -L) must be passed to sane-config.in so
+	  that it can find the libraries in a non-standard location.
+	  (Bug #300686)
+
 2004-07-02  Gerhard Jaeger <gerhard@gjaeger.de>
 	* po/*.po: Updated according to changes in the plustek backend.
 	* backend/plustek.c backend/plustek-usb*: Major update, see

acinclude.m4

@@ -352,8 +352,12 @@ AC_DEFUN([SANE_CHECK_GPHOTO2],
 
 	])
 
-	# If --with-gphoto2=yes (or not supplied), then enable it
-	# if pkg-config can be found and libgphoto2 is present
+	# If --with-gphoto2=yes (or not supplied), first check if 
+	# pkg-config exists, then use it to check if libgphoto2 is
+	# present.  If all that works, then see if we can actually link
+        # a program.   And, if that works, then add the -l flags to 
+	# LIBS and any other flags to GPHOTO2_LDFLAGS to pass to 
+	# sane-config.
 	if test "$with_gphoto2" != "no" ; then 
 
 		AC_CHECK_TOOL(HAVE_GPHOTO2, pkg-config, false)
@@ -363,7 +367,10 @@ AC_DEFUN([SANE_CHECK_GPHOTO2],
 				with_gphoto2=`pkg-config --modversion libgphoto2`
 				CPPFLAGS="${CPPFLAGS} `pkg-config --cflags libgphoto2`"
 				GPHOTO2_LIBS="`pkg-config --libs libgphoto2`"
-				SANE_EXTRACT_LDFLAGS(LDFLAGS, GPHOTO2_LIBS)
+				SANE_EXTRACT_LDFLAGS(GPHOTO2_LDFLAGS, GPHOTO2_LIBS)
+				LDFLAGS="$LDFLAGS $GPHOTO2_LDFLAGS"
+
+				AC_SUBST(GPHOTO2_LDFLAGS)
 
 			 	saved_LIBS="${LIBS}"
 				LIBS="${LIBS} ${GPHOTO2_LIBS}"

aclocal.m4

@@ -1,6 +1,6 @@
-# aclocal.m4 generated automatically by aclocal 1.6.3 -*- Autoconf -*-
+# generated automatically by aclocal 1.7.5 -*- Autoconf -*-
 
-# Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002
 # Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -365,8 +365,12 @@ AC_DEFUN([SANE_CHECK_GPHOTO2],
 
 	])
 
-	# If --with-gphoto2=yes (or not supplied), then enable it
-	# if pkg-config can be found and libgphoto2 is present
+	# If --with-gphoto2=yes (or not supplied), first check if 
+	# pkg-config exists, then use it to check if libgphoto2 is
+	# present.  If all that works, then see if we can actually link
+        # a program.   And, if that works, then add the -l flags to 
+	# LIBS and any other flags to GPHOTO2_LDFLAGS to pass to 
+	# sane-config.
 	if test "$with_gphoto2" != "no" ; then 
 
 		AC_CHECK_TOOL(HAVE_GPHOTO2, pkg-config, false)
@@ -376,7 +380,10 @@ AC_DEFUN([SANE_CHECK_GPHOTO2],
 				with_gphoto2=`pkg-config --modversion libgphoto2`
 				CPPFLAGS="${CPPFLAGS} `pkg-config --cflags libgphoto2`"
 				GPHOTO2_LIBS="`pkg-config --libs libgphoto2`"
-				SANE_EXTRACT_LDFLAGS(LDFLAGS, GPHOTO2_LIBS)
+				SANE_EXTRACT_LDFLAGS(GPHOTO2_LDFLAGS, GPHOTO2_LIBS)
+				LDFLAGS="$LDFLAGS $GPHOTO2_LDFLAGS"
+
+				AC_SUBST(GPHOTO2_LDFLAGS)
 
 			 	saved_LIBS="${LIBS}"
 				LIBS="${LIBS} ${GPHOTO2_LIBS}"
@@ -6359,3 +6366,30 @@ SED=$lt_cv_path_SED
 AC_MSG_RESULT([$SED])
 ])
 
+# isc-posix.m4 serial 2 (gettext-0.11.2)
+dnl Copyright (C) 1995-2002 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License.  As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
+
+# This file is not needed with autoconf-2.53 and newer.  Remove it in 2005.
+
+# This test replaces the one in autoconf.
+# Currently this macro should have the same name as the autoconf macro
+# because gettext's gettext.m4 (distributed in the automake package)
+# still uses it.  Otherwise, the use in gettext.m4 makes autoheader
+# give these diagnostics:
+#   configure.in:556: AC_TRY_COMPILE was called before AC_ISC_POSIX
+#   configure.in:556: AC_TRY_RUN was called before AC_ISC_POSIX
+
+undefine([AC_ISC_POSIX])
+
+AC_DEFUN([AC_ISC_POSIX],
+  [
+    dnl This test replaces the obsolescent AC_ISC_POSIX kludge.
+    AC_CHECK_LIB(cposix, strerror, [LIBS="$LIBS -lcposix"])
+  ]
+)
+

tools/sane-config.in

@@ -85,9 +85,9 @@ if test $# -gt 0; then
     --ldflags)
 
       if test -z "$LINKER_RPATH"; then
-        echo "-L${libdir}"
+        echo "-L${libdir} @GPHOTO2_LDFLAGS@"
       else
-        echo "-L${libdir} ${LINKER_RPATH}${libdir}"
+        echo "-L${libdir} @GPHOTO2_LDFLAGS@ ${LINKER_RPATH}${libdir}"
       fi
       ;;
     --libs)