[Plplot-cvs] plplot/cf f95.ac,1.4,1.5

[Alan W. I. <ai...@us...>]

Update of /cvsroot/plplot/plplot/cf
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12312/cf

Modified Files:
	f95.ac 
Log Message:
Install fortran 95 module files in more standard location.


Index: f95.ac
===================================================================
RCS file: /cvsroot/plplot/plplot/cf/f95.ac,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- f95.ac	16 May 2006 02:17:51 -0000	1.4
+++ f95.ac	17 May 2006 03:30:31 -0000	1.5
@@ -34,10 +34,22 @@
   AC_MSG_RESULT(yes),
   AC_MSG_RESULT(no); enable_f95=no)
   AC_LANG_POP([Fortran])
-])
-if test "$enable_f95" = no ; then
-    AC_MSG_WARN([Disabling f95 interface])
-fi
+ ]
+)
+AS_IF([test "$enable_f95" = yes],
+ [
+  ### Directory for fortran 95 modules
+  test -z "$MODULES_DIR" && MODULES_DIR="$datadir/fortran/modules/plplot"
+  ### examples/f95/Makefile.examples.in requires MODULESINCCMD
+  ### The symbolic exec_prefix must be replaced by the actual exec_prefix.
+  PL_EXPAND_EXPRESSION(MODULESINCCMD, $MODULES_DIR)
+  MODULESINCCMD="-I$MODULESINCCMD"
+ ],
+ [
+  AC_MSG_WARN([Disabling f95 interface])
+ ]
+)
+AC_SUBST(MODULESINCCMD)
 AC_SUBST(enable_f95)
 
 AM_CONDITIONAL(enable_f95, [test "$enable_f95" = yes])