From 696e536a50045e6b9252b200c749247205771d16 Mon Sep 17 00:00:00 2001 From: ian Date: Wed, 13 Oct 1999 02:31:03 +0000 Subject: [PATCH] + * Dynamic library building works properly. @@ -2,6 +2,7 @@ Bugfixes: + * Dynamic library building works properly. --- changelog | 1 + configure | 10 +++++----- configure.in | 10 +++++----- dynamic/Makefile.in | 3 ++- 4 files changed, 13 insertions(+), 11 deletions(-) diff --git a/changelog b/changelog index 9b90e2a..835d1cc 100644 --- a/changelog +++ b/changelog @@ -2,6 +2,7 @@ adns (0.6) unstable; urgency=medium Bugfixes: * Do not fail assertion if _qf_owner, _qf_search, domain ends in `.'. + * Dynamic library building works properly. -- diff --git a/configure b/configure index 07699c0..35b062d 100755 --- a/configure +++ b/configure @@ -1398,15 +1398,15 @@ fi -SHLIBCC='$(CC) $(CFLAGS) -fpic' -MKSHLIB_1='$(CC) $(LDFLAGS) -shared -Wxl,soname=$(SONAME) -o' -MKSHLIB_2='' -MKSHLIB_3='-lc' - SHLIBFORLINK='libadns.so' SHLIBSONAME='$(SHLIBFORLINK).$(MAJOR)' SHLIBFILE='$(SHLIBSONAME).$(MINOR)' +SHLIBCC='$(CC) $(CFLAGS) -fpic' +MKSHLIB_1='$(CC) $(LDFLAGS) -shared -Wl,-soname=$(SHLIBSONAME) -o' +MKSHLIB_2='' +MKSHLIB_3='-lc' + trap '' 1 2 15 cat > confcache <<\EOF # This file is a shell script that caches the results of configure diff --git a/configure.in b/configure.in index 671f26e..12b2d18 100644 --- a/configure.in +++ b/configure.in @@ -77,15 +77,15 @@ AC_SUBST(SHLIBFORLINK) AC_SUBST(SHLIBFILE) AC_SUBST(SHLIBSONAME) -SHLIBCC='$(CC) $(CFLAGS) -fpic' -MKSHLIB_1='$(CC) $(LDFLAGS) -shared -Wxl,soname=$(SONAME) -o' -MKSHLIB_2='' -MKSHLIB_3='-lc' - SHLIBFORLINK='libadns.so' SHLIBSONAME='$(SHLIBFORLINK).$(MAJOR)' SHLIBFILE='$(SHLIBSONAME).$(MINOR)' +SHLIBCC='$(CC) $(CFLAGS) -fpic' +MKSHLIB_1='$(CC) $(LDFLAGS) -shared -Wl,-soname=$(SHLIBSONAME) -o' +MKSHLIB_2='' +MKSHLIB_3='-lc' + AC_OUTPUT( settings.make Makefile src/Makefile client/Makefile dynamic/Makefile regress/Makefile diff --git a/dynamic/Makefile.in b/dynamic/Makefile.in index 87b95d7..ebff61c 100644 --- a/dynamic/Makefile.in +++ b/dynamic/Makefile.in @@ -32,9 +32,10 @@ ALLOBJS= $(addsuffix _p.o, $(basename $(LIBOBJS))) install: $(INSTALL_PROGRAM) $(SHLIBFILE) $(lib_dir)/$(SHLIBFILE) + ln -s $(SHLIBFILE) $(lib_dir)/$(SHLIBSONAME) uninstall: - rm -f $(lib_dir)/$(SHLIBFILE) + rm -f $(lib_dir)/$(SHLIBFILE) $(lib_dir)/$(SHLIBSONAME) $(SHLIBFORLINK): ln -s $(SHLIBSONAME) $(SHLIBFORLINK) -- 2.30.2