X-Git-Url: http://geeqie.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=configure.ac;h=41b1f9b074cde6e197defa35a6361769ef2383b6;hb=d7d2db8b4cb3be207b14c562b6fc1cf4fc894063;hp=2bd4ca7ab9b54591eaab68c9f3117a741f27c716;hpb=d43baf2c1b499a05cebc171550f3891d0cf53537;p=geeqie.git

diff --git a/configure.ac b/configure.ac
index 2bd4ca7a..41b1f9b0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,7 +15,7 @@ dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 dnl GNU General Public License for more details.
 
 AC_PREREQ(2.57)
-AC_INIT([geeqie], m4_translit(m4_esyscmd([git tag --list v[1-9]* | tail --lines=1 | tr --delete 'v' && echo "+git" && git log --max-count=1 --date=format:"%Y%m%d" --format="%ad" && echo "-" && git rev-parse --quiet --verify --short HEAD]), m4_newline), [geeqie@freelists.org], [], [http://www.geeqie.org/])
+AC_INIT([geeqie], m4_translit(m4_esyscmd([if [ $(git tag --list 'v[1-9]*' --points-at HEAD | wc -c) -gt 0 ]; then git tag --list v[1-9]* --points-at HEAD | tail -n 1 | tr -d 'v' ; else git tag --list v[1-9]* | tail -n 1 | tr -d 'v' && echo "+git" && git log --max-count=1 --date=format:"%Y%m%d" --format="%ad" && echo "-" && git rev-parse --quiet --verify --short HEAD; fi ]), m4_newline), [geeqie@freelists.org], [], [http://www.geeqie.org/])
 
 # Add -Werror to the default CFLAGS
 CFLAGS+=" -Werror -Wno-error=deprecated-declarations -Wno-error=sign-compare -Wno-error=return-type"
@@ -25,7 +25,7 @@ AC_CONFIG_SRCDIR([src/main.c])
 
 AC_CONFIG_AUX_DIR(auxdir)
 # Require Automake 1.14 for %reldir% support
-AM_INIT_AUTOMAKE([1.14.1 subdir-objects foreign dist-xz no-dist-gzip])
+AM_INIT_AUTOMAKE([1.14.1 subdir-objects foreign dist-xz no-dist-gzip tar-ustar])
 
 AC_CONFIG_HEADER([config.h])
 
@@ -368,6 +368,31 @@ AM_CONDITIONAL(HAVE_TIFF, [test "x$HAVE_TIFF" = xyes])
 AC_SUBST(TIFF_CFLAGS)
 AC_SUBST(TIFF_LIBS)
 
+#  libraw support
+# ----------------------------------------------------------------------
+
+AC_ARG_ENABLE([raw],
+  AC_HELP_STRING([--disable-raw], [disable LibRaw support]),
+    [libraw=$enableval], [libraw=auto])
+
+if test "x${libraw}" != "xno"; then
+  PKG_CHECK_MODULES(RAW, [libraw >= 0.20],
+    [
+      HAVE_RAW=yes
+      AC_DEFINE(HAVE_RAW, 1, [define to enable libraw support])
+    ],
+    [
+      HAVE_RAW=no
+      AC_MSG_WARN([$RAW_PKG_ERRORS])
+    ])
+else
+  HAVE_RAW=disabled
+fi
+
+AM_CONDITIONAL(HAVE_RAW, [test "x$HAVE_RAW" = xyes])
+AC_SUBST(RAW_CFLAGS)
+AC_SUBST(RAW_LIBS)
+
 #  libffmpegthumbnailer support
 # ----------------------------------------------------------------------
 
@@ -635,6 +660,31 @@ AM_CONDITIONAL(HAVE_WEBP, [test "x$HAVE_WEBP" = xyes])
 AC_SUBST(WEBP_CFLAGS)
 AC_SUBST(WEBP_LIBS)
 
+#  Libarchive support
+# ----------------------------------------------------------------------
+
+AC_ARG_ENABLE([archive],
+  AC_HELP_STRING([--disable-archive], [disable archive support]),
+    [libarchive=$enableval], [libarchive=auto])
+
+if test "x${libarchive}" != "xno"; then
+  PKG_CHECK_MODULES(ARCHIVE, libarchive >= 3.4.0,
+    [
+      HAVE_ARCHIVE=yes
+      AC_DEFINE(HAVE_ARCHIVE, 1, [define to enable archive support])
+    ],
+    [
+      HAVE_ARCHIVE=no
+      AC_MSG_WARN([$ARCHIVE_PKG_ERRORS])
+    ])
+else
+    HAVE_ARCHIVE=disabled
+fi
+
+AM_CONDITIONAL(HAVE_ARCHIVE, [test "x$HAVE_ARCHIVE" = xyes])
+AC_SUBST(ARCHIVE_CFLAGS)
+AC_SUBST(ARCHIVE_LIBS)
+
 #  J2K support
 # ----------------------------------------------------------------------
 
@@ -685,6 +735,31 @@ AM_CONDITIONAL(HAVE_DJVU, [test "x$HAVE_DJVU" = xyes])
 AC_SUBST(DJVU_CFLAGS)
 AC_SUBST(DJVU_LIBS)
 
+#  JPEG XL support
+# ----------------------------------------------------------------------
+
+AC_ARG_ENABLE([jpegxl],
+  AC_HELP_STRING([--disable-jpegxl], [disable jpeg xl support]),
+    [libjxl=$enableval], [libjxl=auto])
+
+if test "x${libjxl}" != "xno"; then
+  PKG_CHECK_MODULES(JPEGXL, libjxl >= 0.3.7,
+    [
+      HAVE_JPEGXL=yes
+      AC_DEFINE(HAVE_JPEGXL, 1, [define to enable JPEG XL support])
+    ],
+    [
+      HAVE_JPEGXL=no
+      AC_MSG_WARN([$JPEGXL_PKG_ERRORS])
+    ])
+else
+    HAVE_JPEGXL=disabled
+fi
+
+AM_CONDITIONAL(HAVE_JPEGXL, [test "x$HAVE_JPEGXL" = xyes])
+AC_SUBST(JPEGXL_CFLAGS)
+AC_SUBST(JPEGXL_LIBS)
+
 #  Markdown support
 # ----------------------------------------------------------------------
 
@@ -784,7 +859,7 @@ Flags:
   Gtk:           $GTK_CFLAGS
   Glib:          $GLIB_CFLAGS
   Thread:        $GTHREAD_LIBS
-  Others:	 $JPEG_LIBS $TIFF_LIBS $LCMS_LIBS $EXIV2_LIBS $CLUTTER_LIBS $CLUTTER_GTK_LIBS $LIBCHAMPLAIN_LIBS $LIBCHAMPLAIN_GTK_LIBS $LUA_LIBS
+  Others:	 $JPEG_LIBS $TIFF_LIBS $LCMS_LIBS $EXIV2_LIBS $CLUTTER_LIBS $CLUTTER_GTK_LIBS $LIBCHAMPLAIN_LIBS $LIBCHAMPLAIN_GTK_LIBS $LUA_LIBS $RAW_LIBS $JPEGXL_LIBS
 
 Localization:
   NLS support:   $USE_NLS
@@ -810,6 +885,9 @@ Support:
   WebP:	         $HAVE_WEBP
   DjVu:	         $HAVE_DJVU
   J2K:	         $HAVE_J2K
+  LibRaw:        $HAVE_RAW
+  Libjxl:        $HAVE_JPEGXL
+  Libarchive:    $HAVE_ARCHIVE
 
 Documentation:
   Doxygen:       $DX_DOXYGEN