[gegl] build: Add lensfun to build deps
- From: Mukund Sivaraman <muks src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gegl] build: Add lensfun to build deps
- Date: Tue, 30 Aug 2011 14:25:50 +0000 (UTC)
commit b336a2677d6faaf6d94c6291c1d5f5ddbd045a6e
Author: Mukund Sivaraman <muks banu com>
Date: Tue Aug 30 19:50:50 2011 +0530
build: Add lensfun to build deps
configure.ac | 20 ++++++++++++++++++++
operations/workshop/Makefile.am | 12 +++++++++++-
2 files changed, 31 insertions(+), 1 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 46349c3..fe3bd9d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -43,6 +43,7 @@ m4_define([gdk_pixbuf_required_version], [2.18.0])
m4_define([glib_required_version], [2.22.0])
m4_define([graphviz_required_version], [0.0.0])
m4_define([jasper_required_version], [1.900.1])
+m4_define([lensfun_required_version], [0.2.5])
m4_define([librsvg_required_version], [2.14.0])
m4_define([lua_required_version], [5.1.0])
m4_define([openexr_required_version], [0.0.0])
@@ -628,6 +629,25 @@ AM_CONDITIONAL(HAVE_GDK_PIXBUF, test "$have_gdk_pixbuf" = "yes")
###################
+# Check for lensfun
+###################
+
+AC_ARG_WITH(lensfun, [ --without-lensfun build without lensfun support])
+
+have_lensfun="no"
+if test "x$with_lensfun" != "xno"; then
+ PKG_CHECK_MODULES(LENSFUN, lensfun,
+ have_lensfun="yes",
+ have_lensfun="no (lensfun not found)")
+fi
+
+AM_CONDITIONAL(HAVE_LENSFUN, test "$have_lensfun" = "yes")
+
+AC_SUBST(LENSFUN_CFLAGS)
+AC_SUBST(LENSFUN_LIBS)
+
+
+###################
# Check for libjpeg
###################
diff --git a/operations/workshop/Makefile.am b/operations/workshop/Makefile.am
index d84dfcd..fb204a0 100644
--- a/operations/workshop/Makefile.am
+++ b/operations/workshop/Makefile.am
@@ -1,4 +1,14 @@
SUBDIRS = generated external
include $(top_srcdir)/operations/Makefile-operations.am
-AM_CPPFLAGS += -I$(top_srcdir)/operations/workshop
\ No newline at end of file
+AM_CPPFLAGS += -I$(top_srcdir)/operations/workshop
+
+# Add to Makefile.am when you move lens-correct out of the workshop, or
+# figure out how the current system works.
+
+#if HAVE_LENSFUN
+#ops += lens-correct.la
+#lens_correct_la_SOURCES = lens-correct.c lens-correct.h
+#lens_correct_la_LIBADD = $(op_libs) $(LENSFUN_LIBS)
+#lens_correct_la_CFLAGS = $(AM_CFLAGS) $(LENSFUN_CFLAGS)
+#endif
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]