X-Git-Url: http://geeqie.org/cgi-bin/gitweb.cgi?p=geeqie.git;a=blobdiff_plain;f=configure.ac;h=799128bc7066243996ea7512083aad8863dfa13e;hp=2ba122f1fb0d0d2b172bb506c20d296ab165eea0;hb=24e7bb7be54da3d0d2d12c2031f5f4fc1dee739e;hpb=c9ea0d5b58270f360530ccf70d0a90758fe47490

diff --git a/configure.ac b/configure.ac
index 2ba122f1..799128bc 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_esyscmd_s(git rev-parse --quiet --verify --short HEAD), [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])
 
@@ -190,6 +190,8 @@ AM_CONDITIONAL(MS_LIB_AVAILABLE, test x$ms_librarian = xyes)
 AM_CONDITIONAL(HAVE_WINDRES, test "x$WINDRES" != "x:")
 AC_SUBST(WINDRES)
 
+AM_CONDITIONAL([EXTERNAL_PREFIX], [test "x$prefix" != "xNONE"])
+
 dnl reasonable guesses for where stuff is installed
 if test "x$prefix" = "xNONE"; then
   prefix="/usr/local"
@@ -366,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
 # ----------------------------------------------------------------------
 
@@ -782,7 +809,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
 
 Localization:
   NLS support:   $USE_NLS
@@ -808,6 +835,7 @@ Support:
   WebP:	         $HAVE_WEBP
   DjVu:	         $HAVE_DJVU
   J2K:	         $HAVE_J2K
+  LibRaw:        $HAVE_RAW
 
 Documentation:
   Doxygen:       $DX_DOXYGEN