From: ellson <devnull@localhost>
Date: Fri, 29 Aug 2008 01:09:34 +0000 (+0000)
Subject: Incorporate the debian maintainer's suggestion for a
X-Git-Tag: LAST_LIBGRAPH~32^2~3540
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=059494ce9904cf88e2940c0165f3daa3ba7716d0;p=graphviz

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 54d80080a..9cd3fc26e 100644
--- 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 eca6736de..e82cde48f 100644
--- 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 868a3e555..1bfca3bc5 100644
--- 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