Author: abrander
Date: 2011-04-13 23:32:29 +0200 (Wed, 13 Apr 2011)
New Revision: 3996
Modified:
trunk/configure.in
trunk/src/Makefile.am
Log:
Made gphoto requirement explicit and local.
Modified: trunk/configure.in
===================================================================
--- trunk/configure.in 2011-04-13 21:29:03 UTC (rev 3995)
+++ trunk/configure.in 2011-04-13 21:32:29 UTC (rev 3996)
@@ -83,7 +83,7 @@
fi
AC_SUBST(LIBTIFF)
-pkg_modules="gtk+-2.0 >= 2.8.0 libxml-2.0 >= 2.4 gconf-2.0 >= 2.0 dbus-1 exiv2
fftw3f libcurl flickcurl libssl libgphoto2 x11"
+pkg_modules="gtk+-2.0 >= 2.8.0 libxml-2.0 >= 2.4 gconf-2.0 >= 2.0 dbus-1 exiv2
fftw3f libcurl flickcurl libssl x11"
PKG_CHECK_MODULES(PACKAGE, [$pkg_modules])
AC_SUBST(PACKAGE_CFLAGS)
AC_SUBST(PACKAGE_LIBS)
@@ -100,6 +100,10 @@
AC_SUBST(LCMS_CFLAGS)
AC_SUBST(LCMS_LIBS)
+PKG_CHECK_MODULES(LIBGPHOTO2, [libgphoto2])
+AC_SUBST(LIBGPHOTO2_CFLAGS)
+AC_SUBST(LIBGPHOTO2_LIBS)
+
GETTEXT_PACKAGE=rawstudio
AC_SUBST(GETTEXT_PACKAGE)
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package.])
Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am 2011-04-13 21:29:03 UTC (rev 3995)
+++ trunk/src/Makefile.am 2011-04-13 21:32:29 UTC (rev 3996)
@@ -3,7 +3,7 @@
INCLUDES = \
-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
- @PACKAGE_CFLAGS@ @LENSFUN_CFLAGS@ \
+ @PACKAGE_CFLAGS@ @LENSFUN_CFLAGS@ @LIBGPHOTO2_CFLAGS@ \
-I$(top_srcdir)/librawstudio/ \
-I$(top_srcdir)/
@@ -47,5 +47,5 @@
rs-tag-gui.c rs-tag-gui.h\
rs-tethered-shooting.c rs-tethered-shooting.h
-rawstudio_LDADD = ../librawstudio/librawstudio-@[email protected] @PACKAGE_LIBS@
@LENSFUN_LIBS@ $(INTLLIBS)
+rawstudio_LDADD = ../librawstudio/librawstudio-@[email protected] @PACKAGE_LIBS@
@LENSFUN_LIBS@ @LIBGPHOTO2_LIBS@ $(INTLLIBS)
_______________________________________________
Rawstudio-commit mailing list
[email protected]
http://rawstudio.org/cgi-bin/mailman/listinfo/rawstudio-commit
