contrib: move into daemon

Rationale: only daemon uses it and it simplifies packaging, where
daemon is the top-level directory.

Change-Id: Id99bd61f2b0269e0fc594c1782cd7945120acf49

daemon/configure.ac

@@ -96,10 +96,10 @@ AC_ARG_WITH(contrib,
 ])
 AC_MSG_CHECKING([for 3rd party libraries path])
 AS_IF([test -z "${with_contrib}" || test "${with_contrib}" = "yes"], [
-  CONTRIB_DIR="${srcdir}/../contrib/${host}"
+  CONTRIB_DIR="${srcdir}/contrib/${host}"
   AS_IF([test ! -d "${CONTRIB_DIR}"], [
     echo "${CONTRIB_DIR} not found" >&AS_MESSAGE_LOG_FD
-    CONTRIB_DIR="${srcdir}/../contrib/`$CC -dumpmachine`"
+    CONTRIB_DIR="${srcdir}/contrib/`$CC -dumpmachine`"
     AS_IF([test ! -d "${CONTRIB_DIR}"], [
       echo "${CONTRIB_DIR} not found" >&AS_MESSAGE_LOG_FD
       CONTRIB_DIR=""