packages: tesseract/tesseract.spec, tesseract/tesseract-link.patch (NEW), t...

qboosh qboosh at pld-linux.org
Sun Nov 14 22:22:53 CET 2010


Author: qboosh                       Date: Sun Nov 14 21:22:53 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 3.00
- removed obsolete nojava,gcc44 patches
- added missing patch (missing ac/am source files taken from svn)
- added link patch (kill unnecessary png/jpeg/z linking)
- moved data to separate spec (tesseract-data)

---- Files affected:
packages/tesseract:
   tesseract.spec (1.22 -> 1.23) , tesseract-link.patch (NONE -> 1.1)  (NEW), tesseract-missing.patch (NONE -> 1.1)  (NEW), tesseract-gcc44.patch (1.1 -> NONE)  (REMOVED), tesseract-no-java.patch (1.2 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/tesseract/tesseract.spec
diff -u packages/tesseract/tesseract.spec:1.22 packages/tesseract/tesseract.spec:1.23
--- packages/tesseract/tesseract.spec:1.22	Wed Nov  4 17:18:22 2009
+++ packages/tesseract/tesseract.spec	Sun Nov 14 22:22:48 2010
@@ -1,37 +1,26 @@
 # $Revision$, $Date$
 # TODO:
 # - warnings at compile stage about pointer size on amd64 - needs check
-# - build dynamic library, not the static one
-#
-%define		lang_version	2.00
-
 Summary:	Tesseract Open Source OCR Engine
 Summary(pl.UTF-8):	Tesseract - silnik OCR o otwartych źródłach
 Name:		tesseract
-Version:	2.04
+Version:	3.00
 Release:	1
 License:	Apache v2.0
 Group:		Applications/Graphics
+#Source0Download: http://code.google.com/p/tesseract-ocr/downloads/list
 Source0:	http://tesseract-ocr.googlecode.com/files/%{name}-%{version}.tar.gz
-# Source0-md5:	b44eba1a9f4892ac62e484c807fe0533
-Source1:	http://tesseract-ocr.googlecode.com/files/%{name}-%{lang_version}.eng.tar.gz
-# Source1-md5:	b8291d6b3a63ce7879d688e845e341a9
-Source2:	http://tesseract-ocr.googlecode.com/files/%{name}-%{lang_version}.fra.tar.gz
-# Source2-md5:	64896b462e62572a3708bb461820126c
-Source3:	http://tesseract-ocr.googlecode.com/files/%{name}-%{lang_version}.ita.tar.gz
-# Source3-md5:	2759e1dae91a989a43490ff4c2253a4b
-Source4:	http://tesseract-ocr.googlecode.com/files/%{name}-%{lang_version}.deu.tar.gz
-# Source4-md5:	609d91b1ae3759a756b819b5d8403653
-Source5:	http://tesseract-ocr.googlecode.com/files/%{name}-%{lang_version}.spa.tar.gz
-# Source5-md5:	bc26a777b2384613895677cb8e61ca75
-Source6:	http://tesseract-ocr.googlecode.com/files/%{name}-%{lang_version}.nld.tar.gz
-# Source6-md5:	b2f6ede182cea4bbfffd3b040533ce58
-Patch0:		%{name}-no-java.patch
-Patch1:		%{name}-gcc44.patch
+# Source0-md5:	cc812a261088ea0c3d2da735be35d09f
+Patch0:		%{name}-missing.patch
+Patch1:		%{name}-link.patch
 URL:		http://code.google.com/p/tesseract-ocr/
+BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
-BuildRequires:	libtiff-devel
+BuildRequires:	leptonlib-devel
 BuildRequires:	libstdc++-devel
+BuildRequires:	libtiff-devel
+BuildRequires:	libtool
+Suggests:	tesseract-data >= 3
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -44,118 +33,46 @@
 latach 1985-1995. W 1995 roku był jednym z 3 najlepszych wg UNLV.
 Źródła zostały uwolnione przez HP i UNLV w 2005 roku.
 
-%package lang-de
-Summary:	German language data for Tesseract
-Summary(pl.UTF-8):	Dane języka niemieckiego dla Tesseracta
-Group:		Applications/Graphics
-Requires:	%{name} = %{version}-%{release}
-Obsoletes:	tesseract-deu
-
-%description lang-de
-This package contains the data files required to recognize German
-language.
-
-%description lang-de -l pl.UTF-8
-Ten pakiet zawiera pliki danych potrzebne do rozpoznawania języka
-niemieckiego.
-
-%package lang-en
-Summary:	English language data for Tesseract
-Summary(pl.UTF-8):	Dane języka angielskiego dla Tesseracta
-Group:		Applications/Graphics
-Requires:	%{name} = %{version}-%{release}
-Obsoletes:	tesseract-eng
-
-%description lang-en
-This package contains the data files required to recognize English
-language.
-
-%description lang-en -l pl.UTF-8
-Ten pakiet zawiera pliki danych potrzebne do rozpoznawania języka
-angielskiego.
-
-%package lang-es
-Summary:	Spanish language data for Tesseract
-Summary(pl.UTF-8):	Dane języka hiszpańskiego dla Tesseracta
-Group:		Applications/Graphics
-Requires:	%{name} = %{version}-%{release}
-Obsoletes:	tesseract-spa
-
-%description lang-es
-This package contains the data files required to recognize Spanish
-language.
-
-%description lang-es -l pl.UTF-8
-Ten pakiet zawiera pliki danych potrzebne do rozpoznawania języka
-hiszpańskiego.
-
-%package lang-fr
-Summary:	French language data for Tesseract
-Summary(pl.UTF-8):	Dane języka francuskiego dla Tesseracta
-Group:		Applications/Graphics
-Requires:	%{name} = %{version}-%{release}
-Obsoletes:	tesseract-fra
-
-%description lang-fr
-This package contains the data files required to recognize French
-language.
-
-%description lang-fr -l pl.UTF-8
-Ten pakiet zawiera pliki danych potrzebne do rozpoznawania języka
-francuskiego.
-
-%package lang-it
-Summary:	Italian language data for Tesseract
-Summary(pl.UTF-8):	Dane języka włoskiego dla Tesseracta
-Group:		Applications/Graphics
-Requires:	%{name} = %{version}-%{release}
-Obsoletes:	tesseract-ita
-
-%description lang-it
-This package contains the data files required to recognize Italian
-language.
-
-%description lang-it -l pl.UTF-8
-Ten pakiet zawiera pliki danych potrzebne do rozpoznawania języka
-włoskiego.
-
-%package lang-nl
-Summary:	Dutch language data for Tesseract
-Summary(pl.UTF-8):	Dane języka holenderskiego dla Tesseracta
-Group:		Applications/Graphics
+%package devel
+Summary:	Header files for Tesseract libraries
+Summary(pl.UTF-8):	Pliki nagłówkowe bibliotek Tesseracta
+Group:          Development/Libraries
 Requires:	%{name} = %{version}-%{release}
-Obsoletes:	tesseract-nl
+Requires:	leptonlib-devel
+Requires:	libstdc++-devel
+Requires:	libtiff-devel
 
-%description lang-nl
-This package contains the data files required to recognize Dutch
-language.
-
-%description lang-nl -l pl.UTF-8
-Ten pakiet zawiera pliki danych potrzebne do rozpoznawania języka
-holenderskiego.
+%description devel
+This package contains the development header files necessary to
+develop applications using Tesseract API.
 
-%package devel
-Summary:	Tesseract - Development header files and libraries
-Summary(pl.UTF-8):	Tesseract - Pliki nagłówkowe i biblioteki dla programistów
+%description devel -l pl.UTF-8
+Ten pakiet zawiera pliki nagłówkowe potrzebne do tworzenia programów
+wykorzystujących API Tesseracta.
+
+%package static
+Summary:	Static Tesseract libraries
+Summary(pl.UTF-8):	Statyczne biblioteki Tesseracta
 Group:          Development/Libraries
+Requires:	%{name}-devel = %{version}-%{release}
 
-%description devel
-This package contains the development header files and libraries
-necessary to develop applications using Tesseract.
+%description static
+Static Tesseract libraries.
+
+%description static -l pl.UTF-8
+Statyczne biblioteki Tesseracta.
 
 %prep
 %setup -q
-tar xzf %{SOURCE1}
-tar xzf %{SOURCE2}
-tar xzf %{SOURCE3}
-tar xzf %{SOURCE4}
-tar xzf %{SOURCE5}
-tar xzf %{SOURCE6}
 %patch0 -p1
 %patch1 -p1
 
 %build
-cp -f /usr/share/automake/config.sub config
+%{__libtoolize}
+%{__aclocal}
+%{__autoconf}
+%{__autoheader}
+%{__automake}
 %configure
 %{__make}
 
@@ -170,48 +87,85 @@
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS COPYING ChangeLog README
+%doc AUTHORS COPYING ChangeLog README ReleaseNotes
 %attr(755,root,root) %{_bindir}/cntraining
+%attr(755,root,root) %{_bindir}/combine_tessdata
 %attr(755,root,root) %{_bindir}/mftraining
 %attr(755,root,root) %{_bindir}/tesseract
 %attr(755,root,root) %{_bindir}/unicharset_extractor
 %attr(755,root,root) %{_bindir}/wordlist2dawg
+%attr(755,root,root) %{_libdir}/libtesseract_api.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libtesseract_api.so.3
+%attr(755,root,root) %{_libdir}/libtesseract_ccstruct.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libtesseract_ccstruct.so.3
+%attr(755,root,root) %{_libdir}/libtesseract_ccutil.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libtesseract_ccutil.so.3
+%attr(755,root,root) %{_libdir}/libtesseract_classify.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libtesseract_classify.so.3
+%attr(755,root,root) %{_libdir}/libtesseract_cutil.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libtesseract_cutil.so.3
+%attr(755,root,root) %{_libdir}/libtesseract_dict.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libtesseract_dict.so.3
+%attr(755,root,root) %{_libdir}/libtesseract_image.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libtesseract_image.so.3
+%attr(755,root,root) %{_libdir}/libtesseract_main.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libtesseract_main.so.3
+%attr(755,root,root) %{_libdir}/libtesseract_textord.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libtesseract_textord.so.3
+%attr(755,root,root) %{_libdir}/libtesseract_training.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libtesseract_training.so.3
+%attr(755,root,root) %{_libdir}/libtesseract_viewer.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libtesseract_viewer.so.3
+%attr(755,root,root) %{_libdir}/libtesseract_wordrec.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libtesseract_wordrec.so.3
 %dir %{_datadir}/tessdata
-%{_datadir}/tessdata/confsets
 %dir %{_datadir}/tessdata/configs
 %{_datadir}/tessdata/configs/*
 %dir %{_datadir}/tessdata/tessconfigs
 %{_datadir}/tessdata/tessconfigs/*
 
-%files lang-de
-%defattr(644,root,root,755)
-%{_datadir}/tessdata/deu.*
-
-%files lang-en
-%defattr(644,root,root,755)
-%{_datadir}/tessdata/eng.*
-
-%files lang-es
-%defattr(644,root,root,755)
-%{_datadir}/tessdata/spa.*
-
-%files lang-fr
-%defattr(644,root,root,755)
-%{_datadir}/tessdata/fra.*
-
-%files lang-it
-%defattr(644,root,root,755)
-%{_datadir}/tessdata/ita.*
-
-%files lang-nl
-%defattr(644,root,root,755)
-%{_datadir}/tessdata/nld.*
-
 %files devel
 %defattr(644,root,root,755)
-%dir %{_includedir}/%{name}
-%{_includedir}/%{name}/*.h
-%{_libdir}/*.a
+%attr(755,root,root) %{_libdir}/libtesseract_api.so
+%attr(755,root,root) %{_libdir}/libtesseract_ccstruct.so
+%attr(755,root,root) %{_libdir}/libtesseract_ccutil.so
+%attr(755,root,root) %{_libdir}/libtesseract_classify.so
+%attr(755,root,root) %{_libdir}/libtesseract_cutil.so
+%attr(755,root,root) %{_libdir}/libtesseract_dict.so
+%attr(755,root,root) %{_libdir}/libtesseract_image.so
+%attr(755,root,root) %{_libdir}/libtesseract_main.so
+%attr(755,root,root) %{_libdir}/libtesseract_textord.so
+%attr(755,root,root) %{_libdir}/libtesseract_training.so
+%attr(755,root,root) %{_libdir}/libtesseract_viewer.so
+%attr(755,root,root) %{_libdir}/libtesseract_wordrec.so
+%{_libdir}/libtesseract_api.la
+%{_libdir}/libtesseract_ccstruct.la
+%{_libdir}/libtesseract_ccutil.la
+%{_libdir}/libtesseract_classify.la
+%{_libdir}/libtesseract_cutil.la
+%{_libdir}/libtesseract_dict.la
+%{_libdir}/libtesseract_image.la
+%{_libdir}/libtesseract_main.la
+%{_libdir}/libtesseract_textord.la
+%{_libdir}/libtesseract_training.la
+%{_libdir}/libtesseract_viewer.la
+%{_libdir}/libtesseract_wordrec.la
+%{_includedir}/%{name}
+
+%files static
+%defattr(644,root,root,755)
+%{_libdir}/libtesseract_api.a
+%{_libdir}/libtesseract_ccstruct.a
+%{_libdir}/libtesseract_ccutil.a
+%{_libdir}/libtesseract_classify.a
+%{_libdir}/libtesseract_cutil.a
+%{_libdir}/libtesseract_dict.a
+%{_libdir}/libtesseract_image.a
+%{_libdir}/libtesseract_main.a
+%{_libdir}/libtesseract_textord.a
+%{_libdir}/libtesseract_training.a
+%{_libdir}/libtesseract_viewer.a
+%{_libdir}/libtesseract_wordrec.a
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -219,6 +173,13 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.23  2010/11/14 21:22:48  qboosh
+- updated to 3.00
+- removed obsolete nojava,gcc44 patches
+- added missing patch (missing ac/am source files taken from svn)
+- added link patch (kill unnecessary png/jpeg/z linking)
+- moved data to separate spec (tesseract-data)
+
 Revision 1.22  2009/11/04 16:18:22  sparky
 - BR: libstdc++-devel
 

================================================================
Index: packages/tesseract/tesseract-link.patch
diff -u /dev/null packages/tesseract/tesseract-link.patch:1.1
--- /dev/null	Sun Nov 14 22:22:53 2010
+++ packages/tesseract/tesseract-link.patch	Sun Nov 14 22:22:48 2010
@@ -0,0 +1,15 @@
+--- tesseract-3.00/configure.ac.orig	2010-11-14 20:50:59.491100775 +0100
++++ tesseract-3.00/configure.ac	2010-11-14 21:30:34.535094909 +0100
+@@ -265,9 +265,9 @@
+ # which causes unnecessary warnings with Visual C++.
+ # Comment it out for now.
+ #AC_CHECK_LIB(m,sqrt)
+-AC_CHECK_LIB(z,deflate)
+-AC_CHECK_LIB(png,png_read_png)
+-AC_CHECK_LIB(jpeg,jpeg_read_scanlines)
++AC_CHECK_LIB(z,deflate,[LIBZ=-lz])
++AC_CHECK_LIB(png,png_read_png,[LIBPNG=-lpng])
++AC_CHECK_LIB(jpeg,jpeg_read_scanlines,[LIBJPEG=-ljpeg])
+ AC_CHECK_LIB(pthread,sem_init)
+ 
+ # ----------------------------------------

================================================================
Index: packages/tesseract/tesseract-missing.patch
diff -u /dev/null packages/tesseract/tesseract-missing.patch:1.1
--- /dev/null	Sun Nov 14 22:22:53 2010
+++ packages/tesseract/tesseract-missing.patch	Sun Nov 14 22:22:48 2010
@@ -0,0 +1,598 @@
+--- tesseract-3.00/configure.ac.orig	1970-01-01 01:00:00.000000000 +0100
++++ tesseract-3.00/configure.ac	2010-11-14 20:43:34.455103290 +0100
+@@ -0,0 +1,436 @@
++# -*-Shell-script-*-
++#
++# Copyright (c) Luc Vincent
++
++# ----------------------------------------
++# Initialization
++# ----------------------------------------
++
++AC_PREREQ(2.50)
++AC_CONFIG_MACRO_DIR([m4])
++AC_INIT(tesseract, 3.00, theraysmith at gmail.com)
++AC_REVISION($Id$)
++AC_CONFIG_AUX_DIR(config)
++AC_CONFIG_SRCDIR(api/tesseractmain.cpp)
++AC_PREFIX_DEFAULT(/usr/local)
++AC_CANONICAL_HOST
++
++# Define date of package, etc. Could be useful in auto-generated
++# documentation.
++# TODO(luc) Generate good documentation using doxygen or equivalent
++PACKAGE_YEAR=2010
++PACKAGE_DATE="09/30"
++
++AC_DEFINE_UNQUOTED(PACKAGE_NAME,["${PACKAGE_NAME}"],[Name of package])
++AC_DEFINE_UNQUOTED(PACKAGE_VERSION,["${PACKAGE_VERSION}"],[Version number])
++AC_DEFINE_UNQUOTED(PACKAGE_YEAR,"$PACKAGE_YEAR",[Official year for this release])
++AC_DEFINE_UNQUOTED(PACKAGE_DATE,"$PACKAGE_DATE",[Official date of release])
++
++AC_SUBST(PACKAGE_NAME)
++AC_SUBST(PACKAGE_VERSION)
++AC_SUBST(PACKAGE_YEAR)
++AC_SUBST(PACKAGE_DATE)
++
++GENERIC_LIBRARY_NAME=tesseract
++
++# Release versioning
++GENERIC_MAJOR_VERSION=3
++GENERIC_MINOR_VERSION=0
++GENERIC_MICRO_VERSION=0
++
++# API version (often = GENERIC_MAJOR_VERSION.GENERIC_MINOR_VERSION)
++GENERIC_API_VERSION=$GENERIC_MAJOR_VERSION.$GENERIC_MINOR_VERSION
++GENERIC_LIBRARY_VERSION=$GENERIC_MAJOR_VERSION:$GENERIC_MINOR_VERSION
++AC_SUBST(GENERIC_API_VERSION)
++AC_SUBST(GENERIC_MAJOR_VERSION)
++
++AC_SUBST(GENERIC_LIBRARY_VERSION)
++PACKAGE=$GENERIC_LIBRARY_NAME
++AC_SUBST(GENERIC_LIBRARY_NAME)
++
++GENERIC_VERSION=$GENERIC_MAJOR_VERSION.$GENERIC_MINOR_VERSION.$GENERIC_MICRO_VERSION
++GENERIC_RELEASE=$GENERIC_MAJOR_VERSION.$GENERIC_MINOR_VERSION
++AC_SUBST(GENERIC_RELEASE)
++AC_SUBST(GENERIC_VERSION)
++
++includedir="${includedir}/tesseract"
++
++AC_ARG_WITH(extra-includes,
++            AC_HELP_STRING([--with-extra-includes=DIR],
++                       [Define an additional directory for include files]),
++        [ if test -d "$withval" ; then
++            CFLAGS="$CFLAGS -I$withval"
++          else
++            AC_MSG_ERROR([Cannot stat directory $withval])
++          fi ] )
++
++AC_ARG_WITH(extra-libraries,
++            AC_HELP_STRING([--with-extra-libraries=DIR],
++                       [Define an additional directory for library files]),
++        [ if test -d "$withval" ; then
++           LDFLAGS="$LDFLAGS -L$withval"
++          else
++            AC_MSG_ERROR([Cannot stat directory $withval])
++          fi ] )
++
++AC_MSG_CHECKING(--enable-graphics argument)
++AC_ARG_ENABLE([graphics],
++    [  --enable-graphics         Enable graphics (ScrollView) (default).],
++    [enable_graphics=$enableval],
++    [enable_graphics="yes"])
++AC_MSG_RESULT($enable_graphics)
++if test "$enable_graphics" = "no"; then
++  AC_DEFINE([DISABLE_GRAPHICS], [], [Disable graphics])
++fi
++
++localedir='${prefix}/share/locale'
++
++# Not used yet, so disable
++#AC_ARG_ENABLE([gettext],
++#    [  --enable-gettext         Enable gettext (default).],
++#    [enable_gettext=$enableval],
++#    [enable_gettext="yes"])
++#AC_MSG_RESULT($enable_gettext)
++#if test "$enable_gettext" = "yes"; then
++#  AM_GNU_GETTEXT_VERSION([0.17])
++#  AM_GNU_GETTEXT([external])  
++#  AC_SUBST(localedir)
++#else
++#  AC_DEFINE([NO_GETTEXT], [], [Disable Gettext])
++#fi
++#AM_CONDITIONAL([USING_GETTEXT], [test "$enable_gettext" = "yes"])
++
++# Always look into a "gnu" directory.
++curwd=`pwd`
++if test -d $curwd/gnu/include ; then
++   CPPFLAGS="$CPPFLAGS -I$curwd/gnu/include"
++fi
++if test -d $curwd/gnu/lib ; then
++   LDFLAGS="$LDFLAGS -L$curwd/gnu/lib"
++fi
++
++# Special cases
++case "$host" in
++  *-darwin* | *-macos10*)
++     if test -d /opt/local ; then
++       CPPFLAGS="$CPPFLAGS -I/opt/local/include"
++       LDFLAGS="$LDFLAGS -L/opt/local/lib"
++     elif test -d /sw ; then
++       CPPFLAGS="$CPPFLAGS -I/sw/include"
++       LDFLAGS="$LDFLAGS -L/sw/lib"
++     fi
++  ;;
++esac
++
++# ----------------------------------------
++# Check Compiler Characteristics and
++# configure automake. The two appear to
++# be intimately linked...
++# ----------------------------------------
++
++# Define order of compilers
++AC_PROG_CXX(cl.exe g++)
++# Not needed
++# AC_PROG_CC
++
++AC_PROG_LIBTOOL
++
++# Automake configuration
++# ----------------------------------------
++
++# Note: may need to configure automake to use ZIP as a distribution
++# format because of an apparent bug with GZIP, which results in bogus
++# archives.
++# TODO(luc) Resolve this issue.
++#AM_INIT_AUTOMAKE(dist-zip)
++AM_INIT_AUTOMAKE
++AM_CONFIG_HEADER(config_auto.h:config/config.h.in)
++#AM_PROG_CC_C_O
++AM_MAINTAINER_MODE
++# Need to tell automake if Visual C++ is being used:
++AM_CONDITIONAL(USING_CL, test x$CC = xcl.exe)
++
++# Additional checking of compiler characteristics
++# ----------------------------------------
++
++# Check Endianness. If Big Endian, this will define WORDS_BIGENDIAN
++# See also at end of this file, where we define INTEL_BYTE_ORDER
++# or MOTOROLA_BYTE_ORDER.
++AC_C_BIGENDIAN
++
++
++# ----------------------------------------
++# Check for programs we need
++# ----------------------------------------
++
++# Check where all the following programs are and set
++# variables accordingly:
++LT_INIT
++# AC_PROG_LN_S
++# AC_PATH_PROG(MV, mv)
++# AC_PATH_PROG(CP, cp)
++# AC_PATH_PROG(RM, rm)
++# AC_PATH_PROG(AR, ar)
++# AC_PATH_PROG(TOUCH, touch)
++# AC_PATH_PROG(SED, sed)
++# AC_PATH_PROG(BASH, bash, ,[$PATH:/usr/bin:/util/tools/bin])
++# # To use substitution in makefiles, use something like:
++# AC_SUBST(BASH)
++
++# TODO(luc) Handle documentation. None of the following
++# is really needed until then
++#
++# AC_PROG_DOXYGEN_VERSION(1.3.2,[DOXYGEN_OK=1])
++# AC_PATH_PROG(DOT, dot)
++# AC_PATH_PROG(LATEX, latex)
++# AC_PATH_PROG(DVIPS, dvips)
++# AC_PATH_PROG(MAKEINDEX, makeindex)
++# AC_PATH_PROG(PDFLATEX, pdflatex)
++# AC_PATH_PROG(GZIP, gzip)
++#
++# if test -z "$DOXYGEN_OK" -o -z "$DOT"; then
++#   AC_MSG_WARN([------------------------------------
++# *** Disabling automatic documentation generation for this
++# *** package. Please check that you have 'doxygen' (version
++# *** $ac_doxygen_version or later) and 'graphviz' (aka, 'dot')
++# *** installed on your system. In addition, to generate
++# *** PostScript and PDF documentation, you will need to have
++# *** LaTeX and PdfLaTeX respectively. Re-run this configuration
++# *** script after you have updated your environment.
++# --------------------------------------------------------])
++#
++# # We have appropriate version of doxygen and dot, so we
++# # can generate documentation. It remains to be seen whether
++# # we can generate PDF and PostScript documentation..
++# else
++#   GENERATE_DOCUMENTATION="true"
++#
++# # Determine if PostScript documentation is generated:
++#   if test -z "$LATEX" -o -z "$DVIPS" -o -z "$MAKEINDEX"; then
++#     AC_MSG_WARN([Disabling generation of PostScript documentation])
++#   else
++#     GENERATE_PS_DOCUMENTATION="true"
++#   fi
++#
++#   # Determine if PDF documentation is generated:
++#   if test -z "$PDFLATEX" -o -z "$MAKEINDEX"; then
++#     AC_MSG_WARN([Disabling generation of PDF documentation])
++#   else
++#     GENERATE_PDF_DOCUMENTATION="true"
++#   fi
++# fi
++#
++# # These substitutions could be inside the 'else'
++# # conditionals above, but it is not necessary and would
++# # only cause some confusion...
++# AC_SUBST(DOXYGEN)
++# AC_SUBST(DOT)
++# AC_SUBST(LATEX)
++# AC_SUBST(DVIPS)
++# AC_SUBST(MAKEINDEX)
++# AC_SUBST(PDFLATEX)
++# AC_SUBST(GZIP)
++#
++# # Adjust makefiles based on the kind of documentation that
++# # is being generated,
++# AM_CONDITIONAL(GENERATE_DOCUMENTATION, test -n "$GENERATE_DOCUMENTATION")
++# AM_CONDITIONAL(GENERATE_PS_DOCUMENTATION, test -n "$GENERATE_PS_DOCUMENTATION")
++# AM_CONDITIONAL(GENERATE_PDF_DOCUMENTATION, test -n "$GENERATE_PDF_DOCUMENTATION")
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/tesseract/tesseract.spec?r1=1.22&r2=1.23&f=u



More information about the pld-cvs-commit mailing list