autotools: fix dependency declaration

Change-Id: Ib1eb25f11fccd51424012bb11d5e8586fcc8e575

configure.ac

@@ -428,10 +428,7 @@ AS_IF([test "x$enable_ringns" != "xno"],
   [PKG_CHECK_MODULES(LIBCRYPTO, libcrypto,,
      AC_MSG_ERROR([Missing libcrypto development files]))
    PKG_CHECK_MODULES(LIBSSL, libssl,,
-     AC_MSG_ERROR([Missing libssl development files]))
-   LIBS="${LIBS} -lssl -lcrypto"
-   AS_IF([test "${HAVE_WIN32}" = "1"],
-     [LIBS="${LIBS} -lssleay32 -leay32"])],
+     AC_MSG_ERROR([Missing libssl development files]))],
   []);
 
 dnl Check for libav
@@ -503,7 +500,8 @@ AS_IF([test "x$enable_video" != "xno" -a "x$enable_accel" != "xno"],
 AM_CONDITIONAL([RING_ACCEL], [test "x${ring_accel}" = "xyes"])
 
 dnl check for GnuTLS
-PKG_CHECK_MODULES([GNUTLS], [gnutls >= 3.6.7], [HAVE_GNUTLS=1], [HAVE_GNUTLS=0])
+PKG_CHECK_MODULES([GNUTLS], [gnutls >= 3.6.7], [], AC_MSG_ERROR([gnutls not found]))
+PKG_CHECK_MODULES([NETTLE], [nettle >= 3.0.0], [], AC_MSG_ERROR([nettle not found]))
 
 # PTHREAD
 # required dependency: libxpat
@@ -668,7 +666,6 @@ AC_CONFIG_FILES([Makefile \
                  test/Makefile\
                  test/sip/Makefile
                  test/unitTest/Makefile \
-
                  man/Makefile \
                  doc/Makefile \
                  doc/doxygen/Makefile])

src/Makefile.am

@@ -53,82 +53,56 @@ libring_la_LIBADD = \
 	./jamidht/libringacc.la \
 	./im/libim.la \
 	$(ENABLE_PLUGIN_LIBS) \
-	$(ENABLE_VIDEO_LIBS)
-
-libring_la_LDFLAGS = \
-		@PJPROJECT_LIBS@ \
-		@ALSA_LIBS@ \
-		@PULSEAUDIO_LIBS@ \
-		@YAMLCPP_LIBS@ \
-		@JSONCPP_LIBS@ \
-		@SPEEXDSP_LIBS@ \
-		@LIBUPNP_LIBS@ \
-		@PORTAUDIO_LIBS@ \
-		@GNUTLS_LIBS@ \
-		@OPENDHT_LIBS@ \
-		@SECP256K1_LIBS@ \
-		@ZLIB_LIBS@ \
-		@LIBSSL_LIBS@ \
-		@LIBCRYPTO_LIBS@ \
-		@LIBAVCODEC_LIBS@ \
-		@LIBAVFORMAT_LIBS@ \
-		@LIBAVDEVICE_LIBS@ \
-		@LIBAVFILTER_LIBS@ \
-		@LIBSWRESAMPLE_LIBS@ \
-		@LIBSWSCALE_LIBS@ \
-		@LIBAVUTIL_LIBS@ \
-		@LIBGIT2_LIBS@ \
-		@FMT_LIBS@ \
-		@LIBS@ \
-		@WEBRTC_LIBS@ \
-		$(AM_LDFLAGS)
+	$(ENABLE_VIDEO_LIBS) \
+	$(ALSA_LIBS) \
+	$(PULSEAUDIO_LIBS) \
+	$(PORTAUDIO_LIBS) \
+	$(SPEEXDSP_LIBS) \
+	$(PJPROJECT_LIBS) \
+	$(OPENDHT_LIBS) \
+	$(LIBUPNP_LIBS) \
+	$(LIBGIT2_LIBS) \
+	$(LIBAVCODEC_LIBS) \
+	$(LIBAVFORMAT_LIBS) \
+	$(LIBAVDEVICE_LIBS) \
+	$(LIBAVFILTER_LIBS) \
+	$(LIBSWRESAMPLE_LIBS) \
+	$(LIBSWSCALE_LIBS) \
+	$(LIBAVUTIL_LIBS) \
+	$(WEBRTC_LIBS) \
+	$(YAMLCPP_LIBS) \
+	$(JSONCPP_LIBS) \
+	$(NETTLE_LIBS) \
+	$(SECP256K1_LIBS) \
+	$(FMT_LIBS) \
+	$(LIBSSL_LIBS) \
+	$(LIBCRYPTO_LIBS) \
+	$(ARCHIVE_LIBS) \
+	$(ZLIB_LIBS)
 
 if ENABLE_PLUGIN
 if HAVE_OSX
-libring_la_LDFLAGS += \
-		@MINIZIP_LIBS@
+libring_la_LIBADD += \
+		$(MINIZIP_LIBS)
 else
-libring_la_LDFLAGS += \
-		@ARCHIVE_LIBS@
+libring_la_LIBADD += \
+		$(ARCHIVE_LIBS)
 endif
 endif
 
 
 if HAVE_WIN32
-libring_la_LDFLAGS += -no-undefined -avoid-version
+libring_la_LDFLAGS = $(AM_LDFLAGS) -no-undefined -avoid-version
 endif
 
 if HAVE_OSX
 #FIXME necessary for -lintl
-libring_la_LDFLAGS += -L/usr/local/opt/gettext/lib
-endif
-
-libring_la_CFLAGS = \
-		@PJPROJECT_CFLAGS@ \
-		@ALSA_CFLAGS@ \
-		@PULSEAUDIO_CFLAGS@ \
-		@LIBUPNP_CFLAGS@ \
-		@SPEEXDSP_CFLAGS@ \
-		@PORTAUDIO_CFLAGS@ \
-		@GNUTLS_CFLAGS@ \
-		@OPENDHT_CFLAGS@ \
-		@FMT_CFLAGS@ \
-		@LIBAVCODEC_CFLAGS@ \
-		@LIBAVFORMAT_CFLAGS@ \
-		@LIBAVUTIL_CFLAGS@ \
-		@LIBAVDEVICE_CFLAGS@ \
-		@LIBAVFILTER_CFLAGS@ \
-		@LIBSWRESAMPLE_CFLAGS@ \
-		@LIBSWSCALE_CFLAGS@ \
-		@LIBGIT2_CFLAGS@ \
-		@WEBRTC_CFLAGS@ \
-		$(AM_CFLAGS)
-
-libring_la_CXXFLAGS = $(AM_CXXFLAGS)
+libring_la_LDFLAGS = $(AM_LDFLAGS) -L/usr/local/opt/gettext/lib
+endif
 
 if HAVE_LINUX
 #needed to compile the .so
-libring_la_CXXFLAGS += -fPIC
+libring_la_CXXFLAGS = $(AM_CXXFLAGS) -fPIC
 endif
 
 libring_la_SOURCES = \

src/jamidht/Makefile.am

@@ -6,8 +6,7 @@ AM_CPPFLAGS += -I$(top_srcdir)/src/jamidht/eth
 
 noinst_LTLIBRARIES = libringacc.la
 
-libringacc_la_LIBADD = $(DHT_LIBS) \
-    ./eth/libdevcore/libdevcore.la \
+libringacc_la_LIBADD = ./eth/libdevcore/libdevcore.la \
     ./eth/libdevcrypto/libdevcrypto.la
 
 libringacc_la_SOURCES = \

test/unitTest/Makefile.am

@@ -2,7 +2,8 @@
 include $(top_srcdir)/globals.mk
 
 AM_CXXFLAGS += -I$(top_srcdir)/src
-AM_LDFLAGS += $(CPPUNIT_LIBS) $(top_builddir)/src/libring.la
+AM_LDFLAGS += $(CPPUNIT_LIBS)
+LDADD = $(top_builddir)/src/libring.la
 check_PROGRAMS =
 
 ####### Unit Test ########
@@ -18,14 +19,12 @@ ut_account_factory_SOURCES = account_factory/testAccount_factory.cpp common.cpp
 #
 check_PROGRAMS += ut_certstore
 ut_certstore_SOURCES = certstore.cpp common.cpp
-ut_certstore_LDADD = @OPENDHT_LIBS@
 
 #
 # scheduler
 #
 check_PROGRAMS += ut_scheduler
 ut_scheduler_SOURCES = scheduler.cpp common.cpp
-ut_scheduler_LDADD = @OPENDHT_LIBS@
 
 #
 # base64