From: panne Date: Fri, 22 Aug 2003 10:21:47 +0000 (+0000) Subject: [project @ 2003-08-22 10:21:46 by panne] X-Git-Tag: Approx_11550_changesets_converted~528 X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=13ec31c00cdb714370077c8b0a3805452609315d [project @ 2003-08-22 10:21:46 by panne] The autoconf magic for the library documentation belongs to libraries/, not ghc/. --- diff --git a/configure.ac b/configure.ac index c8e75b0..d24e1e3 100644 --- a/configure.ac +++ b/configure.ac @@ -24,9 +24,9 @@ AC_PREREQ(2.52) dnl * Declare subdirectories that have a private configure script dnl dnl After the toplevel configuration is complete, the script will recurse into -dnl these subdirectories (the use of cache values makes repeated checks cheap) -dnl (We probably have to add hslibs/{OpenGL,GLUT} here later...) -AC_CONFIG_SUBDIRS(ghc) +dnl these subdirectories if they exist. The use of a cache file makes repeated +dnl checks cheap. +AC_CONFIG_SUBDIRS([ghc libraries]) # ------------------------------------------------------------------------- # Prepare to generate the following header files diff --git a/ghc/aclocal.m4 b/ghc/aclocal.m4 index e22229b..d4fba2e 100644 --- a/ghc/aclocal.m4 +++ b/ghc/aclocal.m4 @@ -1,9 +1,3 @@ -# FP_HTML_COMMENT(VARIABLE, PREFIX) -# --------------------------------- -AC_DEFUN([FP_HTML_COMMENT], -[AS_IF([$1], - [$2HTMLStart=""; $2HTMLEnd=""], - [$2HTMLStart=""])[]dnl -AC_SUBST([$2HTMLStart])[]dnl -AC_SUBST([$2HTMLEnd])[]dnl -])# FP_HTML_COMMENT +# Although we don't need any local macros currently, we leave this file here. +# Otherwise autoreconf invokes aclocal from the automake tools, which might +# be nonexistent or too old. diff --git a/ghc/configure.ac b/ghc/configure.ac index 338678c..31d06a6 100644 --- a/ghc/configure.ac +++ b/ghc/configure.ac @@ -1,5 +1,5 @@ # Initialise and check sanity. -AC_INIT(ghc.spec.in) +AC_INIT([ghc.spec.in]) # Compute the version number. version=`sed -e 's/.*$[[0-9]]$\.$[[0-9]]*$.*/\1.\2/' VERSION` @@ -9,29 +9,5 @@ patchlevel=1 AC_SUBST(version) AC_SUBST(patchlevel) -# Uncomment links to unix docs if necessary. -# NOTE: This is a slight hack: It needs to be synchronized with -# fptools/configure.ac and fptools/libraries/Makefile and should probably use -# target features instead of host. -AC_CANONICAL_HOST - -case $host in -i[[3456]]86-*-mingw32*) fp_supports_unix=no ;; -*) fp_supports_unix=yes ;; -esac -FP_HTML_COMMENT([test x"$fp_supports_unix" = xyes], [unix]) - -# Uncomment links to ObjectIO docs if necessary. -AC_ARG_ENABLE([objectio], - AC_HELP_STRING([--enable-objectio], - [Build ObjectIO, a portable GUI library for Haskell.])) -FP_HTML_COMMENT([test x"$enable_objectio" = xyes], [ObjectIO]) - -# Uncomment links to HOpenGL docs if necessary -AC_ARG_ENABLE([hopengl], - AC_HELP_STRING([--enable-hopengl], - [Build HOpenGL, a Haskell binding for OpenGL/GLUT.])) -FP_HTML_COMMENT([{ test x"$enable_hopengl" = xyes || test x"$enable_hopengl" = xx11; }], [HOpenGL]) - # Write the results... -AC_OUTPUT(ghc.spec docs/libraries.html) +AC_OUTPUT([ghc.spec]) diff --git a/ghc/docs/Makefile b/ghc/docs/Makefile index 467d39d..d11e3ad 100644 --- a/ghc/docs/Makefile +++ b/ghc/docs/Makefile @@ -3,7 +3,7 @@ include $(TOP)/mk/boilerplate.mk SUBDIRS = users_guide -PAGES = index.html libraries.html +PAGES = index.html install-docs :: $(PAGES) $(INSTALL_DIR) $(datadir)/html diff --git a/ghc/docs/libraries.html.in b/ghc/docs/libraries.html.in deleted file mode 100644 index 3c4605f..0000000 --- a/ghc/docs/libraries.html.in +++ /dev/null @@ -1,134 +0,0 @@ - - - - Haskell Hierarchical Libraries - - - -

Haskell Hierarchical Libraries

- -

The libraries are divided into several packages. - NOTE: there is not always a clean division between packages in the - hierarchy, which means a node and its children might be in - different packages. If you're looking for a specific module, try - all the packages below.

- -

- base -: - the Prelude, and a large collection of useful libraries. -
- haskell98 -: - Haskell 98 and FFI Standard Libraries. -
- haskell-src -: - manipulating Haskell source code. -
- network -: - networking support libraries. -
- parsec -: - monadic parser combinators. -
- QuickCheck -: - automatic specification-based testing. -
- readline -: - a library for interactively reading input from the console. -
- unix -: - supplies POSIX functionality. -
- OpenGL -: - 3D rendering. -
- GLUT -: - the OpenGL utility toolkit. -
- ObjectIO -: - GUI library. -

- -

Implementation-specific notes

- -

GHC/GHCi: - Most of the time, all the packages are available without the - need to use any additional command-line options. The only - time when this is not the case is when linking a program on the - command line, without using the --make option: in this - case you must list all the packages to link to by adding the - -package P flag (where P is the package - name) to the command line for each package. - See the User's Guide - for more details. -
Hugs 98: - Hugs provides almost all of the modules in the - base package - and all the modules in the - haskell98, - haskell-src, - network, - parsec and - QuickCheck packages. -@unixHTMLStart@ - Most of the modules in the unix - package are supported, too. -@unixHTMLEnd@ -@HOpenGLHTMLStart@ - If the target platform supports OpenGL, the - OpenGL and - GLUT packages are supported too. -@HOpenGLHTMLEnd@ - All those modules are always available, as a single hierarchy; - Hugs does not use the package subdivision. -
Nhc98: - The modules of the haskell98 package are available - without the need to use any additional compile-time options. - To use modules from some other package P with Nhc98, - add the compile-time option -package P. - Nhc98 currently provides many of the modules in the - base package (see the - Nhc98 libraries page - for a list). -

- - -