Author: abrander
Date: 2011-04-14 00:21:32 +0200 (Thu, 14 Apr 2011)
New Revision: 4003
Modified:
trunk/configure.in
trunk/librawstudio/Makefile.am
trunk/plugins/output-facebook/Makefile.am
trunk/plugins/output-flickr/Makefile.am
trunk/plugins/output-picasa/Makefile.am
Log:
Made libcurl requirement explicit and local.
Modified: trunk/configure.in
===================================================================
--- trunk/configure.in 2011-04-13 22:05:40 UTC (rev 4002)
+++ trunk/configure.in 2011-04-13 22:21:32 UTC (rev 4003)
@@ -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 libcurl
flickcurl libssl x11"
+pkg_modules="gtk+-2.0 >= 2.8.0 libxml-2.0 >= 2.4 gconf-2.0 >= 2.0 flickcurl
libssl x11"
PKG_CHECK_MODULES(PACKAGE, [$pkg_modules])
AC_SUBST(PACKAGE_CFLAGS)
AC_SUBST(PACKAGE_LIBS)
@@ -116,6 +116,10 @@
AC_SUBST(DBUS_CFLAGS)
AC_SUBST(DBUS_LIBS)
+PKG_CHECK_MODULES(LIBCURL, [libcurl])
+AC_SUBST(LIBCURL_CFLAGS)
+AC_SUBST(LIBCURL_LIBS)
+
GETTEXT_PACKAGE=rawstudio
AC_SUBST(GETTEXT_PACKAGE)
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package.])
Modified: trunk/librawstudio/Makefile.am
===================================================================
--- trunk/librawstudio/Makefile.am 2011-04-13 22:05:40 UTC (rev 4002)
+++ trunk/librawstudio/Makefile.am 2011-04-13 22:21:32 UTC (rev 4003)
@@ -9,7 +9,7 @@
INCLUDES = \
-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
- @PACKAGE_CFLAGS@ @LENSFUN_CFLAGS@
+ @PACKAGE_CFLAGS@ @LENSFUN_CFLAGS@ @LIBCURL_CFLAGS@
library_includedir=$(includedir)/@PACKAGE@-@VERSION@/
library_include_HEADERS = rawstudio.h rs-types.h rs-macros.h \
@@ -113,7 +113,7 @@
rs-gui-functions.c rs-gui-functions.h \
rs-stock.c rs-stock.h
-librawstudio_2_0_la_LIBADD = @PACKAGE_LIBS@ @SQLITE3_LIBS@ @LENSFUN_LIBS@
@EXIV2_LIBS@ $(INTLLIBS)
+librawstudio_2_0_la_LIBADD = @PACKAGE_LIBS@ @SQLITE3_LIBS@ @LENSFUN_LIBS@
@EXIV2_LIBS@ @LIBCURL_LIBS@ $(INTLLIBS)
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = rawstudio-2.0.pc
Modified: trunk/plugins/output-facebook/Makefile.am
===================================================================
--- trunk/plugins/output-facebook/Makefile.am 2011-04-13 22:05:40 UTC (rev
4002)
+++ trunk/plugins/output-facebook/Makefile.am 2011-04-13 22:21:32 UTC (rev
4003)
@@ -10,7 +10,7 @@
INCLUDES = \
-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
- @PACKAGE_CFLAGS@ \
+ @PACKAGE_CFLAGS@ @LIBCURL_CFLAGS@ \
-I$(top_srcdir)/librawstudio/ \
-I$(top_srcdir)/
@@ -18,11 +18,11 @@
libdir = $(datadir)/rawstudio/plugins/
-output_facebook_la_LIBADD = @PACKAGE_LIBS@
+output_facebook_la_LIBADD = @PACKAGE_LIBS@ @LIBCURL_LIBS@
output_facebook_la_LDFLAGS = -module -avoid-version -L/usr/lib -lcurl
output_facebook_la_SOURCES = output-facebook.c output-facebook.h \
rs-facebook-client.c rs-facebook-client.h \
rs-facebook-client-param.c rs-facebook-client-param.h
plugin_DATA = facebook-logo.svg
-EXTRA_DIST = $(plugin_DATA)
\ No newline at end of file
+EXTRA_DIST = $(plugin_DATA)
Modified: trunk/plugins/output-flickr/Makefile.am
===================================================================
--- trunk/plugins/output-flickr/Makefile.am 2011-04-13 22:05:40 UTC (rev
4002)
+++ trunk/plugins/output-flickr/Makefile.am 2011-04-13 22:21:32 UTC (rev
4003)
@@ -9,7 +9,7 @@
INCLUDES = \
-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
- @PACKAGE_CFLAGS@ \
+ @PACKAGE_CFLAGS@ @LIBCURL_CFLAGS@ \
-I$(top_srcdir)/librawstudio/ \
-I$(top_srcdir)/
@@ -17,10 +17,10 @@
libdir = $(datadir)/rawstudio/plugins/
-output_flickr_la_LIBADD = @PACKAGE_LIBS@
+output_flickr_la_LIBADD = @PACKAGE_LIBS@ @LIBCURL_LIBS@
output_flickr_la_LDFLAGS = -module -avoid-version -L/usr/lib -lflickcurl
output_flickr_la_SOURCES = output-flickr.c output-flickr.h
plugin_DATA = flickr-logo.svg
-EXTRA_DIST = $(plugin_DATA)
\ No newline at end of file
+EXTRA_DIST = $(plugin_DATA)
Modified: trunk/plugins/output-picasa/Makefile.am
===================================================================
--- trunk/plugins/output-picasa/Makefile.am 2011-04-13 22:05:40 UTC (rev
4002)
+++ trunk/plugins/output-picasa/Makefile.am 2011-04-13 22:21:32 UTC (rev
4003)
@@ -9,7 +9,7 @@
INCLUDES = \
-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
- @PACKAGE_CFLAGS@ \
+ @PACKAGE_CFLAGS@ @LIBCURL_CFLAGS@ \
-I$(top_srcdir)/librawstudio/ \
-I$(top_srcdir)/
@@ -17,10 +17,10 @@
libdir = $(datadir)/rawstudio/plugins/
-output_picasa_la_LIBADD = @PACKAGE_LIBS@
+output_picasa_la_LIBADD = @PACKAGE_LIBS@ @LIBCURL_LIBS@
output_picasa_la_LDFLAGS = -module -avoid-version -L/usr/lib
output_picasa_la_SOURCES = output-picasa.c rs-picasa-client.c
rs-picasa-client.h
plugin_DATA = picasa-logo.svg
-EXTRA_DIST = $(plugin_DATA)
\ No newline at end of file
+EXTRA_DIST = $(plugin_DATA)
_______________________________________________
Rawstudio-commit mailing list
[email protected]
http://rawstudio.org/cgi-bin/mailman/listinfo/rawstudio-commit
