qcdm: fix some build errors when building standalone

libqcdm/configure.ac

@@ -14,15 +14,15 @@ AC_CONFIG_MACRO_DIR([m4])
 
 AC_CONFIG_HEADERS(config.h)
 
+dnl Define _GNU_SOURCE for various things like strcasestr()
+AC_GNU_SOURCE
+
 dnl Required programs
 AC_PROG_CC
 AM_PROG_CC_C_O
 AC_PROG_INSTALL
 AC_PROG_LIBTOOL
 
-dnl Define _GNU_SOURCE for various things like strcasestr()
-AC_GNU_SOURCE
-
 dnl
 dnl Tests
 dnl
@@ -38,6 +38,8 @@ case $with_tests in
         ;;
 esac
 
+AM_CONDITIONAL(STANDALONE, test "yes" = "yes")
+
 AC_CONFIG_FILES([
 Makefile
 src/Makefile

libqcdm/tests/Makefile.am

@@ -1,5 +1,6 @@
 INCLUDES = \
-	-I$(top_srcdir)/libqcdm/src
+	-I$(top_srcdir)/libqcdm/src \
+	-I$(top_srcdir)/src
 
 noinst_PROGRAMS = test-qcdm
 
@@ -16,12 +17,15 @@ test_qcdm_SOURCES = \
 	test-qcdm-result.h \
 	test-qcdm.c
 
-test_qcdm_CPPFLAGS = \
-	$(MM_CFLAGS)
+test_qcdm_CPPFLAGS = $(MM_CFLAGS)
 
-test_qcdm_LDADD = \
-	$(top_builddir)/libqcdm/src/libqcdm.la \
-	$(MM_LIBS)
+test_qcdm_LDADD = $(MM_LIBS)
+
+if STANDALONE
+test_qcdm_LDADD += $(top_builddir)/src/libqcdm.la
+else
+test_qcdm_LDADD += $(top_builddir)/libqcdm/src/libqcdm.la
+endif
 
 if WITH_TESTS