소스 검색

libdpkg: Link unit tests with libcompat and libintl

Because the unit tests might end up pulling arbitrary libdpkg modules,
we need to link to these libraries in case they are needed on the
system.
Guillem Jover 15 년 전
부모
커밋
ad176b184b
2개의 변경된 파일6개의 추가작업 그리고 1개의 파일을 삭제
  1. 2 0
      debian/changelog
  2. 4 1
      lib/dpkg/test/Makefile.am

+ 2 - 0
debian/changelog

@@ -5,6 +5,8 @@ dpkg (1.16.2) UNRELEASED; urgency=low
     use the configured features and compat code.
     use the configured features and compat code.
   * Honour --disable-nls when the system lacks obstack support, by updating
   * Honour --disable-nls when the system lacks obstack support, by updating
     the obstack compat module from gnulib.
     the obstack compat module from gnulib.
+  * Link the libdpkg unit tests with libcompat and libintl, so that systems
+    needing them will compile correctly.
 
 
   [ Updated man page translations ]
   [ Updated man page translations ]
   * German (Helge Kreutzmann).
   * German (Helge Kreutzmann).

+ 4 - 1
lib/dpkg/test/Makefile.am

@@ -5,7 +5,10 @@ AM_CPPFLAGS = \
 	-idirafter $(top_srcdir)/lib/compat \
 	-idirafter $(top_srcdir)/lib/compat \
 	-I$(top_builddir) \
 	-I$(top_builddir) \
 	-I$(top_srcdir)/lib
 	-I$(top_srcdir)/lib
-LDADD = ../libdpkg.a
+LDADD = \
+	$(top_builddir)/lib/dpkg/libdpkg.a \
+	$(top_builddir)/lib/compat/libcompat.a \
+	$(LIBINTL)
 
 
 
 
 # The tests are sorted in order of increasing complexity.
 # The tests are sorted in order of increasing complexity.