Mercurial > octave-nkf

comparison configure.ac @ 10004:e517da95bf98

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Eliminate TOPDIR variable in favor of built-in automake variables top_builddir and top_srcdir.
author Rik <rdrider0-list@yahoo.com>
date Sat, 19 Dec 2009 22:58:54 -0800
parents 2ea3110e15ed
children 411325ce32d7
comparison
equal deleted inserted replaced
10003:2ea3110e15ed 10004:e517da95bf98
1089 FPICFLAG= 1089 FPICFLAG=
1090 SH_LDFLAGS="-shared -Wl,-expect_unresolved -Wl,'*'" 1090 SH_LDFLAGS="-shared -Wl,-expect_unresolved -Wl,'*'"
1091 RLD_FLAG='-Wl,-rpath -Wl,$(octlibdir)' 1091 RLD_FLAG='-Wl,-rpath -Wl,$(octlibdir)'
1092 ;; 1092 ;;
1093 *-*-darwin*) 1093 *-*-darwin*)
1094 DL_LDFLAGS='-bundle -bundle_loader $(TOPDIR)/src/octave $(LDFLAGS)' 1094 DL_LDFLAGS='-bundle -bundle_loader $(top_builddir)/src/octave $(LDFLAGS)'
1095 MKOCTFILE_DL_LDFLAGS='-bundle -bundle_loader $$BINDIR/octave-$$OCTAVE_VERSION$$EXEEXT' 1095 MKOCTFILE_DL_LDFLAGS='-bundle -bundle_loader $$BINDIR/octave-$$OCTAVE_VERSION$$EXEEXT'
1096 SH_LDFLAGS='-dynamiclib -single_module $(LDFLAGS)' 1096 SH_LDFLAGS='-dynamiclib -single_module $(LDFLAGS)'
1097 case "$canonical_host_type" in 1097 case "$canonical_host_type" in
1098 powerpc-*) 1098 powerpc-*)
1099 CXXPICFLAG= 1099 CXXPICFLAG=
1622 if $SHARED_LIBS; then 1622 if $SHARED_LIBS; then
1623 LIBOCTINTERP=-loctinterp$SHLLINKEXT 1623 LIBOCTINTERP=-loctinterp$SHLLINKEXT
1624 LIBOCTAVE=-loctave$SHLLINKEXT 1624 LIBOCTAVE=-loctave$SHLLINKEXT
1625 LIBCRUFT=-lcruft$SHLLINKEXT 1625 LIBCRUFT=-lcruft$SHLLINKEXT
1626 else 1626 else
1627 LIBOCTINTERP='$(TOPDIR)/src/liboctinterp.$(LIBEXT)' 1627 LIBOCTINTERP='$(top_builddir)/src/liboctinterp.$(LIBEXT)'
1628 LIBOCTAVE='$(TOPDIR)/liboctave/liboctave.$(LIBEXT)' 1628 LIBOCTAVE='$(top_builddir)/liboctave/liboctave.$(LIBEXT)'
1629 LIBCRUFT='$(TOPDIR)/libcruft/libcruft.$(LIBEXT)' 1629 LIBCRUFT='$(top_builddir)/libcruft/libcruft.$(LIBEXT)'
1630 fi 1630 fi
1631 1631
1632 AC_SUBST(LD_CXX) 1632 AC_SUBST(LD_CXX)
1633 AC_SUBST(RDYNAMIC_FLAG) 1633 AC_SUBST(RDYNAMIC_FLAG)
1634 AC_SUBST(ENABLE_DYNAMIC_LINKING) 1634 AC_SUBST(ENABLE_DYNAMIC_LINKING)