--- sql/pgsql/libltdl/Makefile.am	2001/09/21 15:44:38	1.1
+++ sql/pgsql/libltdl/Makefile.am	2003/01/13 15:50:02	1.4
@@ -2,16 +2,32 @@
 
 AUTOMAKE_OPTIONS = no-dependencies foreign
 
+if INSTALL_LTDL
+include_HEADERS = ltdl.h
+lib_LTLIBRARIES = libltdl.la
+else
 noinst_HEADERS = ltdl.h
+endif
+
+if CONVENIENCE_LTDL
 noinst_LTLIBRARIES = libltdlc.la
+endif
+
+## Make sure these will be cleaned even when they're not built by
+## default.
+CLEANFILES = libltdl.la libltdlc.la
+
+libltdl_la_SOURCES = ltdl.c
+libltdl_la_LDFLAGS = -no-undefined -version-info 4:0:1
+libltdl_la_LIBADD = $(LIBADD_DL)
 
 libltdlc_la_SOURCES = ltdl.c
 libltdlc_la_LIBADD = $(LIBADD_DL)
 
 ## Because we do not have automatic dependency tracking:
-ltdl.lo: ltdl.h config.h
+ltdl.lo: ltdl.h config_auto.h
 
-$(OBJECTS): libtool
+$(OBJECTS) $(libltdl_la_OBJECTS) $(libltdlc_la_OBJECTS): libtool
 libtool: $(LIBTOOL_DEPS)
 	$(SHELL) ./config.status --recheck
 
@@ -30,3 +46,6 @@ local-install-files: $(DISTFILES)
 	    || cp $$d/$$file $(DESTDIR)$(datadir)/libtool/libltdl/$$file || :; \
 	  fi; \
 	done
+
+EXTRA_DIST=config_fixed.h libltdl.dsp
+