Skip to content

Commit

Permalink
perhaps we really do need JSHEXT
Browse files Browse the repository at this point in the history
  • Loading branch information
John Ellson committed Feb 7, 2015
1 parent 972a0bb commit b0237cb
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
8 changes: 7 additions & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,7 @@ case "${host_os}" in
PATHSEPARATOR=";"
NO_POSTSCRIPT_ALIAS=1
BROWSER="xdg-open"
JSHEXT=so
;;
*-cygwin* )
CYGWIN=yes
Expand All @@ -147,13 +148,15 @@ 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
DEFAULT_FONTPATH="C:/WINDOWS/FONTS;C:/WINNT/Fonts;C:/winnt/fonts"
PATHSEPARATOR=":"
NO_POSTSCRIPT_ALIAS=1
BROWSER="xdg-open"
JSHEXT=so
;;
*-darwin* )
DARWIN=yes
Expand All @@ -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
Expand All @@ -180,14 +183,17 @@ case "${host_os}" in
PATHSEPARATOR=":"
NO_POSTSCRIPT_ALIAS=0
BROWSER="xdg-open"
JSHEXT=jnilib
;;
esac
AC_SUBST([CYGWIN])
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.])
Expand Down
2 changes: 1 addition & 1 deletion tclpkg/gv/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -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;)
Expand Down

0 comments on commit b0237cb

Please sign in to comment.