M4/octave.m4 : Remove cruft.

This commit is contained in:
Erik de Castro Lopo 2008-10-27 20:08:47 +11:00
parent 0985d2e887
commit 0497198dfd

View File

@ -116,28 +116,6 @@ if test "x$prog_concat" = "xyesyesyes" ; then
OCTAVE_DEST_ODIR=`$OCTAVE_CONFIG --oct-site-dir | sed 's%^/usr%${prefix}%'`
OCTAVE_DEST_MDIR=`$OCTAVE_CONFIG --m-site-dir | sed 's%^/usr%${prefix}%'`
AC_MSG_RESULT([retrieving compile and link flags from $MKOCTFILE])
OCT_CXXFLAGS=`$MKOCTFILE -p ALL_CXXFLAGS`
OCT_CXXFLAGS="$OCT_CXXFLAGS `$MKOCTFILE -p FPICFLAG`"
OCT_LIB_DIR=`$MKOCTFILE -p LFLAGS`
dnl Pinched from mkoctfile.
dnl
dnl LINK_DEPS="$LFLAGS $OCTAVE_LIBS $LDFLAGS $BLAS_LIBS $FFTW_LIBS $LIBS $FLIBS"
dnl cmd="$DL_LD $DL_LDFLAGS $pass_on_options -o $octfile $objfiles $ldflags $LINK_DEPS"
OCT_LIBS=`$MKOCTFILE -p LFLAGS`
OCT_LIBS="$OCT_LIBS `$MKOCTFILE -p OCTAVE_LIBS`"
OCT_LIBS="$OCT_LIBS `$MKOCTFILE -p LDFLAGS`"
OCT_LIBS="$OCT_LIBS `$MKOCTFILE -p BLAS_LIBS`"
OCT_LIBS="$OCT_LIBS `$MKOCTFILE -p FFTW_LIBS`"
OCT_LIBS="$OCT_LIBS `$MKOCTFILE -p LIBS`"
OCT_LIBS="$OCT_LIBS `$MKOCTFILE -p FLIBS`"
OCT_LIBS="`$MKOCTFILE -p DL_LDFLAGS` $OCT_LIBS"
OCTAVE_BUILD=yes
AC_MSG_RESULT([building octave libsndfile module... $OCTAVE_BUILD])
fi
@ -147,10 +125,8 @@ if test "x$prog_concat" = "xyesyesyes" ; then
AC_SUBST(OCTAVE_DEST_ODIR)
AC_SUBST(OCTAVE_DEST_MDIR)
AC_SUBST(OCT_CXXFLAGS)
AC_SUBST(OCT_LIB_DIR)
AC_SUBST(OCT_LIBS)
AC_SUBST(MKOCTFILE)
AM_CONDITIONAL(BUILD_OCTAVE_MOD, test -n "$OCT_CXXFLAGS")
AM_CONDITIONAL(BUILD_OCTAVE_MOD, test -n "$MKOCTFILE")
])# AC_OCTAVE_BUILD