Merge branch '1.8.0' into 1.8.1

diff --combined configure.ac.in
index 004f3e1,d68f088..ebef3f8
--- 1/configure.ac.in
--- 2/configure.ac.in
+++ b/configure.ac.in
@@@ -3,9 -3,9 +3,9 @@@
  dnl major, minor and micro version macros.
  m4_define([conky_version_major], [1])
  m4_define([conky_version_minor], [8])
 -m4_define([conky_version_micro], [0])
 +m4_define([conky_version_micro], [1])
  m4_define([conky_version_tag], [pre]) dnl [] for releases
 -m4_define([conky_version_revision],[_rc3])
 +m4_define([conky_version_revision],[_pre@REVISION@])
  m4_define([conky_version],
      [conky_version_major().conky_version_minor().conky_version_micro()ifelse(
        conky_version_tag(), [pre],
@@@ -544,8 -544,9 +544,9 @@@ AC_ARG_ENABLE([wlan]
  AM_CONDITIONAL(BUILD_WLAN, test x$want_wlan = xyes)
  if test x$want_wlan = xyes; then
    AC_CHECK_HEADERS([iwlib.h], [], AC_MSG_ERROR([iwlib.h header not found]))
-   AC_CHECK_LIB([iw], [iw_sockets_open], [conky_LIBS="$conky_LIBS -liw"], AC_MSG_ERROR([iw_sockets_open not found]))
-       AC_DEFINE(HAVE_IWLIB, 1, [Define if you want wireless support])
+   AC_CHECK_LIB([iw], [iw_sockets_open], [conky_LIBS="-liw $conky_LIBS"],
+                AC_MSG_ERROR([iw_sockets_open not found]), [$conky_LIBS])
+   AC_DEFINE(HAVE_IWLIB, 1, [Define if you want wireless support])
  fi
  
  dnl