-dnl checks for functions
-AC_CHECK_FUNCS(strverscmp)
-
-dnl check for little cms (lcms, this test pulled from gimp)
-AC_ARG_WITH(lcms, [ --without-lcms build without lcms support])
-
-have_lcms=no
-if test "x$with_lcms" != "xno"; then
- AC_CHECK_LIB(lcms, cmsCreate_sRGBProfile, [
- AC_CHECK_HEADER(lcms.h,
- have_lcms=yes, [
- AC_CHECK_HEADER(lcms/lcms.h,
- have_lcms=yes
- AC_DEFINE(HAVE_LCMS_LCMS_H, 1,
- [Define to 1 if the lcms header must be included as lcms/lcms.h]))
+threads="auto"
+AC_ARG_ENABLE([threads],
+ AC_HELP_STRING([--disable-threads], [disable thread support]), [threads="${enableval}"])
+
+have_gthread="no"
+if test "x${threads}" != "xno" ; then
+ PKG_CHECK_MODULES(GTHREAD, [gthread-2.0], have_gthread="yes", [AC_MSG_WARN("No thread support in glib")])
+fi
+
+if test "x$have_gthread" != "xno"; then
+ AC_DEFINE(HAVE_GTHREAD, 1, Define if you have gthread library)
+ GLIB_CFLAGS="$GTHREAD_CFLAGS"
+ GLIB_LIBS="$GTHREAD_LIBS"
+fi
+
+
+AC_PATH_PROGS(GDK_PIXBUF_CSOURCE, "gdk-pixbuf-csource")
+AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
+
+AC_ARG_WITH(readmedir, [ --with-readmedir=DIR install path for readme files],
+ readmedir=$withval, readmedir="$prefix/share/doc/geeqie-$VERSION")
+AC_ARG_WITH(htmldir, [ --with-htmldir=DIR install path for html files],
+ htmldir=$withval, htmldir="$readmedir/html")
+
+AC_DEFINE_UNQUOTED(GQ_HELPDIR, "$readmedir", [Location of documentation files])
+AC_DEFINE_UNQUOTED(GQ_HTMLDIR, "$htmldir", [Location of html documentation])
+
+AC_PATH_PROG(GNOME_DOC_TOOL, gnome-doc-tool)
+
+AC_SUBST(readmedir)
+AC_SUBST(htmldir)
+
+eval "eval appdir=${datadir}/${PACKAGE}"
+AC_DEFINE_UNQUOTED([GQ_APP_DIR], "$appdir", [Location of application data])
+AC_SUBST(appdir)
+
+eval "eval gq_bindir=${prefix}/lib/${PACKAGE}"
+AC_DEFINE_UNQUOTED([GQ_BIN_DIR], "$gq_bindir", [Location of helper scripts and executables])
+AC_SUBST(gq_bindir)
+
+# LIRC support
+# ----------------------------------------------------------------------
+
+dnl Check for LIRC client support
+AC_MSG_CHECKING(if LIRC support is enabled)
+lirc=no
+AC_ARG_ENABLE([lirc],
+ AC_HELP_STRING([--disable-lirc], [disable lirc support (auto)]),
+[
+if test "x${enableval}" = "xyes" -a "x$GCC" = "xyes"; then
+ AC_MSG_RESULT(yes)
+ lirc=yes
+else
+ AC_MSG_RESULT(no)
+ lirc=no
+fi], AC_MSG_RESULT(no))
+
+
+AC_ARG_WITH(lirc-prefix,
+[ --with-lirc-prefix=PATH Prefix where LIRC is installed],
+[
+for dir in `echo "$withval" | tr : ' '`; do
+ if test -d $dir/lib; then CXXFLAGS="$CXXFLAGS -L$dir/lib"; fi
+ if test -d $dir/include; then CXXFLAGS="$CXXFLAGS -I$dir/include"; fi
+ done
+])
+
+HAVE_LIRC=no
+if test "x${lirc}" != "xno" ; then
+ AC_CHECK_HEADER(lirc/lirc_client.h,
+ [AC_CHECK_LIB(lirc_client,lirc_init,[HAVE_LIRC=yes;LIBS=-llirc_client $LIBS;AC_DEFINE([HAVE_LIRC],[],[Define to 1 if LIRC must be used])],,)],)
+fi
+AM_CONDITIONAL(HAVE_LIRC, [test "x$HAVE_LIRC" = xyes])
+
+
+# LCMS support
+# ----------------------------------------------------------------------
+
+AC_ARG_ENABLE([lcms],
+ AC_HELP_STRING([--disable-lcms], [disable lcms support]),
+ [liblcms=$enableval], [liblcms=auto])
+
+if test "x${liblcms}" != "xno"; then
+ PKG_CHECK_MODULES(LCMS, [lcms2 >= 2.0],
+ [
+ HAVE_LCMS=yes
+ AC_DEFINE(HAVE_LCMS, 1, [define to enable use of color profiles with lcms])
+ AC_DEFINE(HAVE_LCMS2, 1, [lcms2 is used])
+ ],
+ [
+ PKG_CHECK_MODULES(LCMS, [lcms >= 1.14],
+ [
+ HAVE_LCMS=yes
+ AC_DEFINE(HAVE_LCMS, 1, [define to enable use of color profiles with lcms])
+ ],
+ [
+ HAVE_LCMS=no
+ AC_MSG_WARN([$LCMS_PKG_ERRORS])