Incorporate the debian maintainer's suggestion for a

 versioned <prefix>/lib/graphviz/config on all platforms.
 This to allow multiple verions of graphviz to be installed at the same time.
 Right now it is <prefix>/lib/graphviz/config5

diff --git a/configure.ac b/configure.ac
index 54d80080aaa2a44035760cfd595d2359548dec0d..9cd3fc26e1592b0eb0873586cd5bee269e9090e3 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -67,7 +67,9 @@ GVPLUGIN_REVISION=0
 # precedence over adding, so set to 0 if both happened.
 GVPLUGIN_AGE=0
 
+GVPLUGIN_CONFIG_FILE="config$GVPLUGIN_CURRENT"
 GVPLUGIN_VERSION_INFO="$GVPLUGIN_CURRENT:$GVPLUGIN_REVISION:$GVPLUGIN_AGE"
+AC_SUBST(GVPLUGIN_CONFIG_FILE)
 AC_SUBST(GVPLUGIN_VERSION_INFO)
 
 dnl ===========================================================================

diff --git a/lib/gvc/Makefile.am b/lib/gvc/Makefile.am
index eca6736dee4c00c72760727d8b1d45164cf1c2f7..e82cde48fbc67368b47b75d637b31a93a3e9347f 100644 (file)
--- a/lib/gvc/Makefile.am
+++ b/lib/gvc/Makefile.am
@@ -11,7 +11,7 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/lib/graph \
        -I$(top_srcdir)/lib/cdt \
        $(INCLTDL) -I$(top_srcdir)/libltdl \
-       -DGVLIBDIR=\"$(pkglibdir)\"
+       -DGVLIBDIR=\"$(pkglibdir)\" -DGVPLUGIN_CONFIG_FILE=\"$(GVPLUGIN_CONFIG_FILE)\"
 
 LIBS = $(LIBLTDL) $(SOCKET_LIBS) $(Z_LIBS) $(MATH_LIBS)
 

diff --git a/lib/gvc/gvconfig.c b/lib/gvc/gvconfig.c
index 868a3e555c5f6c87e9a176228deb1415988e2bef..1bfca3bc524c780342cc3b180baf0183df015365 100644 (file)
--- a/lib/gvc/gvconfig.c
+++ b/lib/gvc/gvconfig.c
@@ -474,7 +474,7 @@ void gvconfig(GVC_t * gvc, boolean rescan)
     FILE *f = NULL;
     char *config_text = NULL;
     char *libdir;
-    char *config_file_name = "config";
+    char *config_file_name = GVPLUGIN_CONFIG_FILE;
 
 #define MAX_SZ_CONFIG 100000
 #endif