build: fixed unit1394 for debug and metlink builds

diff --git a/src/Makefile.am b/src/Makefile.am
index 9cf15455b437b05e9fe676acf37045c68563d02e..72e6772002bf55762d6da9547cebb0f7cbc1739b 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -69,6 +69,7 @@ curl_DEPENDENCIES = $(top_builddir)/lib/libcurl.la
 # if unit tests are enabled, build a static library to link them with
 if BUILD_UNITTESTS
 noinst_LTLIBRARIES = libcurltool.la
+libcurltool_la_CPPFLAGS = $(LIBMETALINK_CPPFLAGS) $(AM_CPPFLAGS)
 libcurltool_la_CFLAGS = -DUNITTESTS
 libcurltool_la_LDFLAGS = -static $(LINKFLAGS)
 libcurltool_la_SOURCES = $(curl_SOURCES)

diff --git a/tests/unit/Makefile.inc b/tests/unit/Makefile.inc
index a99b9ee6d2eb66c23daa88c15d0ff3319e8cab78..372f5e67b1327b2b88e8eb84789832a58a460292 100644 (file)
--- a/tests/unit/Makefile.inc
+++ b/tests/unit/Makefile.inc
@@ -39,5 +39,7 @@ unit1330_SOURCES = unit1330.c $(UNITFILES)
 unit1330_CPPFLAGS = $(AM_CPPFLAGS)
 
 unit1394_SOURCES = unit1394.c $(UNITFILES)
-unit1394_CPPFLAGS = $(AM_CPPFLAGS)
-
+unit1394_CPPFLAGS = $(AM_CPPFLAGS) $(LIBMETALINK_CPPFLAGS)
+unit1394_LDADD = @LIBMETALINK_LIBS@ $(top_builddir)/lib/libcurl.la @LIBCURL_LIBS@
+unit1394_LDFLAGS = @LIBMETALINK_LDFLAGS@ $(top_builddir)/src/libcurltool.la
+unit1394_LIBS =