Stop linking libXaw7.so.<n-1> to libXaw.so.7.<n-1>

Bump majors (needed but forgotten after previous libX11 bump).
After discussion with kettenis@

3 files changed, 28 insertions, 7 deletions

diff --git a/lib/libXaw/Makefile.bsd-wrapper b/lib/libXaw/Makefile.bsd-wrapper
index 8a51d2b55..c19a2d570 100644
--- a/lib/libXaw/Makefile.bsd-wrapper
+++ b/lib/libXaw/Makefile.bsd-wrapper
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile.bsd-wrapper,v 1.6 2007/04/09 11:13:14 matthieu Exp $
+# $OpenBSD: Makefile.bsd-wrapper,v 1.7 2008/02/09 18:08:49 matthieu Exp $
 
-SHARED_LIBS= Xaw7 11.0 Xaw8 12.0
+SHARED_LIBS= Xaw7 12.0 Xaw8 13.0
 
-CONFIGURE_ARGS= --disable-xaw6 --enable-xaw8
+CONFIGURE_ARGS= --disable-xaw6 --disable-xaw7-symlink --enable-xaw8
 
 afterinstall:
 	-rm -f $(DESTDIR)$(LIBDIR)/libXaw.a
diff --git a/lib/libXaw/configure.ac b/lib/libXaw/configure.ac
index 86d6a6b7f..00f6a1c82 100644
--- a/lib/libXaw/configure.ac
+++ b/lib/libXaw/configure.ac
@@ -109,6 +109,23 @@ AM_CONDITIONAL(BUILD_XAW6, [test x$build_v6 = xyes])
 AM_CONDITIONAL(BUILD_XAW7, [test x$build_v7 = xyes])
 AM_CONDITIONAL(BUILD_XAW8, [test x$build_v8 = xyes])
 
+if test x$build_v6 = xyes; then
+	link_v6=yes
+fi
+AC_ARG_ENABLE(xaw6-symlink, AC_HELP_STRING([--disable-xaw8-symlink],
+	[Disable symlink of libXaw6.so.6 to libXaw.so.6]),
+	[link_v6=$enableval])
+AM_CONDITIONAL(LINK_XAW6, [test x$link_v6 = xyes])
+
+if test x$build_v7 = xyes; then
+	link_v7=yes
+fi
+AC_ARG_ENABLE(xaw7-symlink, AC_HELP_STRING([--disable-xaw8-symlink],
+	[Disable symlink of libXaw7.so.7 to libXaw.so.7]),
+	[link_v7=$enableval])
+AM_CONDITIONAL(LINK_XAW7, [test x$link_v7 = xyes])
+
+
 # Checks for header files.
 AC_HEADER_STDC
 AC_CHECK_HEADER(wctype.h,
diff --git a/lib/libXaw/src/Makefile.am b/lib/libXaw/src/Makefile.am
index 10f8380ba..6a48ea12e 100644
--- a/lib/libXaw/src/Makefile.am
+++ b/lib/libXaw/src/Makefile.am
@@ -77,12 +77,14 @@ libXaw6_la_LIBADD = $(XAW6_LIBS)
 
 if SHARED_LIBS
 if !PLATFORM_WIN32
+if LINK_XAW6
 install-exec-hook::
 	-rm -f $(DESTDIR)$(libdir)/libXaw.so.9.0
 	(cd $(DESTDIR)$(libdir) && ln -s libXaw6.so.9.0 libXaw.so.9.0)
 endif
 endif
 endif
+endif
 
 if BUILD_XAW7
 
@@ -102,9 +104,11 @@ libXaw7_la_LIBADD = $(XAW7_LIBS)
 
 if SHARED_LIBS
 if !PLATFORM_WIN32
+if LINK_XAW7
 install-exec-hook::
-	-rm -f $(DESTDIR)$(libdir)/libXaw.so.11.0
-	(cd $(DESTDIR)$(libdir) && ln -s libXaw7.so.11.0 libXaw.so.11.0)
+	-rm -f $(DESTDIR)$(libdir)/libXaw.so.12.0
+	(cd $(DESTDIR)$(libdir) && ln -s libXaw7.so.12.0 libXaw.so.12.0)
+endif
 endif
 endif
 endif
@@ -128,8 +132,8 @@ libXaw8_la_LIBADD = $(XAW8_LIBS)
 if SHARED_LIBS
 if !PLATFORM_WIN32
 install-exec-hook::
-	-rm -f $(DESTDIR)$(libdir)/libXaw.so.12.0
-	(cd $(DESTDIR)$(libdir) && ln -s libXaw8.so.12.0 libXaw.so.12.0)
+	-rm -f $(DESTDIR)$(libdir)/libXaw.so.13.0
+	(cd $(DESTDIR)$(libdir) && ln -s libXaw8.so.13.0 libXaw.so.13.0)
 endif
 endif
 endif