diff --git a/Makefile.in b/Makefile.in index b5f2c54..0e5ba62 100644 --- a/Makefile.in +++ b/Makefile.in @@ -17,7 +17,7 @@ AR = @AR@ ARFLAGS = @ARFLAGS@ ARCHFLAGS = @ARCHFLAGS@ CC = @CC@ -CFLAGS = $(OPTIM) $(ARCHFLAGS) @CFLAGS@ @CPPFLAGS@ @PTHREAD_FLAGS@ -DZIPC_ONLY_WRITE +CFLAGS = $(OPTIM) $(ARCHFLAGS) @CFLAGS@ @CPPFLAGS@ @PTHREAD_FLAGS@ CP = @CP@ DSO = @DSO@ DSOFLAGS = @DSOFLAGS@ @@ -151,7 +151,7 @@ install: $(TARGETS) install-$(LIBMXML) install-libmxml.a $(INSTALL_DATA) mxml.pc $(BUILDROOT)$(libdir)/pkgconfig echo Installing man pages in $(BUILDROOT)$(mandir)... $(INSTALL_DIR) $(BUILDROOT)$(mandir)/man3 - $(INSTALL_MAN) doc/mxml.man $(BUILDROOT)$(mandir)/man3/mxml.3 + $(INSTALL_MAN) doc/mxml.3 $(BUILDROOT)$(mandir)/man3/mxml.3 install-libmxml.a: libmxml.a echo Installing libmxml.a to $(BUILDROOT)$(libdir)... @@ -168,13 +168,6 @@ install-libmxml.so.1.6: libmxml.so.1.6 $(RM) $(BUILDROOT)$(libdir)/libmxml.so.1 $(LN) libmxml.so.1.6 $(BUILDROOT)$(libdir)/libmxml.so.1 -install-libmxml.sl.1: libmxml.sl.1 - echo Installing libmxml.sl to $(BUILDROOT)$(libdir)... - $(INSTALL_DIR) $(BUILDROOT)$(libdir) - $(INSTALL_LIB) libmxml.sl.1 $(BUILDROOT)$(libdir) - $(RM) $(BUILDROOT)$(libdir)/libmxml.so - $(LN) libmxml.sl.1 $(BUILDROOT)$(libdir)/libmxml.sl - install-libmxml.1.dylib: libmxml.1.dylib echo Installing libmxml.dylib to $(BUILDROOT)$(libdir)... $(INSTALL_DIR) $(BUILDROOT)$(libdir) @@ -207,11 +200,6 @@ uninstall-libmxml.so.1.6: $(RM) $(BUILDROOT)$(libdir)/libmxml.so.1 $(RM) $(BUILDROOT)$(libdir)/libmxml.so.1.4 -uninstall-libmxml.sl.1: - echo Uninstalling libmxml.sl from $(BUILDROOT)$(libdir)... - $(RM) $(BUILDROOT)$(libdir)/libmxml.sl - $(RM) $(BUILDROOT)$(libdir)/libmxml.sl.1 - uninstall-libmxml.1.dylib: echo Uninstalling libmxml.dylib from $(BUILDROOT)$(libdir)... $(RM) $(BUILDROOT)$(libdir)/libmxml.dylib @@ -265,17 +253,6 @@ libmxml.so.1.6: $(LIBOBJS) $(LN) libmxml.so.1.6 libmxml.so.1 -# -# libmxml.sl.1 -# - -libmxml.sl.1: $(LIBOBJS) - echo Creating $@... - $(DSO) $(DSOFLAGS) $(LDFLAGS) -o libmxml.sl.1 $(LIBOBJS) $(LIBS) - $(RM) libmxml.sl - $(LN) libmxml.sl.1 libmxml.sl - - # # libmxml.1.dylib # diff --git a/configure b/configure index c3a0540..350eab4 100755 --- a/configure +++ b/configure @@ -4461,23 +4461,6 @@ $as_echo "yes" >&6; } LDFLAGS="$LDFLAGS -R\$(libdir)" ;; - hp-ux) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - LIBMXML="libmxml.sl.1" - DSO="ld" - DSOFLAGS="$DSOFLAGS -b -z +h libmxml.sl.1 +s +b \$(libdir)" - LDFLAGS="$LDFLAGS -Wl,+s,+b,\$(libdir)" - ;; - - irix) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - LIBMXML="libmxml.so.1.6" - DSO="\$(CC)" - DSOFLAGS="$DSOFLAGS -Wl,-rpath,\$(libdir),-set_version,sgi1.0,-soname,libmxml.so.1 -shared \$(OPTIM)" - ;; - linux*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } diff --git a/configure.ac b/configure.ac index cb03901..a23e608 100644 --- a/configure.ac +++ b/configure.ac @@ -182,21 +182,6 @@ if test x$enable_shared != xno; then LDFLAGS="$LDFLAGS -R\$(libdir)" ;; - hp-ux) - AC_MSG_RESULT(yes) - LIBMXML="libmxml.sl.1" - DSO="ld" - DSOFLAGS="$DSOFLAGS -b -z +h libmxml.sl.1 +s +b \$(libdir)" - LDFLAGS="$LDFLAGS -Wl,+s,+b,\$(libdir)" - ;; - - irix) - AC_MSG_RESULT(yes) - LIBMXML="libmxml.so.1.6" - DSO="\$(CC)" - DSOFLAGS="$DSOFLAGS -Wl,-rpath,\$(libdir),-set_version,sgi1.0,-soname,libmxml.so.1 -shared \$(OPTIM)" - ;; - linux*) AC_MSG_RESULT(yes) LIBMXML="libmxml.so.1.6"