From: John Ellson Date: Sat, 7 Feb 2015 04:34:47 +0000 (-0500) Subject: JSHEXT not needed X-Git-Tag: TRAVIS_CI_BUILD_EXPERIMENTAL~124 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=972a0bbadc1edf8b6d1294db0b9eb69bf873aad2;p=graphviz JSHEXT not needed --- diff --git a/configure.ac b/configure.ac index 8b73e6476..95172a151 100644 --- a/configure.ac +++ b/configure.ac @@ -130,7 +130,6 @@ UWIN=no CYGWIN=no MINGW32=no DARWIN9=no -JSHEXT=so case "${host_os}" in *-uwin* ) UWIN=yes @@ -164,7 +163,6 @@ case "${host_os}" in NO_POSTSCRIPT_ALIAS=1 BROWSER="open" JNI_EXTRA_LDFLAGS="-shrext .jnilib" -i JSHEXT=jnilib case "${host_os}" in *-darwin9*) DARWIN9=yes @@ -190,7 +188,6 @@ AC_SUBST([DARWIN]) AC_SUBST([DARWIN9]) AC_SUBST([EXTRA_SMYRNA_LDFLAGS]) AC_SUBST([JNI_EXTRA_LDFLAGS]) -AC_SUBST([JSHEXT]) AC_DEFINE_UNQUOTED(DEFAULT_FONTPATH,"$DEFAULT_FONTPATH",[Path to TrueType fonts.]) AC_DEFINE_UNQUOTED(PATHSEPARATOR,"$PATHSEPARATOR",[Path separator character.]) AC_DEFINE_UNQUOTED(NO_POSTSCRIPT_ALIAS,$NO_POSTSCRIPT_ALIAS,[Postscript fontnames.]) diff --git a/tclpkg/gv/Makefile.am b/tclpkg/gv/Makefile.am index db16bb8e3..15c6b5e3d 100644 --- a/tclpkg/gv/Makefile.am +++ b/tclpkg/gv/Makefile.am @@ -94,7 +94,6 @@ libgv_io_la_CPPFLAGS = $(BASECPPFLAGS) $(IO_INCLUDES) gv_io.cpp: gv.i $(SWIG) -c++ -io -o gv_io.cpp $(srcdir)/gv.i -JSHEXT=jnilib libjavadir = $(pkglibdir)/java pkgjavadir = $(libjavadir)/org/graphviz JAVA_data = gv.java gvJNI.java SWIGTYPE_p_Agraph_t.java SWIGTYPE_p_Agnode_t.java SWIGTYPE_p_Agedge_t.java SWIGTYPE_p_Agsym_t.java SWIGTYPE_p_FILE.java