Changeset 346


Ignore:
Timestamp:
Jan 13, 2004, 5:45:45 PM (17 years ago)
Author:
Sam Hocevar
Message:
  • configure.ac: + Added --disable-doc to let the user not build documentation.
  • build-win32: + Do not build documentation.
Location:
libcaca/trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • libcaca/trunk/build-win32

    r341 r346  
    1515
    1616# Build for win32
    17 ./configure --host=i586-mingw32msvc --prefix=/ --bindir=/ --libdir=/ --disable-imlib2
     17./configure --host=i586-mingw32msvc --prefix=/ --bindir=/ --libdir=/ --disable-imlib2 --disable-doc
    1818make pkglibdir=/lib pkgdatadir=/data
    1919
     
    2525rm -f "${DESTDIR}/caca-config"
    2626rm -f "${DESTDIR}/"*.a
    27 mv "${DESTDIR}/share/doc/libcaca-dev/html" "${DESTDIR}/html"
    28 mv "${DESTDIR}/share/doc/libcaca-dev/ps" "${DESTDIR}/doc"
    29 mv "${DESTDIR}/share/doc/libcaca-dev/"* "${DESTDIR}/doc"
    30 rmdir "${DESTDIR}/share/doc/libcaca-dev"
     27mv "${DESTDIR}/share/doc/libcaca-dev/" "${DESTDIR}/doc"
    3128rmdir "${DESTDIR}/share/doc"
    3229rmdir "${DESTDIR}/share"
  • libcaca/trunk/configure.ac

    r344 r346  
    2121AC_EGREP_CPP(foo, foo)
    2222
     23dnl output driver features
    2324AC_ARG_ENABLE(slang,
    2425  [  --enable-slang          slang graphics support (autodetected)])
     
    3132AC_ARG_ENABLE(x11,
    3233  [  --enable-x11            X11 support (autodetected)])
     34
     35dnl example programs features
     36AC_ARG_ENABLE(imlib2,
     37  [  --enable-imlib2         Imlib2 graphics support (default enabled)])
     38
     39dnl conditional builds
     40AC_ARG_ENABLE(doc,
     41  [  --enable-doc            build documentation (needs doxygen and LaTeX)])
    3342
    3443AC_CHECK_HEADERS(sys/time.h inttypes.h endian.h unistd.h)
     
    151160# Use Imlib2?
    152161ac_cv_my_have_imlib2="no"
    153 AC_ARG_ENABLE(imlib2,
    154   [  --enable-imlib2         Imlib2 graphics support (default enabled)])
    155162save_CPPFLAGS="${CPPFLAGS}"
    156163if test "${enable_imlib2}" != "no"; then
     
    168175
    169176# Build documentation?
    170 AC_PATH_PROG(DOXYGEN, doxygen, no)
    171 AM_CONDITIONAL(DOXYGEN, test "${DOXYGEN}" != "no")
    172 
    173 # Build LaTeX documentation?
    174 AC_PATH_PROG(LATEX, latex, no)
    175 AC_PATH_PROG(DVIPS, dvips, no)
    176 if test "${DVIPS}" = "no"; then
    177   LATEX="no"
    178 fi
    179 AC_MSG_CHECKING(for a4wide.sty)
    180 if test -f /usr/share/texmf/tex/latex/misc/a4wide.sty; then
    181   AC_MSG_RESULT(yes)
    182 else
    183   LATEX="no"
    184   AC_MSG_RESULT(no)
    185 fi
    186 AM_CONDITIONAL(LATEX, test "${LATEX}" != "no")
     177DOXYGEN="no"
     178LATEX="no"
     179if test "${enable_doc}" != "no"; then
     180  AC_PATH_PROG(DOXYGEN, doxygen, no)
     181  if test "${DOXYGEN}" = "no"; then
     182    AC_MSG_ERROR([[cannot find doxygen, which is needed to build the libcaca documentation; if this is really what you want, re-run configure with '--disable-doc'.]])
     183  fi
     184
     185  # Build LaTeX documentation?
     186  AC_PATH_PROG(LATEX, latex, no)
     187  AC_PATH_PROG(DVIPS, dvips, no)
     188  if test "${DVIPS}" = "no"; then
     189    LATEX="no"
     190  fi
     191  AC_MSG_CHECKING(for a4wide.sty)
     192  if test -f /usr/share/texmf/tex/latex/misc/a4wide.sty; then
     193    AC_MSG_RESULT(yes)
     194  else
     195    LATEX="no"
     196    AC_MSG_RESULT(no)
     197  fi
     198fi
     199AM_CONDITIONAL(BUILD_DOCUMENTATION, test "${DOXYGEN}" != "no")
     200AM_CONDITIONAL(USE_LATEX, test "${LATEX}" != "no")
    187201
    188202AC_CONFIG_FILES([
  • libcaca/trunk/debian/rules

    r340 r346  
    1313
    1414confflags += --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
    15 confflags += --enable-ncurses --enable-slang --enable-x11 --enable-imlib2
     15confflags += --enable-ncurses --enable-slang --enable-x11 \
     16             --enable-imlib2 --enable-doc
    1617
    1718configure: configure-stamp
  • libcaca/trunk/doc/Makefile.am

    r342 r346  
    55man_MANS = caca-config.1 cacademo.1 cacaview.1
    66
    7 if DOXYGEN
     7if BUILD_DOCUMENTATION
    88htmldoc_DATA = html/doxygen.css
    99htmldocdir = $(datadir)/doc/libcaca-dev/html
    10 if LATEX
     10if USE_LATEX
    1111psdoc_DATA = latex/libcaca.ps
    1212psdocdir = $(datadir)/doc/libcaca-dev/ps
     
    1818
    1919stamp-doxygen:
    20 if DOXYGEN
     20if BUILD_DOCUMENTATION
    2121        doxygen doxygen.cfg
    2222        touch stamp-doxygen
     
    2424
    2525stamp-latex: stamp-doxygen
    26 if DOXYGEN
    27 if LATEX
     26if BUILD_DOCUMENTATION
     27if USE_LATEX
    2828        rm -f latex/libcaca.tex latex/libcaca.ps
    2929        mv latex/refman.tex latex/libcaca.tex
     
    4141
    4242install-data-local:
    43 if DOXYGEN
     43if BUILD_DOCUMENTATION
    4444        $(mkinstalldirs) $(DESTDIR)$(datadir)/doc/libcaca-dev/html
    4545        cp `find html -name '*.html' -o -name '*.gif' -o -name '*.png'` \
  • libcaca/trunk/libcaca.spec

    r340 r346  
    1 %define name  libcaca
     1%define name libcaca
    22%define version 0.7
    33%define release 1
     
    7070  --mandir=\${prefix}/share/man \
    7171  --infodir=\${prefix}/share/info \
    72   --enable-slang --enable-ncurses --enable-x11 --enable-imlib2
     72  --enable-slang --enable-ncurses --enable-x11 --enable-imlib2 --enable-doc
    7373;;esac
    7474make
Note: See TracChangeset for help on using the changeset viewer.