diff options
| author | Martin Wehner <martin.wehner@gmail.com> | 2007-07-02 21:44:58 +0000 |
|---|---|---|
| committer | Martin Wehner <mwehner@src.gnome.org> | 2007-07-02 21:44:58 +0000 |
| commit | e961d1b6bed0fba0be5076708c05f3ecf6a49086 (patch) | |
| tree | 4115e3426f5efa5c4cad86f95b77146918e546e6 | |
| parent | 2c4e4266a0f659eb8db411c9f046e40010485be0 (diff) | |
| download | nautilus-e961d1b6bed0fba0be5076708c05f3ecf6a49086.tar.gz | |
Fix build with libIDL-0.8.5 and older. (#341173) Patch from Marinus
2007-07-02 Martin Wehner <martin.wehner@gmail.com>
* src/nautilus-shell-interface.idl:
Fix build with libIDL-0.8.5 and older. (#341173)
Patch from Marinus Schraal <foser@gentoo.org>
svn path=/branches/gnome-2-18/; revision=12974
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | configure.in | 26 |
2 files changed, 18 insertions, 13 deletions
@@ -1,5 +1,10 @@ 2007-07-02 Martin Wehner <martin.wehner@gmail.com> + * configure.in: + Make libexif dependency optional again. (#165773) + +2007-07-02 Martin Wehner <martin.wehner@gmail.com> + * src/nautilus-shell-interface.idl: Fix build with libIDL-0.8.5 and older. (#341173) Patch from Marinus Schraal <foser@gentoo.org> diff --git a/configure.in b/configure.in index d0cdf979c..b4d11668e 100644 --- a/configure.in +++ b/configure.in @@ -209,22 +209,22 @@ AC_SUBST(HAVE_JW) dnl ========================================================================== -dnl exif checking +AM_CONDITIONAL(HAVE_EXIF, false) -AC_MSG_CHECKING(for libExif) +dnl libexif checking PKG_CHECK_MODULES(EXIF, libexif > exif_minver, [ - AC_DEFINE(HAVE_EXIF, 1, [Define to enable EXIF support]) - AC_SUBST(EXIF_CFLAGS) - AC_SUBST(EXIF_LIBS) - ], [ - PKG_CHECK_MODULES(EXIF, libexif = exif_minver, [ - AC_DEFINE(HAVE_EXIF, 1) - AC_DEFINE(HAVE_OLD_EXIF, 1, [Define if your EXIF library has old API.]) - AC_SUBST(EXIF_CFLAGS) - AC_SUBST(EXIF_LIBS) -])]) - + AM_CONDITIONAL(HAVE_EXIF, true) + AC_DEFINE(HAVE_EXIF, 1, [Define to enable EXIF support]) + ], [ + PKG_CHECK_MODULES(EXIF, libexif = exif_minver, [ + AM_CONDITIONAL(HAVE_EXIF, true) + AC_DEFINE(HAVE_OLD_EXIF, 1, [Define if your EXIF library has old API]) + ], [AM_CONDITIONAL(HAVE_EXIF, false)]) + ]) + +AC_SUBST(EXIF_CFLAGS) +AC_SUBST(EXIF_LIBS) dnl ========================================================================== dnl search implementations |