From: John Ellson <ellson@research.att.com>
Date: Sat, 7 Feb 2015 04:44:36 +0000 (-0500)
Subject: perhaps we really do need JSHEXT
X-Git-Tag: TRAVIS_CI_BUILD_EXPERIMENTAL~123
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b0237cb333a3464eafa3a7d2002e6c5b90fa50ae;p=graphviz

perhaps we really do need JSHEXT
---

diff --git a/configure.ac b/configure.ac
index 95172a151..678f1da23 100644
--- a/configure.ac
+++ b/configure.ac
@@ -139,6 +139,7 @@ case "${host_os}" in
 	PATHSEPARATOR=";"
         NO_POSTSCRIPT_ALIAS=1
 	BROWSER="xdg-open"
+	JSHEXT=so
 	;;
   *-cygwin* )
 	CYGWIN=yes
@@ -147,6 +148,7 @@ case "${host_os}" in
         NO_POSTSCRIPT_ALIAS=1
 	AC_DEFINE(NO_POSTSCRIPT_ALIAS,1,[Alias PostScript font names to URW type 1 fonts])
 	BROWSER="xdg-open"
+	JSHEXT=so
 	;;
   *-mingw32* )
 	MINGW32=yes
@@ -154,6 +156,7 @@ case "${host_os}" in
 	PATHSEPARATOR=":"
         NO_POSTSCRIPT_ALIAS=1
 	BROWSER="xdg-open"
+	JSHEXT=so
 	;;
   *-darwin* )
 	DARWIN=yes
@@ -162,7 +165,7 @@ case "${host_os}" in
 	PATHSEPARATOR=":"
         NO_POSTSCRIPT_ALIAS=1
 	BROWSER="open"
-	JNI_EXTRA_LDFLAGS="-shrext .jnilib"
+	JSHEXT=jnilib
 	case "${host_os}" in
 	*-darwin9*)
 		DARWIN9=yes
@@ -180,6 +183,7 @@ case "${host_os}" in
 	PATHSEPARATOR=":"
         NO_POSTSCRIPT_ALIAS=0
 	BROWSER="xdg-open"
+	JSHEXT=jnilib
 	;;
 esac
 AC_SUBST([CYGWIN])
@@ -187,7 +191,9 @@ AC_SUBST([MINGW32])
 AC_SUBST([DARWIN])
 AC_SUBST([DARWIN9])
 AC_SUBST([EXTRA_SMYRNA_LDFLAGS])
+JNI_EXTRA_LDFLAGS="-shrext .$JSHEXT"
 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 15c6b5e3d..0d5dfa467 100644
--- a/tclpkg/gv/Makefile.am
+++ b/tclpkg/gv/Makefile.am
@@ -477,7 +477,7 @@ gv.3tcl.pdf: gv.3tcl
 
 install-data-hook:
 if WITH_JAVA
-	(cd $(DESTDIR)$(pkgjavadir); $(LN_S) -f org/graphviz/libgv_java.so ../../libgv.$(JSHEXT); javac -classpath $(DESTDIR)$(libjavadir) gv.java;)
+	(cd $(DESTDIR)$(pkgjavadir); $(LN_S) -f org/graphviz/libgv_java.$(JSHEXT) ../../libgv.$(JSHEXT); javac -classpath $(DESTDIR)$(libjavadir) gv.java;)
 endif
 if WITH_LUA
 	(cd $(DESTDIR)$(pkgluadir);    rm -f gv.so;  $(LN_S) libgv_lua.so gv.so;)