diff -Nur lis-1.4.23.orig/configure.in lis-1.4.23/configure.in --- lis-1.4.23.orig/configure.in 2014-01-14 21:30:01.358264593 -0800 +++ lis-1.4.23/configure.in 2014-01-14 21:31:19.917763200 -0800 @@ -527,6 +527,8 @@ AC_LANG_PUSH(Fortran 77) fflags_save="$FFLAGS" AC_PROG_F77([ifort ifc efc xlf95_r xlf90_r xlf_r xlf95 xlf90 xlf ftn frt pgf95 pgf90 pathf95 pathf90 epcf90 f95 fort lf95 gfortran f90 g77]) + AC_F77_LIBRARY_LDFLAGS + AC_F77_DUMMY_MAIN FFLAGS="$fflags_save" if test "$TARGET" = ""; then if test "$enable_mpi" = "yes"; then diff -Nur lis-1.4.23.orig/src/Makefile.am lis-1.4.23/src/Makefile.am --- lis-1.4.23.orig/src/Makefile.am 2014-01-14 21:30:01.374264719 -0800 +++ lis-1.4.23/src/Makefile.am 2014-01-14 21:30:25.932420643 -0800 @@ -22,7 +22,7 @@ liblis@LIBSUFFIX@_la_LIBADD += fortran/amg/libsaamg.la else if ENABLE_FORTRAN - liblis@LIBSUFFIX@_la_LIBADD += fortran/libfortran.la + liblis@LIBSUFFIX@_la_LIBADD += fortran/libfortran.la $(FLIBS) endif endif liblis@LIBSUFFIX@_la_SOURCES = diff -Nur lis-1.4.23.orig/src/esolver/Makefile.am lis-1.4.23/src/esolver/Makefile.am --- lis-1.4.23.orig/src/esolver/Makefile.am 2014-01-14 21:30:01.374264719 -0800 +++ lis-1.4.23/src/esolver/Makefile.am 2014-01-14 21:30:25.931420647 -0800 @@ -8,16 +8,5 @@ lis_esolver_si.c \ lis_esolver_rqi.c -AM_CFLAGS = -I$(top_srcdir)/include +AM_CPPFLAGS = -I$(top_srcdir)/include CLEANFILES = *.il - -PPF77COMPILE = $(F77) $(AMDEFS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_FFLAGS) $(FFLAGS) -LTPPF77COMPILE = $(LIBTOOL) --mode=compile --tag=F77 $(F77) $(AMDEFS) $(DEFS) \ - $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ - $(AM_FFLAGS) $(FFLAGS) -COMPILE = $(CC) $(AMDEFS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(AMDEFS) $(DEFS) \ - $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ - $(AM_CFLAGS) $(CFLAGS) diff -Nur lis-1.4.23.orig/src/fortran/Makefile.am lis-1.4.23/src/fortran/Makefile.am --- lis-1.4.23.orig/src/fortran/Makefile.am 2014-01-14 21:30:01.373264712 -0800 +++ lis-1.4.23/src/fortran/Makefile.am 2014-01-14 21:30:25.932420643 -0800 @@ -9,14 +9,3 @@ AM_CPPFLAGS = -I$(top_srcdir)/include CLEANFILES = *.il - -PPF77COMPILE = $(F77) $(AMDEFS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_FFLAGS) $(FFLAGS) -LTPPF77COMPILE = $(LIBTOOL) --mode=compile --tag=F77 $(F77) $(AMDEFS) $(DEFS) \ - $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ - $(AM_FFLAGS) $(FFLAGS) -COMPILE = $(CC) $(AMDEFS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(AMDEFS) $(DEFS) \ - $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ - $(AM_CFLAGS) $(CFLAGS) diff -Nur lis-1.4.23.orig/src/fortran/amg/Makefile.am lis-1.4.23/src/fortran/amg/Makefile.am --- lis-1.4.23.orig/src/fortran/amg/Makefile.am 2014-01-14 21:30:01.372264705 -0800 +++ lis-1.4.23/src/fortran/amg/Makefile.am 2014-01-14 21:30:25.931420647 -0800 @@ -25,25 +25,6 @@ CLEANFILES = *.mod AM_CPPFLAGS = -I$(top_srcdir)/include -FCCOMPILE = $(FC) $(AMDEFS) $(AM_FCFLAGS) $(FCFLAGS) -LTFCCOMPILE = $(LIBTOOL) --mode=compile $(FC) $(AMDEFS) $(AM_FCFLAGS) $(FCFLAGS) -FCLD = $(FC) -FCLINK = $(LIBTOOL) --mode=link $(FCLD) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -PPFCCOMPILE = $(FC) $(AMDEFS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_FCFLAGS) $(FCFLAGS) -LTPPFCCOMPILE = $(LIBTOOL) --mode=compile $(FC) $(AMDEFS) $(DEFS) \ - $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ - $(AM_FCFLAGS) $(FCFLAGS) -PPF77COMPILE = $(F77) $(AMDEFS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_FFLAGS) $(FFLAGS) -LTPPF77COMPILE = $(LIBTOOL) --mode=compile --tag=F77 $(F77) $(AMDEFS) $(DEFS) \ - $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ - $(AM_FFLAGS) $(FFLAGS) -COMPILE = $(CC) $(AMDEFS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(AMDEFS) $(DEFS) \ - $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ - $(AM_CFLAGS) $(CFLAGS) .NOTPARALLEL: .NO_PARALLEL: diff -Nur lis-1.4.23.orig/src/matrix/Makefile.am lis-1.4.23/src/matrix/Makefile.am --- lis-1.4.23.orig/src/matrix/Makefile.am 2014-01-14 21:30:01.374264719 -0800 +++ lis-1.4.23/src/matrix/Makefile.am 2014-01-14 21:30:25.932420643 -0800 @@ -18,16 +18,5 @@ lis_matrix_rco.c \ lis_matrix_vbr.c -AM_CFLAGS = -I$(top_srcdir)/include $(ILIBS) +AM_CPPFLAGS = -I$(top_srcdir)/include $(ILIBS) CLEANFILES = *.il - -PPF77COMPILE = $(F77) $(AMDEFS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_FFLAGS) $(FFLAGS) -LTPPF77COMPILE = $(LIBTOOL) --mode=compile --tag=F77 $(F77) $(AMDEFS) $(DEFS) \ - $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ - $(AM_FFLAGS) $(FFLAGS) -COMPILE = $(CC) $(AMDEFS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(AMDEFS) $(DEFS) \ - $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ - $(AM_CFLAGS) $(CFLAGS) diff -Nur lis-1.4.23.orig/src/matvec/Makefile.am lis-1.4.23/src/matvec/Makefile.am --- lis-1.4.23.orig/src/matvec/Makefile.am 2014-01-14 21:30:01.372264705 -0800 +++ lis-1.4.23/src/matvec/Makefile.am 2014-01-14 21:30:25.932420643 -0800 @@ -13,16 +13,5 @@ lis_matvec_vbr.c -AM_CFLAGS = -I$(top_srcdir)/include +AM_CPPFLAGS = -I$(top_srcdir)/include CLEANFILES = *.il - -PPF77COMPILE = $(F77) $(AMDEFS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_FFLAGS) $(FFLAGS) -LTPPF77COMPILE = $(LIBTOOL) --mode=compile --tag=F77 $(F77) $(AMDEFS) $(DEFS) \ - $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ - $(AM_FFLAGS) $(FFLAGS) -COMPILE = $(CC) $(AMDEFS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(AMDEFS) $(DEFS) \ - $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ - $(AM_CFLAGS) $(CFLAGS) diff -Nur lis-1.4.23.orig/src/precision/Makefile.am lis-1.4.23/src/precision/Makefile.am --- lis-1.4.23.orig/src/precision/Makefile.am 2014-01-14 21:30:01.372264705 -0800 +++ lis-1.4.23/src/precision/Makefile.am 2014-01-14 21:30:25.932420643 -0800 @@ -4,16 +4,5 @@ lis_precision_matvec.c -AM_CFLAGS = -I$(top_srcdir)/include $(MPFLAG) +AM_CPPFLAGS = -I$(top_srcdir)/include $(MPFLAG) CLEANFILES = *.il - -PPF77COMPILE = $(F77) $(AMDEFS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_FFLAGS) $(FFLAGS) -LTPPF77COMPILE = $(LIBTOOL) --mode=compile --tag=F77 $(F77) $(AMDEFS) $(DEFS) \ - $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ - $(AM_FFLAGS) $(FFLAGS) -COMPILE = $(CC) $(AMDEFS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(AMDEFS) $(DEFS) \ - $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ - $(AM_CFLAGS) $(CFLAGS) diff -Nur lis-1.4.23.orig/src/precon/Makefile.am lis-1.4.23/src/precon/Makefile.am --- lis-1.4.23.orig/src/precon/Makefile.am 2014-01-14 21:30:01.371264698 -0800 +++ lis-1.4.23/src/precon/Makefile.am 2014-01-14 21:30:25.932420643 -0800 @@ -12,16 +12,5 @@ lis_precon_ssor.c -AM_CFLAGS = -I$(top_srcdir)/include +AM_CPPFLAGS = -I$(top_srcdir)/include CLEANFILES = *.il - -PPF77COMPILE = $(F77) $(AMDEFS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_FFLAGS) $(FFLAGS) -LTPPF77COMPILE = $(LIBTOOL) --mode=compile --tag=F77 $(F77) $(AMDEFS) $(DEFS) \ - $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ - $(AM_FFLAGS) $(FFLAGS) -COMPILE = $(CC) $(AMDEFS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(AMDEFS) $(DEFS) \ - $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ - $(AM_CFLAGS) $(CFLAGS) diff -Nur lis-1.4.23.orig/src/solver/Makefile.am lis-1.4.23/src/solver/Makefile.am --- lis-1.4.23.orig/src/solver/Makefile.am 2014-01-14 21:30:01.373264712 -0800 +++ lis-1.4.23/src/solver/Makefile.am 2014-01-14 21:30:25.932420643 -0800 @@ -17,16 +17,5 @@ lis_solver_sor.c -AM_CFLAGS = -I$(top_srcdir)/include +AM_CPPFLAGS = -I$(top_srcdir)/include CLEANFILES = *.il - -PPF77COMPILE = $(F77) $(AMDEFS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_FFLAGS) $(FFLAGS) -LTPPF77COMPILE = $(LIBTOOL) --mode=compile --tag=F77 $(F77) $(AMDEFS) $(DEFS) \ - $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ - $(AM_FFLAGS) $(FFLAGS) -COMPILE = $(CC) $(AMDEFS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(AMDEFS) $(DEFS) \ - $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ - $(AM_CFLAGS) $(CFLAGS) diff -Nur lis-1.4.23.orig/src/system/Makefile.am lis-1.4.23/src/system/Makefile.am --- lis-1.4.23.orig/src/system/Makefile.am 2014-01-14 21:30:01.371264698 -0800 +++ lis-1.4.23/src/system/Makefile.am 2014-01-14 21:30:25.932420643 -0800 @@ -13,16 +13,5 @@ mt19937ar.c -AM_CFLAGS = -I$(top_srcdir)/include +AM_CPPFLAGS = -I$(top_srcdir)/include CLEANFILES = *.il - -PPF77COMPILE = $(F77) $(AMDEFS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_FFLAGS) $(FFLAGS) -LTPPF77COMPILE = $(LIBTOOL) --mode=compile --tag=F77 $(F77) $(AMDEFS) $(DEFS) \ - $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ - $(AM_FFLAGS) $(FFLAGS) -COMPILE = $(CC) $(AMDEFS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(AMDEFS) $(DEFS) \ - $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ - $(AM_CFLAGS) $(CFLAGS) diff -Nur lis-1.4.23.orig/src/vector/Makefile.am lis-1.4.23/src/vector/Makefile.am --- lis-1.4.23.orig/src/vector/Makefile.am 2014-01-14 21:30:01.373264712 -0800 +++ lis-1.4.23/src/vector/Makefile.am 2014-01-14 21:30:25.932420643 -0800 @@ -4,16 +4,5 @@ lis_vector_opv.c -AM_CFLAGS = -I$(top_srcdir)/include +AM_CPPFLAGS = -I$(top_srcdir)/include CLEANFILES = *.il - -PPF77COMPILE = $(F77) $(AMDEFS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_FFLAGS) $(FFLAGS) -LTPPF77COMPILE = $(LIBTOOL) --mode=compile --tag=F77 $(F77) $(AMDEFS) $(DEFS) \ - $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ - $(AM_FFLAGS) $(FFLAGS) -COMPILE = $(CC) $(AMDEFS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(AMDEFS) $(DEFS) \ - $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ - $(AM_CFLAGS) $(CFLAGS) diff -Nur lis-1.4.23.orig/test/Makefile.am lis-1.4.23/test/Makefile.am --- lis-1.4.23.orig/test/Makefile.am 2014-01-14 21:30:01.360264625 -0800 +++ lis-1.4.23/test/Makefile.am 2014-01-14 21:34:47.093078248 -0800 @@ -5,15 +5,16 @@ EXTRA_DIST = defs test.sh testmat.mtx testmat2.mtx -testdir = ${prefix}/share/examples/lis +testdir = $(libdir)/lis/examples test_DATA = testmat.mtx testmat2.mtx test_SCRIPTS = defs test.sh -test_PROGRAMS = test1 test2 test2b test3 test3b test4 test5 test6 etest1 etest2 etest3 etest4 etest5 etest6 spmvtest1 spmvtest2 spmvtest2b spmvtest3 spmvtest3b spmvtest4 spmvtest5 +check_PROGRAMS = test1 test2 test2b test3 test3b test4 test5 test6 etest1 etest2 etest3 etest4 etest5 etest6 spmvtest1 spmvtest2 spmvtest2b spmvtest3 spmvtest3b spmvtest4 spmvtest5 if ENABLE_FORTRAN - test_PROGRAMS += test1f test4f etest1f etest4f + check_PROGRAMS += test1f test4f etest1f etest4f + LDADD += $(FLIBS) endif test1_SOURCES = test1.c @@ -44,38 +45,11 @@ etest4f_SOURCES = etest4f.F endif -bin_PROGRAMS = lsolve esolve spmvtest1 spmvtest2 spmvtest2b spmvtest3 spmvtest3b spmvtest4 spmvtest5 +noinst_PROGRAMS = lsolve esolve spmvtest1 spmvtest2 spmvtest2b spmvtest3 spmvtest3b spmvtest4 spmvtest5 lsolve_SOURCES = test1.c esolve_SOURCES = etest5.c -PPF77COMPILE = $(F77) $(AMDEFS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_FFLAGS) $(FFLAGS) -LTPPF77COMPILE = $(LIBTOOL) --mode=compile --tag=F77 $(F77) $(AMDEFS) $(DEFS) \ - $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ - $(AM_FFLAGS) $(FFLAGS) -COMPILE = $(CC) $(AMDEFS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(AMDEFS) $(DEFS) \ - $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ - $(AM_CFLAGS) $(CFLAGS) - -if ENABLE_SAAMG - LINK = $(LIBTOOL) --mode=link $(FC) \ - $(AM_LDFLAGS) $(LDFLAGS) $(FCLDFLAGS) -o $@ $(LIBS) $(CLIBS) - F77LINK = $(LIBTOOL) --mode=link $(FC) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ $(LIBS) $(CLIBS) -else -if ENABLE_FORTRAN - LINK = $(LIBTOOL) --mode=link $(FC) \ - $(AM_LDFLAGS) $(LDFLAGS) $(FCLDFLAGS) -o $@ $(LIBS) $(CLIBS) - F77LINK = $(LIBTOOL) --mode=link $(F77) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ $(LIBS) $(CLIBS) -else - LINK = $(LIBTOOL) --mode=link $(CC) $(AM_LDFLAGS) $(LDFLAGS) -o $@ $(LIBS) -endif -endif - CLEANFILES = *.il