[Xfce4-commits] [apps/xfce4-screenshooter] 05/14: Check for curl, json-glib and libsexy presence.

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

landry pushed a commit to branch master
in repository apps/xfce4-screenshooter.

commit d3c0c0ce5e88271b6f01b70e404af9e9b40ca5e4
Author: Landry Breuil <landry at xfce.org>
Date:   Fri Dec 12 22:44:41 2014 +0100

    Check for curl, json-glib and libsexy presence.
    
    link screenshooter-imgur.c and .h to the build.
    add {CURL|JSON_GLIB|SEXY}_{CFLAGS_LIBS} where appropriate
    
    All this should be made conditional of course....
---
 Makefile.am     |   19 +++++++++++++++++++
 configure.ac.in |    3 +++
 2 files changed, 22 insertions(+)

diff --git a/Makefile.am b/Makefile.am
index 86693ea..cbcbb39 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -32,6 +32,7 @@ lib_libscreenshooter_la_SOURCES =	\
 	lib/screenshooter-job.c lib/screenshooter-job.h \
 	lib/screenshooter-simple-job.c lib/screenshooter-simple-job.h \
 	lib/screenshooter-utils.c lib/screenshooter-utils.h \
+	lib/screenshooter-imgur.c lib/screenshooter-imgur.h \
 	lib/screenshooter-zimagez.c lib/screenshooter-zimagez.h
 
 lib_libscreenshooter_la_CFLAGS = \
@@ -43,6 +44,9 @@ lib_libscreenshooter_la_CFLAGS = \
 	@LIBXFCE4UTIL_CFLAGS@ \
 	@LIBXFCE4UI_CFLAGS@ \
 	@SOUP_CFLAGS@ \
+	@CURL_CFLAGS@ \
+	@JSON_GLIB_CFLAGS@ \
+	@SEXY_CFLAGS@ \
 	@XFIXES_CFLAGS@ \
   -DPACKAGE_LOCALE_DIR=\"$(localedir)\"
 
@@ -54,8 +58,11 @@ lib_libscreenshooter_la_LIBADD = \
 	@LIBXFCE4UI_LIBS@ \
   @GLIB_LIBS@ \
 	@SOUP_LIBS@ \
+	@CURL_LIBS@ \
+	@JSON_GLIB_LIBS@ \
 	@LIBXEXT_LIBS@ \
 	@LIBX11_LIBS@ \
+	@SEXY_LIBS@ \
 	@XFIXES_LIBS@
 
 lib_libscreenshooter_built_sources = \
@@ -91,6 +98,9 @@ src_xfce4_screenshooter_CFLAGS = \
 	@LIBXFCE4UI_CFLAGS@ \
 	@GTHREAD_CFLAGS@ \
 	@SOUP_CFLAGS@ \
+	@CURL_CFLAGS@ \
+	@JSON_GLIB_CFLAGS@ \
+	@SEXY_CFLAGS@ \
 	-DPACKAGE_LOCALE_DIR=\"$(localedir)\"
 
 src_xfce4_screenshooter_LDFLAGS = \
@@ -99,6 +109,9 @@ src_xfce4_screenshooter_LDFLAGS = \
 	@GLIB_LIBS@ \
 	@GTHREAD_LIBS@ \
 	@SOUP_LIBS@ \
+	@CURL_LIBS@ \
+	@JSON_GLIB_LIBS@ \
+	@SEXY_LIBS@ \
 	@LIBXFCE4UTIL_LIBS@ \
 	@LIBXFCE4UI_LIBS@
 
@@ -132,6 +145,9 @@ panel_plugin_libscreenshooterplugin_la_CFLAGS =	\
 	@LIBXFCE4PANEL_CFLAGS@ \
 	@LIBXFCE4UI_CFLAGS@ \
 	@GTHREAD_CFLAGS@ \
+	@CURL_CFLAGS@ \
+	@JSON_GLIB_CFLAGS@ \
+	@SEXY_CFLAGS@ \
 	@SOUP_CFLAGS@
 
 panel_plugin_libscreenshooterplugin_la_LDFLAGS = \
@@ -146,6 +162,9 @@ panel_plugin_libscreenshooterplugin_la_LIBADD = \
 	@LIBXFCE4PANEL_LIBS@ \
 	@GTHREAD_LIBS@ \
 	@SOUP_LIBS@ \
+	@CURL_LIBS@ \
+	@JSON_GLIB_LIBS@ \
+	@SEXY_LIBS@ \
 	@LIBXFCE4UI_LIBS@ \
 	lib/libscreenshooter.la
 
diff --git a/configure.ac.in b/configure.ac.in
index 14aa3ad..f81c022 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -56,6 +56,9 @@ XDT_CHECK_PACKAGE([SOUP], [libsoup-2.4], [2.26.0])
 XDT_CHECK_PACKAGE([EXO], [exo-1], [0.5.0])
 XDT_CHECK_PACKAGE([LIBXEXT], [xext], [1.0.0])
 XDT_CHECK_OPTIONAL_PACKAGE([XFIXES], [xfixes], [4.0.0], [xfixes], [XFIXES extension support])
+XDT_CHECK_OPTIONAL_PACKAGE([CURL], [libcurl], [7.19], [curl], [curl for imgur.com support])
+XDT_CHECK_OPTIONAL_PACKAGE([SEXY], [libsexy], [0.1], [sexy], [libsexy for imgur.com support])
+XDT_CHECK_OPTIONAL_PACKAGE([JSON_GLIB], [json-glib-1.0], [0.7.6], [json-glib], [json-glib for imgur.com support])
 XDT_CHECK_LIBX11()
 
 dnl ******************************

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.