work around "if IRIX +1" weirdness in libtool LT_CURRENT versioning

diff --git a/configure.ac b/configure.ac
index 6c847f4d0d0b1c98e079b37276504667e56d346e..38e2a97b906f136ba96d75d39750c4a45ff34fe7 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -22,8 +22,6 @@ LT_REVISION=0
 LT_AGE=0
 
 VERSION_INFO="$LT_CURRENT:$LT_REVISION:$LT_AGE"
-AC_DEFINE_UNQUOTED(LT_CURRENT,$LT_CURRENT,[Compatibility version number for shared libraries.])
-AC_SUBST(LT_CURRENT)
 AC_SUBST(VERSION_INFO)
 
 dnl ===========================================================================
@@ -50,6 +48,17 @@ AC_SUBST(LIBLTDL)
 # Checks for system type
 AC_CANONICAL_HOST
 
+# This nonsense drives me crazy!!
+case "${host_os}" in
+  *irix* | *nonstopux* )
+    GVPLUGIN_VERSION=`expr $LT_CURRENT + 1`
+    ;;
+  *)
+    GVPLUGIN_VERSION=$LT_CURRENT
+esac
+AC_DEFINE_UNQUOTED(GVPLUGIN_VERSION,$GVPLUGIN_VERSION,[Compatibility version number for plugins.])
+AC_SUBST(GVPLUGIN_VERSION)
+
 LIBPOSTFIX=
 case "${host_os}" in
   *linux* )

diff --git a/lib/gvc/gvconfig.c b/lib/gvc/gvconfig.c
index 2a1e7ec0473456b86756afc69e16fadc9b70e531..1db9bf93afc956c55a10ea96b80b1f92b510f733 100644 (file)
--- a/lib/gvc/gvconfig.c
+++ b/lib/gvc/gvconfig.c
@@ -298,8 +298,8 @@ static void config_rescan(GVC_t *gvc, char *config_path)
     libdir = gvconfig_libdir();
 
     config_re = gmalloc(strlen(plugin_re_beg) + 20 + strlen(plugin_re_end) + 1);
-#ifdef LT_CURRENT
-    sprintf(config_re,"%s%d%s", plugin_re_beg, LT_CURRENT, plugin_re_end);
+#ifdef GVPLUGIN_VERSION
+    sprintf(config_re,"%s%d%s", plugin_re_beg, GVPLUGIN_VERSION, plugin_re_end);
 #else
     sprintf(config_re,"%s[0-9]+%s", plugin_re_beg, plugin_re_end);
 #endif