From: John Ellson <ellson@research.att.com>
Date: Wed, 6 Jan 2016 14:51:47 +0000 (-0500)
Subject: still need -DSWIGJAVA for swig-1.3.29 on EL5
X-Git-Tag: TRAVIS_CI_BUILD_EXPERIMENTAL~72
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0ef772c0959a60f239fa754784c6a3069c225723;p=graphviz

still need -DSWIGJAVA for swig-1.3.29 on EL5
---

diff --git a/configure.ac b/configure.ac
index 413aa08ea..c8f23db52 100644
--- a/configure.ac
+++ b/configure.ac
@@ -604,8 +604,8 @@ else
 	else
           # EL5 has swig-1.3.29 which does not define SWIGJAVA
 	  if test $SWIG_VERSION_MICRO -lt 40; then
-            SWIG_CPPFLAGS=-DSWIGJAVA
-            AC_SUBST([SWIG_CPPFLAGS])
+            SWIGJAVA_CPPFLAGS=-DSWIGJAVA
+            AC_SUBST([SWIGJAVA_CPPFLAGS])
 	  fi
         fi
       fi
diff --git a/tclpkg/gv/Makefile.am b/tclpkg/gv/Makefile.am
index 5bf7fd6ef..0b0b1f134 100644
--- a/tclpkg/gv/Makefile.am
+++ b/tclpkg/gv/Makefile.am
@@ -19,7 +19,7 @@ BASESOURCES = gv.cpp gv.i gv_builtins.c
 BASELIBS = $(top_builddir)/lib/gvc/libgvc.la \
 	$(top_builddir)/lib/cgraph/libcgraph.la \
 	$(top_builddir)/lib/cdt/libcdt.la
-BASECPPFLAGS = $(AM_CPPFLAGS) $(SWIG_CPPFLAGS) -DDEMAND_LOADING=1
+BASECPPFLAGS = $(AM_CPPFLAGS) -DDEMAND_LOADING=1
 
 pkgsharpdir = $(pkglibdir)/sharp
 SHARP_data = gv.cs gvPINVOKE.cs SWIGTYPE_p_Agraph_t.cs SWIGTYPE_p_Agnode_t.cs SWIGTYPE_p_Agedge_t.cs SWIGTYPE_p_Agsym_t.cs SWIGTYPE_p_FILE.cs
@@ -101,7 +101,7 @@ nodist_libgv_java_la_SOURCES = gv_java.cpp
 libgv_java_la_SOURCES = $(BASESOURCES)  gv_java_init.c
 libgv_java_la_LIBADD = $(BASELIBS) $(JAVA_LIBS)
 libgv_java_la_LDFLAGS = -module -avoid-version $(JNI_EXTRA_LDFLAGS)
-libgv_java_la_CPPFLAGS = $(BASECPPFLAGS) $(JAVA_INCLUDES)
+libgv_java_la_CPPFLAGS = $(BASECPPFLAGS) $(SWIGJAVA_CPPFLAGS) $(JAVA_INCLUDES)
 $(JAVA_data): gv_java.cpp
 gv_java.cpp: gv.i
 	$(SWIG) -package org.graphviz -java -c++ -o gv_java.cpp $(srcdir)/gv.i