Use R_DYLIB_EXT instead of DYLIB_EXT for the R dylibs so that these

can use a version suffix where necessary (as is the case on OpenBSD).

git-svn-id: https://svn.r-project.org/R/trunk@68735 00db46b3-68df-0310-9c12-caf00c1e9a41

Makeconf.in

@@ -66,6 +66,7 @@ MAIN_LINK = $(MAIN_LD) $(MAIN_LDFLAGS) $(LIBR0) $(LDFLAGS)
 MKINSTALLDIRS = @R_SHELL@ $(top_srcdir)/src/scripts/mkinstalldirs.in
 NOTANGLE = @NOTANGLE@
 R_ARCH = @R_ARCH@
+R_DYLIB_EXT = @R_DYLIB_EXT@
 R_FRAMEWORK_DIR = $(prefix)/R.framework
 R_GZIPCMD = @R_GZIPCMD@
 ## needed for AIX only

Makefile.in

@@ -123,7 +123,7 @@ svnonly:
 	  fi \
 	fi
 
-@WANT_R_STATIC_FALSE@libR_la = libR$(DYLIB_EXT)
+@WANT_R_STATIC_FALSE@libR_la = libR$(R_DYLIB_EXT)
 @WANT_R_STATIC_TRUE@libR_la = libR.a
 install-libR:
 	@if test -f lib$(R_ARCH)/$(libR_la); then $(MAKE) install-libR-exists; fi
@@ -144,7 +144,7 @@ uninstall:
 	@rm -rf "$(DESTDIR)$(Rexecbindir)" "$(DESTDIR)$(rhome)/lib"
 	@rmdir "$(DESTDIR)$(rhome)" 2>/dev/null \
           || $(ECHO) "  dir $(DESTDIR)$(rhome) not removed"
-	@rm -f "$(DESTDIR)${libdir}/libR$(DYLIB_EXT)"
+	@rm -f "$(DESTDIR)${libdir}/libR$(R_DYLIB_EXT)"
 
 mostlyclean: clean
 clean:

configure.ac

@@ -1663,6 +1663,7 @@ dylib_ldflags="${SHLIB_LDFLAGS}"
 LIBR_LDFLAGS=""
 RLAPACK_LDFLAGS=""
 RBLAS_LDFLAGS=""
+R_DYLIB_VERSION_SUFFIX=""
 case "${host_os}" in
   aix*)
     ## Not needed for -brtl linking
@@ -1689,14 +1690,19 @@ case "${host_os}" in
     fi
     ;;
   openbsd*)
-    PACKAGE_VERSION_MAJOR=`echo "${PACKAGE_VERSION}" | \
-      sed -e "s/\.//" -e "s/\..*$//"`
-    PACKAGE_VERSION_MINOR=`echo "${PACKAGE_VERSION}" | \
-      sed -e "s/.*\.\([[^.]][[^.]]*$\)/\1/"`
-    DYLIB_EXT=".so.${PACKAGE_VERSION_MAJOR}.${PACKAGE_VERSION_MINOR}"
+    if test -z "${R_DYLIB_VERSION}"; then
+      PACKAGE_VERSION_MAJOR=`echo "${PACKAGE_VERSION}" | \
+        sed -e "s/\.//" -e "s/\..*$//"`
+      PACKAGE_VERSION_MINOR=`echo "${PACKAGE_VERSION}" | \
+        sed -e "s/.*\.\([[^.]][[^.]]*$\)/\1/"`
+      R_DYLIB_VERSION="${PACKAGE_VERSION_MAJOR}.${PACKAGE_VERSION_MINOR}"
+    fi
+    R_DYLIB_VERSION_SUFFIX=".${R_DYLIB_VERSION}"
     ;;
 esac
 
+R_DYLIB_EXT="${DYLIB_EXT}${R_DYLIB_VERSION_SUFFIX}"
+
 if test -z "${DYLIB_LD}"; then
   dylib_ld_was_given=no
   DYLIB_LD="${SHLIB_LD}"
@@ -1739,6 +1745,7 @@ AC_SUBST(LAPACK_LDFLAGS)
 AC_SUBST(FW_VERSION)
 AC_SUBST(STATICR1)
 AC_SUBST(STATICR2)
+AC_SUBST(R_DYLIB_EXT)
 
 ## C++11 and later
 R_CXX1X

src/appl/Makefile.in

@@ -31,7 +31,7 @@ DISTFILES = \
 @WANT_R_SHLIB_TRUE@ALL_CFLAGS = $(ALL_CFLAGS_LO)
 @WANT_R_SHLIB_TRUE@ALL_FFLAGS = $(ALL_FFLAGS_LO)
 
-Rblas_la = libRblas$(DYLIB_EXT)
+Rblas_la = libRblas$(R_DYLIB_EXT)
 Rblas_la_LIBADD = @DYLIB_UNDEFINED_ALLOWED_FALSE@ -flat_namespace -undefined suppress
 
 all: R

src/extra/blas/Makefile.in

@@ -16,7 +16,7 @@ ALL_FFLAGS = $(ALL_FFLAGS_LO)
 
 SOURCES = blas00.c blas.f cmplxblas.f
 
-Rblas_la = libRblas$(DYLIB_EXT)
+Rblas_la = libRblas$(R_DYLIB_EXT)
 ## @RBLAS_LDFLAGS@ is used on Mac OS X
 ## first for internal BLAS
 Rblas_la_LIBADD = @RBLAS_LDFLAGS@ $(FLIBS_IN_SO)

src/main/Makefile.in

@@ -108,7 +108,7 @@ R_bin_OBJECTS = Rmain.o @WANT_R_SHLIB_FALSE@$(OBJECTS)
 @WANT_R_SHLIB_TRUE@R_bin_LDADD = -lR @BLAS_SHLIB_TRUE@-lRblas
 @BUILD_LTO_FALSE@R_bin_DEPENDENCIES =@WANT_R_SHLIB_FALSE@ libR.a @USE_EXPORTFILES_TRUE@ $(top_builddir)/etc/R.exp
 
-libR_la = libR$(DYLIB_EXT)
+libR_la = libR$(R_DYLIB_EXT)
 libR_la_OBJECTS = $(OBJECTS)
 libR_la_LIBADD =  $(MAIN_OBJS) $(EXTRA_STATIC_LIBS) $(EXTRA_LIBS) @WANT_R_SHLIB_TRUE@ @USE_EXPORTFILES_TRUE@ -Wl,-bE:$(top_builddir)/etc/R.exp
 libR_la_DEPENDENCIES = $(STATIC_LIBS) $(R_TZONE) @WANT_R_SHLIB_TRUE@ @USE_EXPORTFILES_TRUE@ $(top_builddir)/etc/R.exp
@@ -221,14 +221,14 @@ install-strip-static: installdirs
 	fi
 uninstall:
 	@rm -f "$(DESTDIR)$(Rexecbindir)/exec/$(R_ARCH)/R" "$(DESTDIR)$(Rexecbindir)/R.bin"
-	@rm -f "$(DESTDIR)$(Rexeclibdir)/libR$(DYLIB_EXT)"
+	@rm -f "$(DESTDIR)$(Rexeclibdir)/libR$(R_DYLIB_EXT)"
 	@rm -f "$(DESTDIR)$(Rexeclibdir)/libR.a"
 
 mostlyclean: clean
 clean:
 	@-rm -f $(top_builddir)/etc/R.exp
 	@-rm -rf .libs _libs
-	@-rm -f *core Makedeps *.d *.o *.lo *.la *$(DYLIB_EXT) \
+	@-rm -f *core Makedeps *.d *.o *.lo *.la *$(R_DYLIB_EXT) \
 	  $(R_binary) libR.a
 distclean: clean
 	@-rm -f Makefile

src/modules/lapack/Makefile.in

@@ -34,7 +34,7 @@ DISTFILES = \
 	cmplx.f dlapack.f dlamch.f
 
 lapack_la = lapack$(SHLIB_EXT)
-Rlapack_la = libRlapack$(DYLIB_EXT)
+Rlapack_la = libRlapack$(R_DYLIB_EXT)
 lapack_la_OBJECTS = $(OBJECTS)
 ## Used for passing '+s' to SHLIB_LINK on HP-UX.
 lapack_la_LDFLAGS = @LAPACK_LDFLAGS@
@@ -111,7 +111,7 @@ mostlyclean: clean
 clean:
 	@-rm -rf .libs _libs
 	@-rm -f Makedeps *.d *.o *.a *.lo *.la \
-	  lapack$(SHLIB_EXT) libRlapack$(DYLIB_EXT)
+	  $(lapack_la) $(Rlapack_la)
 distclean: clean
 	@-rm -f Makefile
 maintainer-clean: distclean

src/nmath/standalone/Makefile.in

@@ -59,7 +59,7 @@ libRmath_a_OBJECTS = $(OBJECTS)
 ## <FIXME>
 ## Change to 'libRmath.la' when using libtool for shlibs.
 ## Remove when using automake ...
-libRmath_la = libRmath$(DYLIB_EXT)
+libRmath_la = libRmath$(R_DYLIB_EXT)
 ## </FIXME>
 Rexeclibdir_LTLIBRARIES = $(libRmath_la)
 libRmath_la_SOURCES = $(SOURCES)