Move the hiredis_libevent2 code from common to relay (#1509)

The point of this change is to make the build instructions a bit more
straight forward. Since the hiresevent2 source files are only ever used
by the relay target, this scoping makes sense in general.

Makefile.in

@@ -24,8 +24,8 @@ IMPL_HEADERS = src/apps/relay/ns_ioalib_impl.h src/apps/relay/ns_sm.h src/apps/r
 IMPL_MODS = src/apps/relay/ns_ioalib_engine_impl.c src/apps/relay/turn_ports.c src/apps/relay/http_server.c src/apps/relay/acme.c
 IMPL_DEPS = ${COMMON_DEPS} ${IMPL_HEADERS} ${IMPL_MODS}
 
-HIREDIS_HEADERS = src/apps/common/hiredis_libevent2.h
-HIREDIS_MODS = src/apps/common/hiredis_libevent2.c
+HIREDIS_HEADERS = src/apps/relay/hiredis_libevent2.h
+HIREDIS_MODS = src/apps/relay/hiredis_libevent2.c
 
 USERDB_HEADERS = src/apps/relay/dbdrivers/dbdriver.h src/apps/relay/dbdrivers/dbd_sqlite.h src/apps/relay/dbdrivers/dbd_pgsql.h src/apps/relay/dbdrivers/dbd_mysql.h src/apps/relay/dbdrivers/dbd_mongo.h src/apps/relay/dbdrivers/dbd_redis.h
 USERDB_MODS = src/apps/relay/dbdrivers/dbdriver.c src/apps/relay/dbdrivers/dbd_sqlite.c src/apps/relay/dbdrivers/dbd_pgsql.c src/apps/relay/dbdrivers/dbd_mysql.c src/apps/relay/dbdrivers/dbd_mongo.c src/apps/relay/dbdrivers/dbd_redis.c

src/apps/common/CMakeLists.txt

@@ -52,15 +52,6 @@ else()
         message(FATAL_ERROR "Must set Libevent")
     endif()
 endif()
-
-find_package(hiredis)
-if(hiredis_FOUND)
-    list(APPEND SOURCE_FILES hiredis_libevent2.c)
-    list(APPEND HEADER_FILES hiredis_libevent2.h)
-    list(APPEND COMMON_LIBS hiredis::hiredis)
-else()
-    list(APPEND COMMON_DEFINED TURN_NO_HIREDIS)
-endif()
 message("COMMON_LIBS:${COMMON_LIBS}")
 
 add_library(${PROJECT_NAME} STATIC ${SOURCE_FILES} ${HEADER_FILES})

src/apps/relay/CMakeLists.txt

@@ -98,8 +98,8 @@ endif()
 find_package(hiredis)
 if(hiredis_FOUND)
     list(APPEND turnserver_LIBS hiredis::hiredis)
-    list(APPEND SOURCE_FILES dbdrivers/dbd_redis.c)
-    list(APPEND HEADER_FILES dbdrivers/dbd_redis.h)
+    list(APPEND SOURCE_FILES hiredis_libevent2.c dbdrivers/dbd_redis.c)
+    list(APPEND HEADER_FILES hiredis_libevent2.h dbdrivers/dbd_redis.h)
 else()
     list(APPEND turnserver_DEFINED TURN_NO_HIREDIS)
 endif()

src/apps/relay/dbdrivers/dbd_redis.c

@@ -33,7 +33,7 @@
 #include "../mainrelay.h"
 
 #if !defined(TURN_NO_HIREDIS)
-#include "hiredis_libevent2.h"
+#include "../hiredis_libevent2.h"
 #include <hiredis/hiredis.h>
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////

src/apps/relay/dbdrivers/dbd_redis.h

@@ -32,8 +32,8 @@
 #ifndef __DBD_REDIS__
 #define __DBD_REDIS__
 
+#include "../hiredis_libevent2.h"
 #include "dbdriver.h"
-#include "hiredis_libevent2.h"
 
 #ifdef __cplusplus
 extern "C" {