diff --git a/libraries/Makefile.am b/libraries/Makefile.am
index 3ca8123d152809b0f6bd24b526a9563dca5818dd..71ce0e203f3e344dd4dc8ed794e4592ef320e3bd 100644 (file)
--- a/libraries/Makefile.am
+++ b/libraries/Makefile.am
-SUBDIRS = cgilib-0.4 zlib-1.1.3 libpng-1.2.0 libart_lgpl-2.3.7 freetype-2.0.5
+CGILIB=@CGI_LIB_DIR@
+ZLIB=@ZLIB_LIB_DIR@
+LIBPNG=@PNG_LIB_DIR@
+LIBART=@ART_LIB_DIR@
+FREETYPE=@FREETYPE_LIB_DIR@
+
+if !USE_INSTALLED_libcgi
+BUILD_CGI=$(CGILIB)
+endif
+if !USE_INSTALLED_libz
+BUILD_ZLIB=$(ZLIB)
+endif
+if !USE_INSTALLED_libpng
+BUILD_LIBPNG=$(LIBPNG)
+endif
+if !USE_INSTALLED_libart_lgpl
+BUILD_LIBART=$(LIBART)
+endif
+if !USE_INSTALLED_libfreetype
+BUILD_FREETYPE=$(FREETYPE)
+endif
+
+SUBDIRS=$(BUILD_CGI) $(BUILD_ZLIB) $(BUILD_LIBPNG) $(BUILD_LIBART) $(BUILD_FREETYPE) afm
+
+DIST_SUBDIRS=$(CGILIB) $(ZLIB) $(LIBPNG) $(LIBART) $(FREETYPE)