still need -DSWIGJAVA for swig-1.3.29 on EL5

diff --git a/configure.ac b/configure.ac
index 85e4fe5b96b500c42f1a18ff7bb9fd1c90402f17..413aa08ea6fe7593ce8b1188b5e68582a2119646 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -594,12 +594,19 @@ else
     SWIG_VERSION=`$SWIG -version 2>&1 | $EGREP Version | cut -d ' ' -f 3`
     SWIG_VERSION_MAJOR=`echo $SWIG_VERSION | cut -d '.' -f 1`
     SWIG_VERSION_MINOR=`echo $SWIG_VERSION | cut -d '.' -f 2`
+    SWIG_VERSION_MICRO=`echo $SWIG_VERSION | cut -d '.' -f 3`
     if test $SWIG_VERSION_MAJOR -lt 2; then
       if test $SWIG_VERSION_MAJOR -lt 1; then
        SWIG=
       else
         if test $SWIG_VERSION_MINOR -lt 3; then
          SWIG=
+       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])
+         fi
         fi
       fi
     fi

diff --git a/tclpkg/gv/Makefile.am b/tclpkg/gv/Makefile.am
index 0f54f019cce8f693b9a906fdd114eae9f0563cb7..5bf7fd6ef21bf014ce0b51fa6df07de9f9045c71 100644 (file)
--- 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) -DDEMAND_LOADING=1
+BASECPPFLAGS = $(AM_CPPFLAGS) $(SWIG_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