@@ -159,31 +159,7 @@ endif

 if USE_INTERNAL_MSPACK

 SUBDIRS += libmspack-0.5alpha

 libclamav_la_CFLAGS += -I@top_srcdir@/libclamav/libmspack-0.5alpha/mspack

-libclamav_la_LIBADD +=  @top_builddir@/libclamav/libmspack-0.5alpha/cabc.lo \

-			@top_builddir@/libclamav/libmspack-0.5alpha/system.lo \

-			@top_builddir@/libclamav/libmspack-0.5alpha/kwajd.lo \

-			@top_builddir@/libclamav/libmspack-0.5alpha/hlpc.lo \

-			@top_builddir@/libclamav/libmspack-0.5alpha/chmd.lo \

-			@top_builddir@/libclamav/libmspack-0.5alpha/qtmd.lo \

-			@top_builddir@/libclamav/libmspack-0.5alpha/litc.lo \

-			@top_builddir@/libclamav/libmspack-0.5alpha/oabc.lo \

-			@top_builddir@/libclamav/libmspack-0.5alpha/lzxd.lo \

-			@top_builddir@/libclamav/libmspack-0.5alpha/litd.lo \

-			@top_builddir@/libclamav/libmspack-0.5alpha/crc32.lo \

-			@top_builddir@/libclamav/libmspack-0.5alpha/lzssd.lo \

-			@top_builddir@/libclamav/libmspack-0.5alpha/kwajc.lo \

-			@top_builddir@/libclamav/libmspack-0.5alpha/cabd.lo \

-			@top_builddir@/libclamav/libmspack-0.5alpha/szddd.lo \

-			@top_builddir@/libclamav/libmspack-0.5alpha/lzxc.lo \

-			@top_builddir@/libclamav/libmspack-0.5alpha/mszipd.lo \

-			@top_builddir@/libclamav/libmspack-0.5alpha/szddc.lo \

-			@top_builddir@/libclamav/libmspack-0.5alpha/oabd.lo \

-			@top_builddir@/libclamav/libmspack-0.5alpha/chmc.lo \

-			@top_builddir@/libclamav/libmspack-0.5alpha/mszipc.lo \

-			@top_builddir@/libclamav/libmspack-0.5alpha/hlpd.lo

-COMMON_CLEANFILES+=@top_builddir@/libclamav/libmspack-0.5alpha/config.h \

-		   @top_builddir@/libclamav/libmspack-0.5alpha/libmspack.pc \

-		   @top_builddir@/libclamav/libmspack-0.5alpha/autom4te.cache/*

+libclamav_la_LIBADD += libmspack-0.5alpha/libclammspack.la

 else

 libclamav_la_CFLAGS += $(LIBMSPACK_CFLAGS)

 libclamav_la_LDFLAGS += $(LIBMSPACK_LIBS)

@@ -1,5 +1,5 @@

 pkgconfigdir =		$(libdir)/pkgconfig

-pkgconfig_DATA = 	libmspack.pc

+pkgconfig_DATA = 	libclammspack.pc

 dist-hook:

 	-rm -f $(distdir)/*.la

@@ -15,12 +15,12 @@ AM_CFLAGS +=		-Wall -Wextra -Wno-unused-parameter

 endif

 AM_CPPFLAGS =		-I$(top_srcdir)/mspack #-I$(top_srcdir)/test 

-lib_LTLIBRARIES =	libmspack.la

-include_HEADERS =	mspack/mspack.h

+lib_LTLIBRARIES =	libclammspack.la

+#include_HEADERS =	mspack/mspack.h

 noinst_LTLIBRARIES =	libmscabd.la libmschmd.la

-libmspack_la_SOURCES =	mspack/mspack.h \

+libclammspack_la_SOURCES =	mspack/mspack.h \

 			mspack/system.h mspack/system.c \

 			mspack/cab.h mspack/cabc.c mspack/cabd.c \

 			mspack/chm.h mspack/chmc.c mspack/chmd.c \

@@ -36,7 +36,7 @@ libmspack_la_SOURCES =	mspack/mspack.h \

 			mspack/lzss.h mspack/lzssd.c \

 			mspack/des.h mspack/sha.h \

 			mspack/crc32.c mspack/crc32.h

-libmspack_la_LDFLAGS =	-export-symbols-regex '^mspack_' -version-info 1:0:1

+libclammspack_la_LDFLAGS =	-export-symbols-regex '^mspack_' -version-info 1:0:1

 libmscabd_la_SOURCES =	mspack/mspack.h \

 			mspack/system.h mspack/system.c \

@@ -47,5 +47,5 @@ AC_SYS_LARGEFILE

 AC_FUNC_FSEEKO

 # Checks for library functions.

-AC_CONFIG_FILES([Makefile libmspack.pc])

+AC_CONFIG_FILES([Makefile libclammspack.pc])

 AC_OUTPUT

new file mode 100644

@@ -0,0 +1,10 @@

+prefix=@prefix@

+exec_prefix=@exec_prefix@

+libdir=@libdir@

+includedir=@includedir@

+

+Name: @PACKAGE@

+Description: Compressors and decompressors for Microsoft formats

+Version: @VERSION@

+Libs: -L${libdir} -lmspack

+Cflags: -I${includedir}

deleted file mode 100644

@@ -1,10 +0,0 @@

-prefix=@prefix@

-exec_prefix=@exec_prefix@

-libdir=@libdir@

-includedir=@includedir@

-

-Name: @PACKAGE@

-Description: Compressors and decompressors for Microsoft formats

-Version: @VERSION@

-Libs: -L${libdir} -lmspack

-Cflags: -I${includedir}