/[volute]/trunk/projects/vocabularies/configure.ac
ViewVC logotype

Diff of /trunk/projects/vocabularies/configure.ac

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 15 by norman.x.gray, Thu Dec 6 17:28:48 2007 UTC revision 16 by norman.x.gray, Fri Dec 7 13:45:23 2007 UTC
# Line 5  Line 5 
5    
6  AC_INIT(ivoa-vocabularies, 0.01, norman@astro.gla.ac.uk)  AC_INIT(ivoa-vocabularies, 0.01, norman@astro.gla.ac.uk)
7  AC_SUBST(RELEASEDATE, '2007 December 6') dnl ...as words  AC_SUBST(RELEASEDATE, '2007 December 6') dnl ...as words
8  AC_SUBST(RELEASEDATEN, '2007-12-06')     dnl ...as yyyy-mm-dd  AC_SUBST(RELEASEDATEN, 2007-12-06)       dnl ...as yyyy-mm-dd
9  dnl Base URI for distribution -- no trailing slash  dnl Base URI for distribution -- no trailing slash
10  AC_SUBST(BASEURI, 'http://www.ivoa.net/Documents/ivoa-thesaurus-@PACKAGE_VERSION@')  AC_SUBST(BASEURI, 'http://www.ivoa.net/Documents/ivoa-thesaurus-@PACKAGE_VERSION@')
11    
# Line 15  Line 15 
15  AC_PATH_PROGS(PYTHON, python)  AC_PATH_PROGS(PYTHON, python)
16  AC_PATH_PROGS(TAR, tar)  AC_PATH_PROGS(TAR, tar)
17    
18    dnl  Handle --with-xsltproc[=path] and --with-saxon[=jarfile] options
19    process_xslt_with=xsltproc
20    AC_ARG_WITH([xsltproc],
21      [AS_HELP_STRING([--with-xsltproc],
22        [choose a non-default xsltproc executable])],
23      [if test "$with_xsltproc" = yes; then with_xsltproc=xsltproc; fi
24       AC_PATH_PROG(XSLTPROC, $with_xsltproc)
25       process_xslt_with=xsltproc],
26      [AC_PATH_PROG(XSLTPROC, xsltproc)
27       process_xslt_with=xsltproc])
28    AC_ARG_WITH([saxon],
29      [AS_HELP_STRING([--with-saxon],
30        [process XSLT using the named Saxon8 jar file])],
31      [if test "$with_saxon" = "yes"; then
32         AC_SUBST(SAXONJAR, [saxon8.jar])
33         process_xslt_with=saxon
34       else
35         AC_CHECK_FILE($with_saxon,
36           [],
37           [AC_MSG_WARN([The jar file $with_saxon does not exist])])
38         AC_SUBST(SAXONJAR, $with_saxon)
39         process_xslt_with=saxon
40       fi])
41    
42    dnl  Now add the conditionals
43    if test $process_xslt_with = saxon; then
44      AC_MSG_NOTICE([XSL transforms using Saxon])
45      AC_SUBST(USE_SAXON,    [])
46      AC_SUBST(USE_XSLTPROC, [#])
47    else
48      AC_MSG_NOTICE([XSL transforms using xsltproc])
49      AC_SUBST(USE_SAXON,    [#])
50      AC_SUBST(USE_XSLTPROC, [])
51    fi
52    
53    
54  # CWM will almost certainly have to be overridden on the command-line  # CWM will almost certainly have to be overridden on the command-line
55  # This appears to need the CVS version of cwm, available from  # This appears to need the CVS version of cwm, available from
56  # <http://www.w3.org/2000/10/swap/doc/cwm.html> (the 1.0.0 `release'  # <http://www.w3.org/2000/10/swap/doc/cwm.html> (the 1.0.0 `release'

Legend:
Removed from v.15  
changed lines
  Added in v.16

msdemlei@ari.uni-heidelberg.de
ViewVC Help
Powered by ViewVC 1.1.26