Menu
▾
▴
gtk2hs-commit
|
From: Jens-Ulrik P. <ju...@us...> - 2004-08-19 07:55:05
|
Update of /cvsroot/gtk2hs/gtk2hs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13198 Modified Files: ChangeLog Makefile configure.in gtk2hs.spec.in Log Message: Update make files and all to support building documentation with haddock. Other minor build fixes. Remove gendoc and doc. * sourceview/Makefile (C2HS_EXTRA_FLAGS): Replaces HIDIRS for c2hs. * mogul/Makefile: Add EXCLUDE_DOCS and PREPROC_DOCS for haddock. * mk/recurse.mk: Remove $(MAKE_DOCS) dependency from all targets. Add html and install-html targets. * mk/library.mk (PKGDOCDIR): New variable to hold package doc dir. (html): New target that builds packages docs with haddock. Just warns if HADDOCK is not defined. (install-html): New target to install packages docs. * mk/config.mk.in: Add HADDOCK and GHC_DOCDIR replacing BUILDDOCS, xml and xslt related variables. * mk/common.mk (INST_DOCDIR): Setup new variable. (C2HSFLAGGED): Add C2HS_EXTRA_FLAGS for finding .chi files. * gtk/multiline/TextView.chs: Fix doc typos at top. * gtk/Makefile: Add EXCLUDE_DOCS and PREPROC_DOCS for haddock. * glade/Makefile (C2HS_EXTRA_FLAGS): Replaces HIDIRS for c2hs only. * gconf/System/Gnome/GConf/GConfClient.chs: Doc tweaks to make haddock happy at top and for gconfAddDir. * gconf/Makefile (C2HS_EXTRA_FLAGS): Replaces HIDIRS for c2hs only. * gtk2hs.spec.in: Use ghc-6.2.1 and define short ghc version %ghcver. Use License instead of Copyright. Update buildrequires. Add separate subpackages for sourceview, gconf and glade Name subpackages with %ghcver. Subpackages now require the appropriate -devel package. Define %ghclibdir and %gtk2hsdir. (%build): Update configure invocation - drop xml options and use --prefix and --libdir. Make html. Use mkdir. Clean demo dirs with find. (%post,%preun): Update and add scripts for new subpackages. (%files): Html docs are now in /usr/share/doc/gtk2hs. * configure.in: Comment out GtkGLExt, HOpenGL checks. Check for haddock instead of xslt. Add --with-ghc-docdir option. Remove xml catalog and xsl checks. Replace missing xml final warning with haddock missing warning. * Makefile: No longer build gendoc or doc. Build mogul after gtk2. Index: gtk2hs.spec.in =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/gtk2hs.spec.in,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- gtk2hs.spec.in 11 Nov 2003 12:03:38 -0000 1.9 +++ gtk2hs.spec.in 19 Aug 2004 07:54:18 -0000 1.10 @@ -1,19 +1,23 @@ # RPM spec file for Gtk2HS -*-rpm-spec-*- # # Copyright [2001..2002] Manuel M T Chakravarty <ch...@cs...> -# Copyright 2002, 2003 Jens-Ulrik Holger Petersen <pet...@ha...> +# Copyright 2002, 2003, 2004 Jens-Ulrik Holger Petersen <pet...@ha...> -%define ghc_version 6.0.1 +%define ghc_version 6.2.1 +%define ghcver 621 Summary: Haskell binding for the GIMP Toolkit (GTK2), a GUI library Name: gtk2hs Version: @VERSION@ Release: 0.%(date +%%Y%%m%%d) -Copyright: LGPL +Epoch: 0 +License: LGPL Group: Development/Libraries Source: gtk2hs-%{version}.tar.gz URL: http://gtk2hs.sourceforge.net/ -BuildRoot: /var/tmp/gtk2hs-%{version}-%{release}-root +BuildRoot: /var/tmp/gtk2hs-%{version}-root +BuildRequires: ghc = %{ghc_version}, %{_bindir}/hsc2hs, haddock, %{?_with_c2hs: c2hs >= 0.10.6} +BuildRequires: gtk2-devel, gtksourceview-devel, libglade2-devel, GConf2-devel %description A Gtk2 binding for the functional language Haskell featuring @@ -23,15 +27,14 @@ MoGuL (Monad Gui Library) makes it possible to create and lookup named widgets in a type safe way. -%package ghc%{ghc_version} +%package ghc%{ghcver} Summary: Haskell binding for the GIMP Toolkit (GTK2), a GUI library Group: Development/Languages/Haskell -BuildRequires: ghc = %{ghc_version}, gtk2-devel, gtksourceview-devel, %{?_with_c2hs: c2hs >= 0.10.6}, %{_bindir}/hsc2hs Requires: ghc = %{ghc_version} -Requires: gtk2, gtksourceview +Requires: gtk2-devel Requires(post,preun): %{_bindir}/ghc-pkg-%{ghc_version} -%description ghc%{ghc_version} +%description ghc%{ghcver} A Gtk2 binding for the functional language Haskell featuring automatic memory management, unicode support, and quite wide coverage of widget functions and their signals, including @@ -41,6 +44,42 @@ This package contains the libraries compiled for ghc-%{ghc_version}. +%package sourceview-ghc%{ghcver} +Summary: Haskell binding for gtksourceview +Group: Development/Languages/Haskell +Requires: ghc = %{ghc_version} +Requires: gtk2hs-ghc%{ghcver} = %{version}-%{release}, gtksourceview-devel +Requires(post,preun): %{_bindir}/ghc-pkg-%{ghc_version} + +%description sourceview-ghc%{ghcver} +A GConf binding for gtk2hs. + +This package is compiled for ghc-%{ghc_version}. + +%package gconf-ghc%{ghcver} +Summary: Haskell binding for GConf +Group: Development/Languages/Haskell +Requires: ghc = %{ghc_version} +Requires: gtk2hs-ghc%{ghcver} = %{version}-%{release}, GConf-devel +Requires(post,preun): %{_bindir}/ghc-pkg-%{ghc_version} + +%description gconf-ghc%{ghcver} +A GConf binding for gtk2hs. + +This package is compiled for ghc-%{ghc_version}. + +%package glade-ghc%{ghcver} +Summary: Haskell binding of glade for gtk2hs. +Group: Development/Languages/Haskell +Requires: ghc = %{ghc_version} +Requires: libglade2-devel +Requires(post,preun): %{_bindir}/ghc-pkg-%{ghc_version} + +%description glade-ghc%{ghcver} +A Glade2 binding for gtk2hs. + +This package is compiled for ghc-%{ghc_version}. + %package doc Summary: Haskell binding for the GIMP Toolkit (GTK2), a GUI library Group: Development/Languages/Haskell @@ -59,56 +98,108 @@ %define debug_package %{nil} %define __spec_install_post /usr/lib/rpm/brp-compress +%define ghclibdir %{_libdir}/ghc-%{ghc_version} +%define gtk2hsdir %{ghclibdir}/gtk2hs + %prep %setup -q %build -./configure %{?c2hs: --with-c2hs=%{c2hs}} --with-hc=ghc-%{ghc_version} --with-hcflags="-O" --with-catalog=%{_datadir}/sgml/docbook/xmlcatalog --with-html=%{_datadir}/sgml/docbook/xsl-stylesheets/xhtml/chunk.xsl # --with-fo=%{_datadir}/sgml/docbook/xsl-stylesheets/fo/docbook.xsl -make prefix=%{_prefix} libdir=%{_libdir}/ghc-%{ghc_version} +./configure %{?c2hs: --with-c2hs=%{c2hs}} --with-hc=ghc-%{ghc_version} --with-hcflags="-O" --enable-sourceview --enable-libglade --with-ghc-docdir=%{_datadir}/doc/ghc-doc-%{ghc_version} --prefix=%{_prefix} --libdir=%{ghclibdir} + +LANG=C make all html %install rm -rf %{buildroot} -make DESTDIR=%{buildroot} prefix=%{_prefix} libdir=%{_libdir}/ghc-%{ghc_version} install-without-pkg +make DESTDIR=%{buildroot} install-without-pkg install-html -mkdirhier %{buildroot}%{_datadir}/gtksourceview-1.0/language-specs +mkdir -p %{buildroot}%{_datadir}/gtksourceview-1.0/language-specs cp -p demo/sourceview/haskell.lang %{buildroot}%{_datadir}/gtksourceview-1.0/language-specs -# hack to avoid demo binaries in docs -make clean MAKE_GOALS="demo/concurrent demo/treeList demo/graphic demo/unicode demo/hello demo/sourceview" +# clean demo dirs +find -type f \( -name "*.hi" -o -name "*.o" -o -exec test -x '{}' ';' \) -exec rm '{}' ';' %clean rm -rf %{buildroot} -%post ghc%{ghc_version} -# # remove buildroot traces from package files -# perl -pi -e "s|%{buildroot}||" \ -# %{_libdir}/ghc-%{ghc_version}/{%{name}/gtk2.conf,mogul.conf} +%post ghc%{ghcver} +ghc-pkg-%{ghc_version} -u -g -i %{gtk2hsdir}/gtk2/gtk2.conf +ghc-pkg-%{ghc_version} -u -g -i %{gtk2hsdir}/mogul/mogul.conf -ghc-pkg-%{ghc_version} -u -g -i %{_libdir}/ghc-%{ghc_version}/%{name}/gtk2/gtk2.conf -ghc-pkg-%{ghc_version} -u -g -i %{_libdir}/ghc-%{ghc_version}/%{name}/sourceview/sourceview.conf -ghc-pkg-%{ghc_version} -u -g -i %{_libdir}/ghc-%{ghc_version}/%{name}/mogul/mogul.conf +%post sourceview-ghc%{ghcver} +ghc-pkg-%{ghc_version} -u -g -i %{gtk2hsdir}/sourceview/sourceview.conf -%preun ghc%{ghc_version} +%post gconf-ghc%{ghcver} +ghc-pkg-%{ghc_version} -u -g -i %{gtk2hsdir}/gconf/gconf.conf + +%post glade-ghc%{ghcver} +ghc-pkg-%{ghc_version} -u -g -i %{gtk2hsdir}/glade/glade.conf + +%preun ghc%{ghcver} if [ "$1" = 0 ]; then - rm -f %{_libdir}/ghc-%{ghc_version}/%{name}/{gtk2/gtk2hs.o,mogul/mogul.o,spirceview/sourceview.o} + rm -f %{gtk2hsdir}/{gtk2/gtk2hs,mogul/mogul}.o ghc-pkg-%{ghc_version} -r mogul || : - ghc-pkg-%{ghc_version} -r sourceview || : ghc-pkg-%{ghc_version} -r gtk2 || : fi -%files ghc%{ghc_version} +%preun sourceview-ghc%{ghcver} +if [ "$1" = 0 ]; then + rm -f %{gtk2hsdir}/sourceview/sourceview.o + ghc-pkg-%{ghc_version} -r sourceview || : +fi + +%preun gconf-ghc%{ghcver} +if [ "$1" = 0 ]; then + rm -f %{gtk2hsdir}/gconf/gconf.o + ghc-pkg-%{ghc_version} -r gconf || : +fi + +%preun glade-ghc%{ghcver} +if [ "$1" = 0 ]; then + rm -f %{gtk2hsdir}/glade/glade.o + ghc-pkg-%{ghc_version} -r glade || : +fi + +%files ghc%{ghcver} %defattr(-,root,root) -%{_prefix}/lib/* -%{_datadir}/gtksourceview-1.0/language-specs/haskell.lang +%dir %{gtk2hsdir} +%{gtk2hsdir}/gtk2 +%{gtk2hsdir}/mogul %doc ChangeLog TODO AUTHORS COPYING.LIB +%files sourceview-ghc%{ghcver} +%defattr(-,root,root) +%{gtk2hsdir}/sourceview +%{_datadir}/gtksourceview-1.0/language-specs + +%files gconf-ghc%{ghcver} +%defattr(-,root,root) +%{gtk2hsdir}/gconf + +%files glade-ghc%{ghcver} +%defattr(-,root,root) +%{gtk2hsdir}/glade + %files doc %defattr(-,root,root) %doc demo -%doc doc/GTK -%doc doc/MOGUL +%{_datadir}/doc/gtk2hs %changelog +* Mon Aug 16 2004 Jens Petersen <pet...@ha...> - 0:0.9.6-0.fdr.1 +- 0.9.6 + +* Thu Jul 22 2004 Jens Petersen <pet...@ha...> +- split sourceview and glade into separate subpackages +- require -devel packages rather than lib pkg for gtk2, gtksourceview, + and libglade2 + +* Wed Mar 24 2004 Jens Petersen <pet...@ha...> +- enable gtksourceview and glade configure options +- use mkdir -p instead of mkdirhier +- update file locations in %%post and %%preun scripts +- buildrequire libglade2-devel + * Tue Nov 11 2003 Jens Petersen <pet...@ha...> - use %%c2hs instead of "--with c2hs" to configure c2hs program - clean demo to avoid binary files in docs dir Index: ChangeLog =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v retrieving revision 1.224 retrieving revision 1.225 diff -u -d -r1.224 -r1.225 --- ChangeLog 16 Aug 2004 07:35:54 -0000 1.224 +++ ChangeLog 19 Aug 2004 07:54:18 -0000 1.225 @@ -1,3 +1,52 @@ +2004-08-19 Jens Petersen <pet...@ha...> + + * sourceview/Makefile (C2HS_EXTRA_FLAGS): Replaces HIDIRS for c2hs. + + * mogul/Makefile: Add EXCLUDE_DOCS and PREPROC_DOCS for haddock. + + * mk/recurse.mk: Remove $(MAKE_DOCS) dependency from all targets. + Add html and install-html targets. + + * mk/library.mk (PKGDOCDIR): New variable to hold package doc dir. + (html): New target that builds packages docs with haddock. Just + warns if HADDOCK is not defined. + (install-html): New target to install packages docs. + + * mk/config.mk.in: Add HADDOCK and GHC_DOCDIR replacing BUILDDOCS, + xml and xslt related variables. + + * mk/common.mk (INST_DOCDIR): Setup new variable. + (C2HSFLAGGED): Add C2HS_EXTRA_FLAGS for finding .chi files. + + * gtk/multiline/TextView.chs: Fix doc typos at top. + + * gtk/Makefile: Add EXCLUDE_DOCS and PREPROC_DOCS for haddock. + + * glade/Makefile (C2HS_EXTRA_FLAGS): Replaces HIDIRS for c2hs only. + + * gconf/System/Gnome/GConf/GConfClient.chs: Doc tweaks to make + haddock happy at top and for gconfAddDir. + + * gconf/Makefile (C2HS_EXTRA_FLAGS): Replaces HIDIRS for c2hs only. + + * gtk2hs.spec.in: Use ghc-6.2.1 and define short ghc version %ghcver. + Use License instead of Copyright. Update buildrequires. + Add separate subpackages for sourceview, gconf and glade + Name subpackages with %ghcver. Subpackages now require the + appropriate -devel package. Define %ghclibdir and %gtk2hsdir. + (%build): Update configure invocation - drop xml options and + use --prefix and --libdir. Make html. Use mkdir. Clean demo + dirs with find. + (%post,%preun): Update and add scripts for new subpackages. + (%files): Html docs are now in /usr/share/doc/gtk2hs. + + * configure.in: Comment out GtkGLExt, HOpenGL checks. Check for + haddock instead of xslt. Add --with-ghc-docdir option. + Remove xml catalog and xsl checks. Replace missing xml final warning + with haddock missing warning. + + * Makefile: No longer build gendoc or doc. Build mogul after gtk2. + 2004-08-15 Axel Simon <A....@ke...> * mk/common.mk, mk/library.mk, mk/recurse.mk, Makefile: Make clean Index: Makefile =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/Makefile,v retrieving revision 1.32 retrieving revision 1.33 diff -u -d -r1.32 -r1.33 --- Makefile 16 Aug 2004 07:35:54 -0000 1.32 +++ Makefile 19 Aug 2004 07:54:18 -0000 1.33 @@ -10,14 +10,10 @@ MAKE_TOOLS += c2hs endif -ifeq ($(strip $(BUILDDOCS)),no) -MAKE_VERB = gendoc doc -else -MAKE_DOCS = gendoc doc -endif - MAKE_LIBS = gtk +MAKE_LIBS += mogul + ifeq ($(strip $(ENABLE_LIBGLADE)),yes) MAKE_LIBS += glade endif @@ -26,8 +22,6 @@ MAKE_LIBS += sourceview gconf endif -MAKE_LIBS += mogul - MAKE_APPS = demo/concurrent demo/treeList demo/graphic demo/unicode \ demo/hello demo/buttonbox Index: configure.in =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/configure.in,v retrieving revision 1.42 retrieving revision 1.43 diff -u -d -r1.42 -r1.43 --- configure.in 11 Aug 2004 08:41:55 -0000 1.42 +++ configure.in 19 Aug 2004 07:54:18 -0000 1.43 @@ -212,25 +212,25 @@ fi; -dnl Check if user wants GtkGLExt extension. Make the default value for this -dnl flag dependant on whether it is installed or not. -ENABLE_OPENGL=yes; -AC_MSG_CHECKING([if OpenGL extension can be built]) - -AC_ARG_ENABLE(glext, - [ --enable-glext generate binding for OpenGL rendering], - [FOUNDGLEXT=$enableval],[FOUNDGLEXT=yes]) - -dnl Reset the flag if GtkGLExt is not installed -$PKG_CONFIG --exists gtkglext-1.0 || FOUNDGLEXT=no; -if test x$FOUNDGLEXT = xno; then ENABLE_OPENGL=no;fi; - -dnl Reset the flag if HOpenGL is not installed -FOUNDHOPENGL=yes; -$GHCPKG -l | $GREP OpenGL > /dev/null || FOUNDHOPENGL=no; -if test x$FOUNDHOPENGL = xno; then ENABLE_OPENGL=no;fi; - -AC_MSG_RESULT($ENABLE_OPENGL) +dnl dnl Check if user wants GtkGLExt extension. Make the default value for this +dnl dnl flag dependant on whether it is installed or not. +dnl ENABLE_OPENGL=yes; +dnl AC_MSG_CHECKING([if OpenGL extension can be built]) +dnl +dnl AC_ARG_ENABLE(glext, +dnl [ --enable-glext generate binding for OpenGL rendering], +dnl [FOUNDGLEXT=$enableval],[FOUNDGLEXT=yes]) +dnl +dnl dnl Reset the flag if GtkGLExt is not installed +dnl $PKG_CONFIG --exists gtkglext-1.0 || FOUNDGLEXT=no; +dnl if test x$FOUNDGLEXT = xno; then ENABLE_OPENGL=no;fi; +dnl +dnl dnl Reset the flag if HOpenGL is not installed +dnl FOUNDHOPENGL=yes; +dnl $GHCPKG -l | $GREP OpenGL > /dev/null || FOUNDHOPENGL=no; +dnl if test x$FOUNDHOPENGL = xno; then ENABLE_OPENGL=no;fi; +dnl +dnl AC_MSG_RESULT($ENABLE_OPENGL) dnl Check if user wants libglade bindings. Defaults to yes. AC_MSG_CHECKING([whether to build libglade bindings]) @@ -253,9 +253,9 @@ dnl Check for the GTK&Co libraries. Use the special PKG_CHECK_MODULES dnl macro from the pkg-config program. PKG_CHECK_MODULES(GTK,[glib-2.0 >= 2.0.0 gdk-2.0 >= 2.0.0 gtk+-2.0 >= 2.0.0 gdk-pixbuf-2.0 >= 0.12.0]) -if test x$ENABLE_OPENGL = xyes; then - PKG_CHECK_MODULES(GTKGLEXT,[gtkglext-1.0 >= 0.7.1]) -fi +dnl if test x$ENABLE_OPENGL = xyes; then +dnl PKG_CHECK_MODULES(GTKGLEXT,[gtkglext-1.0 >= 0.7.1]) +dnl fi if test x$ENABLE_LIBGLADE = xyes; then PKG_CHECK_MODULES(LIBGLADE,[libglade-2.0 >= 2.0.0]) fi @@ -459,85 +459,13 @@ VERSION=`cat $TOP/VERSION` dnl Documentation +AC_PATH_PROG(HADDOCK,haddock) -BUILDDOCS=yes; - -dnl Check for the XSLT translator -FOUNDTRANSLATOR=yes; - -AC_PATH_PROG(XSLTTRANS, xsltproc, no-translator) - -if test $XSLTTRANS = no-translator; then - BUILDDOCS=no; - FOUNDTRANSLATOR=no; -fi - -XML_CATALOG_FILES=/usr/local/share/xml/catalog:/usr/share/xml/catalog; -AC_ARG_WITH(catalog, - [ --with-catalog=catalog an XML catalog file pointing to DocBook], - [XML_CATALOG_FILES=$withval:$XML_CATALOG_FILES]) - -AC_MSG_CHECKING([for XML catalog]) -OLDIFS=$IFS; -IFS=:; -FOUNDCATALOG=no; -for CATALOG in $XML_CATALOG_FILES; do - if test -r $CATALOG; then FOUNDCATALOG=yes; fi; -done; -IFS=$OLDIFS; -if test $FOUNDCATALOG = no; then - BUILDDOCS=no; -fi; -AC_MSG_RESULT([$FOUNDCATALOG]); - -dnl Check for XSLT translation descriptions -FOUNDHTML=yes; -FOUNDFO=yes; -AC_ARG_WITH(html, - [ --with-html=html.xsl an XSLT file for generating (X)HTML], - [XSLTHTML=$withval;], - [XSLTHTML=no;]) -AC_ARG_WITH(fo, - [ --with-fo=fo.xsl an XSLT file for generating formatting objects (FO)], - [XSLTFO=$withval;], - [XSLTFO=no;]) -AC_MSG_CHECKING([XSLT translations]) -dnl if the user just says --with-html, we still have to search for it -if test $XSLTHTML = yes; then XSLTHTML=no; fi; -if test $XSLTFO = yes; then XSLTFO=no; fi; -XSLTPATH=no-xslt; -OLDIFS=$IFS; -IFS=:; -for DIR in $XML_CATALOG_FILES; do - XSLTPATH=`dirname $DIR | $SED s/xml/xsl/`; - if test -r $XSLTPATH/docbook/xhtml/chunk.xsl; then - if test $XSLTHTML = no; then - XSLTHTML=$XSLTPATH/docbook/xhtml/chunk.xsl; - fi; - fi; - if test -r $XSLTPATH/docbook/fo/docbook.xsl; then - if test $XSLTFO = no; then - XSLTFO=$XSLTPATH/docbook/fo/docbook.xsl; - fi; - fi; -done; -IFS=$OLDIFS; -if test ! -r $XSLTHTML; then - FOUNDHTML=no; -fi; -if test ! -r $XSLTFO; then - FOUNDFO=no; -fi; -if test $FOUNDHTML = no -a $FOUNDFO = no; then - BUILDDOCS=no; -fi; -AC_MSG_RESULT([HTML: $FOUNDHTML, FO: $FOUNDFO]) -if test $BUILDDOCS = yes; then - AC_MSG_RESULT([HTML: $XSLTHTML]) - AC_MSG_RESULT([FO: $XSLTFO]) -fi; +GHC_DOCDIR=${datadir}/doc/ghc +AC_ARG_WITH(ghc-docdir, + [ --with-ghc-docdir=GHC_DOCDIR location of top of ghc haddockified html documentation], + [GHC_DOCDIR=$withval]) - dnl Needed substitution. AC_SUBST(PWD) AC_SUBST(TOP) @@ -568,7 +496,7 @@ AC_SUBST(GTK_VERSION_2_4) AC_SUBST(DISABLE_DEPRECATED) dnl Optional packages -AC_SUBST(ENABLE_OPENGL) +dnl AC_SUBST(ENABLE_OPENGL) AC_SUBST(ENABLE_LIBGLADE) AC_SUBST(ENABLE_GNOME) AC_SUBST(SOURCEVIEW_CFLAGS) @@ -578,13 +506,8 @@ AC_SUBST(GCONF_CFLAGS) AC_SUBST(GCONF_LIBS) dnl Documentation -AC_SUBST(BUILDDOCS) -AC_SUBST(XSLTTRANS) -AC_SUBST(XML_CATALOG_FILES) -AC_SUBST(FOUNDHTML) -AC_SUBST(XSLTHTML) -AC_SUBST(FOUNDFO) -AC_SUBST(XSLTFO) +AC_SUBST(HADDOCK) +AC_SUBST(GHC_DOCDIR) dnl The c2hs part. AC_SUBST(CPP) AC_SUBST(LEGACY_FFI) @@ -609,22 +532,27 @@ echo "**************************************************" echo "* Configuration completed successfully. *" echo "* *" -if test $BUILDDOCS = no; then - echo "* Warning: The documentation will not be built: *" - if test $FOUNDTRANSLATOR = no; then - echo "* - the xsltproc translator was not found *" - fi; - if test $FOUNDCATALOG = no; then - echo "* - no XML catalog files were found *" - fi; - if test $FOUNDHTML = no; then - echo "* - no HTML XSL translation file was found *" - fi; - if test $FOUNDFO = no; then - echo "* - no FO XSL translation file was found *" - fi; - echo "* *" -fi; +if test -z "$HADDOCK"; then + echo "* Warning: The documentation will not be built: *" + echo "* - haddock was not found *" + echo "* *" +fi +dnl if test $BUILDDOCS = no; then +dnl echo "* Warning: The documentation will not be built: *" +dnl if test $FOUNDTRANSLATOR = no; then +dnl echo "* - the xsltproc translator was not found *" +dnl fi; +dnl if test $FOUNDCATALOG = no; then +dnl echo "* - no XML catalog files were found *" +dnl fi; +dnl if test $FOUNDHTML = no; then +dnl echo "* - no HTML XSL translation file was found *" +dnl fi; +dnl if test $FOUNDFO = no; then +dnl echo "* - no FO XSL translation file was found *" +dnl fi; +dnl echo "* *" +dnl fi; dnl if test $ENABLE_OPENGL = no; then dnl echo "* Warning: OpenGL support is not available: *" dnl if test x$FOUNDGLEXT = xno; then |
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X