Author: abrander
Date: 2011-04-14 01:11:04 +0200 (Thu, 14 Apr 2011)
New Revision: 4006
Modified:
trunk/configure.in
trunk/plugins/output-flickr/Makefile.am
Log:
Made flickcurl requirement explicit and local.
Modified: trunk/configure.in
===================================================================
--- trunk/configure.in 2011-04-13 23:05:23 UTC (rev 4005)
+++ trunk/configure.in 2011-04-13 23:11:04 UTC (rev 4006)
@@ -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 flickcurl
x11 gthread-2.0"
+pkg_modules="gtk+-2.0 >= 2.8.0 libxml-2.0 >= 2.4 gconf-2.0 >= 2.0 x11
gthread-2.0"
PKG_CHECK_MODULES(PACKAGE, [$pkg_modules])
AC_SUBST(PACKAGE_CFLAGS)
AC_SUBST(PACKAGE_LIBS)
@@ -120,6 +120,10 @@
AC_SUBST(LIBCURL_CFLAGS)
AC_SUBST(LIBCURL_LIBS)
+PKG_CHECK_MODULES(FLICKCURL, [flickcurl])
+AC_SUBST(FLICKCURL_CFLAGS)
+AC_SUBST(FLICKCURL_LIBS)
+
GETTEXT_PACKAGE=rawstudio
AC_SUBST(GETTEXT_PACKAGE)
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package.])
Modified: trunk/plugins/output-flickr/Makefile.am
===================================================================
--- trunk/plugins/output-flickr/Makefile.am 2011-04-13 23:05:23 UTC (rev
4005)
+++ trunk/plugins/output-flickr/Makefile.am 2011-04-13 23:11:04 UTC (rev
4006)
@@ -9,7 +9,7 @@
INCLUDES = \
-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
- @PACKAGE_CFLAGS@ @LIBCURL_CFLAGS@ \
+ @PACKAGE_CFLAGS@ @LIBCURL_CFLAGS@ @FLICKCURL_CFLAGS@ \
-I$(top_srcdir)/librawstudio/ \
-I$(top_srcdir)/
@@ -17,7 +17,7 @@
libdir = $(datadir)/rawstudio/plugins/
-output_flickr_la_LIBADD = @PACKAGE_LIBS@ @LIBCURL_LIBS@
+output_flickr_la_LIBADD = @PACKAGE_LIBS@ @LIBCURL_LIBS@ @FLICKCURL_LIBS@
output_flickr_la_LDFLAGS = -module -avoid-version -L/usr/lib -lflickcurl
output_flickr_la_SOURCES = output-flickr.c output-flickr.h
_______________________________________________
Rawstudio-commit mailing list
[email protected]
http://rawstudio.org/cgi-bin/mailman/listinfo/rawstudio-commit
