academic/octave: Revert deletion of configure.ac fixes

These are still needed to find SuiteSparse dependencies.

Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
This commit is contained in:
Kyle Guinn 2012-09-21 21:38:54 -05:00 committed by Robby Workman
parent a40a7a637b
commit d5057e019c
1 changed files with 16 additions and 2 deletions

View File

@ -55,6 +55,20 @@ cd $PRGNAM-$VERSION
chown -R root:root . chown -R root:root .
chmod -R u+w,go+r-w,a-st . chmod -R u+w,go+r-w,a-st .
# Several configure checks look for headers in the 'amd' directory
# instead of 'cxsparse', 'camd', 'colamd', and 'ccolamd' directories
# as liboctave/oct-sparse.h expects. Fix the typos and reconfigure.
# Note that camd.h doesn't appear to be included anywhere, but is used
# to determine if the CAMD library is present.
sed -i -e 's| amd/cs\.h| cxsparse/cs.h|' \
-e 's| amd/camd\.h| camd/camd.h|' \
-e 's| amd/colamd\.h| colamd/colamd.h|' \
-e 's| amd/ccolamd\.h| ccolamd/ccolamd.h|' configure.ac
autoreconf -vif
# If you have amd.h in some non-default location (e.g. /usr/include/amd/amd.h)
# now the check for umfpack.h will fail because umfpack.h includes "amd.h"
# instead of "amd/amd.h". The --with-amd-includedir option below fixes this.
CFLAGS="$SLKCFLAGS" \ CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \
FFLAGS="$SLKCFLAGS" \ FFLAGS="$SLKCFLAGS" \
@ -73,8 +87,8 @@ FFLAGS="$SLKCFLAGS" \
--with-amd-includedir=/usr/include/amd \ --with-amd-includedir=/usr/include/amd \
--build=$ARCH-slackware-linux --build=$ARCH-slackware-linux
LANG=C make make
make DESTDIR=$PKG install make install-strip DESTDIR=$PKG
find $PKG/usr/man -type f -exec gzip -9 {} \; find $PKG/usr/man -type f -exec gzip -9 {} \;