diff options
author | Hans Ulrich Niedermann <hun@n-dimensional.de> | 2020-02-17 03:29:08 +0100 |
---|---|---|
committer | Hans Ulrich Niedermann <hun@n-dimensional.de> | 2020-02-17 03:39:34 +0100 |
commit | 436a5ab2aad12cde03a4ac96256ddf367d7b7c26 (patch) | |
tree | a103e6efdc02d5786c2928f75eac69145db9ec8e | |
parent | ba0e11ac6eb5aac2c39e1c25bb5cae09ae1e353a (diff) | |
download | libgphoto2-436a5ab2aad12cde03a4ac96256ddf367d7b7c26.tar.gz |
FIXMEUP Replace GP_CHECK_LIBRARY by PKG_CHECK_MODULES
-rw-r--r-- | configure.ac | 68 |
1 files changed, 52 insertions, 16 deletions
diff --git a/configure.ac b/configure.ac index e2839ca86..b1f5d8151 100644 --- a/configure.ac +++ b/configure.ac @@ -602,14 +602,37 @@ dnl a file. dnl libexif is available from dnl http://www.sourceforge.net/projects/libexif dnl --------------------------------------------------------------------------- -GP_CHECK_LIBRARY([LIBEXIF],[libexif],[>= 0.6.13], - [libexif/exif-data.h],[exif_data_new],[ -AC_MSG_CHECKING([whether we use a version of libexif with ExifData.ifd[[]]]) -# Check for libexif version -dnl FIXME: Use AC_CHECK_MEMBER? -CPPFLAGS_save="$CPPFLAGS" -CPPFLAGS="$LIBEXIF_CFLAGS" -AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ +have_LIBEXIF=yes +PKG_CHECK_MODULES([LIBEXIF], [libexif >= 0.6.13], + [], [have_LIBEXIF=no]) + +AS_VAR_IF([have_LIBEXIF], [yes], [dnl + CPPFLAGS_save="$CPPFLAGS" + CPPFLAGS="${LIBEXIF_CFLAGS}" + AC_CHECK_HEADER([libexif/exif-data.h],[],[dnl + have_LIBEXIF=no + ]) + CPPFLAGS="$CPPFLAGS_save" + AC_MSG_CHECKING([for working header libexif/exif-data.h]) + AC_MSG_RESULT([${have_LIBEXIF}]) + + AS_VAR_IF([have_LIBEXIF], [yes], [dnl + AC_MSG_CHECKING([for function exif_data_new]) + LIBS_save="$LIBS" + LIBS="${LIBEXIF_LIBS}" + AC_TRY_LINK_FUNC([exif_data_new],[AC_MSG_RESULT([yes])],[dnl + AC_MSG_RESULT([no]) + have_LIBEXIF=no + ]) + LIBS="$LIBS_save" + + AS_VAR_IF([have_LIBEXIF], [yes], [dnl + AC_MSG_CHECKING([whether we use a version of libexif with ExifData.ifd[[]]]) + # Check for libexif version + dnl FIXME: Use AC_CHECK_MEMBER? + CPPFLAGS_save="$CPPFLAGS" + CPPFLAGS="$LIBEXIF_CFLAGS" + AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ /* CC=$CC */ /* CPPFLAGS=${CPPFLAGS} */ /* LDFLAGS=${LDFLAGS} */ @@ -620,15 +643,28 @@ AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ ExifContent *ec0, *ec1; ec0 = &ed.ifd[0]; ec1 = &ed.ifd[1]; -]])], [ - AC_DEFINE([HAVE_LIBEXIF_IFD],1, - [whether we use a version of libexif with ExifData.ifd[[]]]) - AC_MSG_RESULT([yes]) -], [ - AC_MSG_RESULT([no]) + ]])], [dnl + AC_DEFINE([HAVE_LIBEXIF_IFD],1, + [whether we use a version of libexif with ExifData.ifd[[]]]) + AC_MSG_RESULT([yes]) + ], [dnl + AC_MSG_RESULT([no]) + have_LIBEXIF=no + ]) + CPPFLAGS="$CPPFLAGS_save" + ]) + ]) +]) + +AC_MSG_CHECKING([whether libexif is completely working for us]) +AC_MSG_RESULT([${have_LIBEXIF}]) +AM_CONDITIONAL([HAVE_LIBEXIF], [test "x$have_LIBEXIF" = "xyes"]) +AM_COND_IF([HAVE_LIBEXIF], [dnl + AC_DEFINE([HAVE_LIBEXIF], 1, [whether we compile with libexif support]) + GP_CONFIG_MSG([libexif],[yes])dnl +], [dnl + GP_CONFIG_MSG([libexif],[no])dnl ]) -CPPFLAGS="$CPPFLAGS_save" -],[],[default-on],[http://www.sourceforge.net/projects/libexif])dnl dnl FIXME: Is this accurate? |