Move the "#define WITH_CGRAPH 1" to lib/common/types.h

Running autoheader on lib/gvc/gvc.h would also: "/* #undef extern */"
which breaks the build.   No #undef in types.h - plus it feels like a better location.

diff --git a/configure.ac b/configure.ac
index 63365e8e11eb1fab909fca6423f36da30f204668..3c8a916a87b18a462aee735c1b750dda8631c544 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -194,7 +194,7 @@ AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
 # Suppress verbose compile lines
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
-AC_CONFIG_HEADERS([config.h lib/gvc/gvc.h])
+AC_CONFIG_HEADERS([config.h lib/common/types.h])
 
 # put BUILDDATE in its own file so that only targets that use it get rebuilt
 echo "#define BUILDDATE \"$VERSION_DATE\"" > builddate.h

diff --git a/lib/common/Makefile.am b/lib/common/Makefile.am
index 271b8bb5902c82a64dc00c6d050a511f3f085580..f8d19bb933305e17eaa5c3a9ebb114e941cd5aaa 100644 (file)
--- a/lib/common/Makefile.am
+++ b/lib/common/Makefile.am
@@ -81,4 +81,4 @@ EXTRA_DIST = Makefile.old README.imap chars.tcl ps_font_equiv.h \
        strcasecmp.c strncasecmp.c htmlparse.c htmlparse.h \
        y.tab.c y.tab.h y.output entities.html entities.tcl \
        brewer_colors brewer_lib svgcolor_names svgcolor_lib \
-       color_names color_lib colortbl.h mksvgfonts.pl
+       color_names color_lib colortbl.h mksvgfonts.pl types.h.in

diff --git a/lib/common/types.h b/lib/common/types.h.in
similarity index 99%
rename from lib/common/types.h
rename to lib/common/types.h.in
index 2ba0583d755ef5182fcc1419e0fbca88539aa74d..38b012501c733824af59bf51974b56f95cb7e942 100644 (file)
--- a/lib/common/types.h
+++ b/lib/common/types.h.in
@@ -14,6 +14,9 @@
 #ifndef GV_TYPES_H
 #define GV_TYPES_H
 
+/* Define if you want CGRAPH */
+#undef WITH_CGRAPH
+
 #include <stdio.h>
 #include <assert.h>
 #include <signal.h>

diff --git a/lib/gvc/Makefile.am b/lib/gvc/Makefile.am
index 93876c90b8d0b0995fd6717c04c186293d1eb582..d5e3404e674b2b5a4d3ed9c05834222d20d0abdb 100644 (file)
--- a/lib/gvc/Makefile.am
+++ b/lib/gvc/Makefile.am
@@ -72,6 +72,6 @@ libgvc_la_DEPENDENCIES = $(libgvc_C_la_DEPENDENCIES)
 gvc.3.pdf: $(srcdir)/gvc.3
        - @GROFF@ -Tps -man $(srcdir)/gvc.3 | @PS2PDF@ - - > gvc.3.pdf
 
-EXTRA_DIST = $(man_MANS) $(pdf_DATA) Makefile.old regex_win32.h regex_win32.c gvc.vcproj gvc.h.in
+EXTRA_DIST = $(man_MANS) $(pdf_DATA) Makefile.old regex_win32.h regex_win32.c gvc.vcproj
 
 DISTCLEANFILES = $(pdf_DATA)

diff --git a/lib/gvc/gvc.h.in b/lib/gvc/gvc.h
similarity index 98%
rename from lib/gvc/gvc.h.in
rename to lib/gvc/gvc.h
index be8653e69a23a4e2aecd81cf3f813e12238ef7e2..cb1a59444f34f110069b37aec887ecaef6e2ca33 100644 (file)
--- a/lib/gvc/gvc.h.in
+++ b/lib/gvc/gvc.h
@@ -14,9 +14,6 @@
 #ifndef                        GVC_H
 #define                        GVC_H
 
-/* Define if you want CGRAPH */
-#undef WITH_CGRAPH
-
 #include "types.h"
 #include "gvplugin.h"
 
@@ -115,9 +112,6 @@ extern char** gvPluginList (GVC_t *gvc, char* kind, int* sz, char*);
  * @param lib library to add
  */
 
-
-
-
 extern void gvAddLibrary(GVC_t *gvc, gvplugin_library_t *lib);
 
 #undef extern