Ignore:
Timestamp:
Nov 14, 2006, 7:22:31 PM (13 years ago)
Author:
Sam Hocevar
Message:
  • No longer bail out with an error if Imlib2 or Doxygen were not found.
File:
1 edited

Legend:

Unmodified
Added
Removed
  • libcaca/trunk/configure.ac

    r1396 r1398  
    6666dnl example programs features
    6767AC_ARG_ENABLE(imlib2,
    68   [  --enable-imlib2         Imlib2 graphics support (default enabled)])
     68  [  --enable-imlib2         Imlib2 graphics support (autodetected)])
    6969
    7070dnl conditional builds
     
    307307  IMLIB2="no"
    308308  PKG_CHECK_MODULES(IMLIB2, imlib2, [IMLIB2="yes"], [AC_MSG_RESULT(no)])
    309   if test "${IMLIB2}" = no; then
    310     AC_MSG_ERROR([[cannot find Imlib2 development files. Without Imlib2, cacaview will only open BMP files; if this is really what you want, re-run configure with '--disable-imlib2'.]])
    311   fi
    312   AC_DEFINE(USE_IMLIB2, 1, Define to 1 to use Imlib2)
     309  if test "${IMLIB2}" != "no"; then
     310    AC_DEFINE(USE_IMLIB2, 1, Define to 1 to use Imlib2)
     311  fi
    313312fi
    314313
     
    323322if test "${enable_doc}" != "no"; then
    324323  AC_PATH_PROG(DOXYGEN, doxygen, no)
    325   if test "${DOXYGEN}" = "no"; then
    326     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'.]])
    327   fi
    328 
    329   # Build LaTeX documentation?
    330   AC_PATH_PROG(LATEX, pdflatex, no)
    331   AC_PATH_PROG(DVIPS, dvips, no)
    332   if test "${DVIPS}" = "no"; then
    333     LATEX="no"
    334   fi
    335   AC_MSG_CHECKING(for a4wide.sty)
    336   if test -f /usr/share/texmf/tex/latex/misc/a4wide.sty; then
    337     AC_MSG_RESULT(yes)
    338   elif test -f /usr/share/texmf-tetex/tex/latex/a4wide/a4wide.sty; then
    339     AC_MSG_RESULT(yes)
    340   else
    341     LATEX="no"
    342     AC_MSG_RESULT(no)
     324  if test "${DOXYGEN}" != "no"; then
     325    # Build LaTeX documentation?
     326    AC_PATH_PROG(LATEX, pdflatex, no)
     327    AC_PATH_PROG(DVIPS, dvips, no)
     328    if test "${DVIPS}" = "no"; then
     329      LATEX="no"
     330    fi
     331    AC_MSG_CHECKING(for a4wide.sty)
     332    if test -f /usr/share/texmf/tex/latex/misc/a4wide.sty; then
     333      AC_MSG_RESULT(yes)
     334    elif test -f /usr/share/texmf-tetex/tex/latex/a4wide/a4wide.sty; then
     335      AC_MSG_RESULT(yes)
     336    else
     337      LATEX="no"
     338      AC_MSG_RESULT(no)
     339    fi
    343340  fi
    344341fi
Note: See TracChangeset for help on using the changeset viewer.