Merge branch 'master' of git.omp.am:/home/omp/git/conky

Conflicts:
	configure.ac.in

diff --cc configure.ac.in
index 976647b,dbbca22..4faf564
--- 1/configure.ac.in
--- 2/configure.ac.in
+++ b/configure.ac.in
@@@ -363,14 -359,18 +363,14 @@@ AC_ARG_ENABLE([xoap]
              [want_xoap="$enableval"], [want_xoap=no])
  #
  AM_CONDITIONAL(BUILD_WEATHER, test x$want_weather = xyes)
+ AM_CONDITIONAL(BUILD_XOAP, test x$want_xoap = xyes)
  if test x$want_weather = xyes; then
-       AM_CONDITIONAL(BUILD_XOAP, test x$want_xoap = xyes)
 -        if test x$want_xoap = xyes; then
 -         PKG_CHECK_MODULES([libxml2], libxml-2.0)
 -         conky_CFLAGS="$conky_CFLAGS $libxml2_CFLAGS"
 -         conky_LIBS="$conky_LIBS $libxml2_LIBS"
 -         AC_DEFINE(XOAP, 1, [Define if you want weather xoap support])
 -         AC_DEFINE(XOAP_FILE, "$HOME/.xoaprc", [User xoap keys file])
 +      if test x$want_xoap = xyes; then
 +              want_libxml2=yes
 +              AC_DEFINE(XOAP, 1, [Define if you want weather xoap support])
 +              AC_DEFINE(XOAP_FILE, "$HOME/.xoaprc", [User xoap keys file])
        fi
 -      PKG_CHECK_MODULES([libcurl], libcurl)
 -      conky_CFLAGS="$conky_CFLAGS $libcurl_CFLAGS"
 -      conky_LIBS="$conky_LIBS $libcurl_LIBS"
 +      want_curl=yes
        AC_DEFINE(WEATHER, 1, [Define if you want weather support])
  fi
  

diff --cc src/Makefile.am
index 0301788,a3f9099..e8c5cb3
--- 1/src/Makefile.am
--- 2/src/Makefile.am
+++ b/src/Makefile.am
@@@ -246,10 -240,9 +246,10 @@@ EXTRA_DIST = 
        ibm.c                   \
        ibm.h                   \
        sony.h                  \
 -      users.c                 \
 -      imlib2.c                \
 -      imlib2.h
 +      users.c                 \
 +      imlib2.c                \
 +      imlib2.h                \
 +      ccurl_thread.h
  
  
- # vi:set ts=4 sw=4 noet ai nocindent syntax=automake:
+ # vi:set ts=8 sw=8 noet ai nocindent syntax=automake:

diff --cc src/conky.c
Simple merge