Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 259196 | Differences between
and this patch

Collapse All | Expand All

(-)configure.ac.old (-34 / +18 lines)
Lines 540-579 Link Here
540
540
541
541
542
dnl ---------------------------------------------------------------------------
542
dnl ---------------------------------------------------------------------------
543
dnl libexif: The CameraFilesystem can use libexif for extracting thumbnails
543
dnl libexif
544
dnl	     out of EXIF data. Similarly, it can extract the mtime of
544
dnl ---------------------------------------------------------------------------
545
dnl	     a file. 
545
AC_MSG_CHECKING([whether to enable libexif support])
546
dnl	     libexif is available from
546
AC_ARG_ENABLE([exif],
547
dnl	     http://www.sourceforge.net/projects/libexif
547
	[AS_HELP_STRING([--enable-exif],
548
dnl ---------------------------------------------------------------------------
548
		[Enable libexif support (default: yes)])],
549
GP_CHECK_LIBRARY([LIBEXIF],[libexif],[>= 0.6.13],
549
		[enable_exif=$enableval],
550
		 [libexif/exif-data.h],[exif_data_new],[
550
		[enable_exif=yes])
551
AC_MSG_CHECKING([whether we use a version of libexif with ExifData.ifd[[]]])
551
AC_MSG_RESULT($enable_exif)
552
# Check for libexif version
552
if test x${enable_exif} = "xyes" ; then
553
dnl FIXME: Use AC_CHECK_MEMBER?
553
	PKG_CHECK_MODULES([LIBEXIF], [libexif >= 0.6.13],
554
CPPFLAGS_save="$CPPFLAGS"
554
	        [AC_DEFINE(HAVE_LIBEXIF,[1],[Define if libexif is available])
555
CPPFLAGS="$LIBEXIF_CFLAGS"
555
		 AC_DEFINE(HAVE_LIBEXIF_IFD, [1], [Libexif comes with ExifData.ifd])
556
AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
556
		],
557
/* CC=$CC */
557
        	[AC_MSG_ERROR([libexif not found])])
558
/* CPPFLAGS=${CPPFLAGS} */
558
fi
559
/* LDFLAGS=${LDFLAGS} */
559
AC_SUBST(LIBEXIF_LIBS)
560
#include <libexif/exif-data.h>
560
AC_SUBST(LIBEXIF_CFLAGS)
561
#include <libexif/exif-content.h>
562
]],[[
563
	ExifData ed;
564
	ExifContent *ec0, *ec1;
565
	ec0 = &ed.ifd[0];
566
	ec1 = &ed.ifd[1];
567
]])], [
568
   AC_DEFINE([HAVE_LIBEXIF_IFD],1,
569
	     [whether we use a version of libexif with ExifData.ifd[[]]])
570
   AC_MSG_RESULT([yes])
571
], [
572
   AC_MSG_RESULT([no])
573
])
574
CPPFLAGS="$CPPFLAGS_save"
575
],[],[default-on],[http://www.sourceforge.net/projects/libexif])dnl
576
577
561
578
dnl ---------------------------------------------------------------------------
562
dnl ---------------------------------------------------------------------------
579
dnl Check libusb
563
dnl Check libusb
(-)libgphoto2.pc.in.orig (-1 / +1 lines)
Lines 9-14 Link Here
9
Description: Library for easy access to digital cameras
9
Description: Library for easy access to digital cameras
10
URL: http://gphoto.org/proj/libgphoto2/
10
URL: http://gphoto.org/proj/libgphoto2/
11
Version: @VERSION@
11
Version: @VERSION@
12
Requires: libgphoto2_port >= 0.6.2, @REQUIREMENTS_FOR_LIBEXIF@
12
Requires: libgphoto2_port >= 0.6.2
13
Libs: -L${libdir} -lgphoto2 -lm
13
Libs: -L${libdir} -lgphoto2 -lm
14
Cflags: -I${includedir}/gphoto2
14
Cflags: -I${includedir}/gphoto2

Return to bug 259196