Rework some of the autofoo that goes along with making exif optional.

SVN revision: 28766
master
titan 16 years ago committed by titan
parent 5c5e86cec4
commit 6c3c399d8d
  1. 38
      configure.in
  2. 2
      src/bin/Makefile.am
  3. 3
      src/bin/config.h.in

@ -67,25 +67,25 @@ dnl Set PACKAGE_SOURCE_DIR in config.h.
packagesrcdir=`cd $srcdir && pwd`
AC_DEFINE_UNQUOTED(PACKAGE_SOURCE_DIR, "${packagesrcdir}", [Source code directory])
AC_CHECK_HEADERS(sqlite3.h,
SQLITE_LIBS="$SQLITE_LIBS -lsqlite3",
AC_MSG_ERROR([Ephoto needs sqlite3 to compile.])
)
AC_SUBST(SQLITE_LIBS)
if pkg-config --exists sqlite3; then
have_sqlite3="Yes"
else
have_sqlite3="No"
AC_MSG_ERROR([Ephoto needs sqlite3 to compile.])
fi
if pkg-config --exists 'libexif >= 0.6.13'; then
have_exif="Yes"
AC_DEFINE(BUILD_EXIF_SUPPORT, 1, [Enable Exif Support])
else
have_exif="No"
fi
PKG_CHECK_MODULES([SQLITE], sqlite3,
[
have_sqlite3="Yes"
],
[
have_sqlite3="No"
AC_MSG_ERROR([Ephoto needs sqlite3 to compile.])
]
)
PKG_CHECK_MODULES([EXIF], libexif >= 0.6.13,
[
have_exif="Yes"
AC_DEFINE(BUILD_EXIF_SUPPORT, 1, [Enable Exif Support])
],
[
have_exif="No"
]
)
PROG="evas-config";
AC_PATH_PROG(EVAS_CONFIG, $PROG, "", $PATH)

@ -18,7 +18,7 @@ ephoto_SOURCES = ephoto.c \
ephoto_CFLAGS = @ewl_cflags@ -Wall -Werror
ephoto_LDADD = @ewl_libs@ -lsqlite3 -lexif
ephoto_LDADD = @ewl_libs@ @SQLITE_LIBS@ @EXIF_LIBS@
EXTRA_DIST = \
ephoto.h

@ -26,9 +26,6 @@
/* Define to 1 if you have the <memory.h> header file. */
#undef HAVE_MEMORY_H
/* Define to 1 if you have the <sqlite3.h> header file. */
#undef HAVE_SQLITE3_H
/* Define to 1 if you have the <stdint.h> header file. */
#undef HAVE_STDINT_H

Loading…
Cancel
Save