Changeset 1398 for libcaca/trunk/configure.acTweet

Timestamp:

Nov 14, 2006, 7:22:31 PM (14 years ago)

Author:

Sam Hocevar

Message:

• No longer bail out with an error if Imlib2 or Doxygen were not found.

File:

• libcaca/trunk/configure.ac (modified) (3 diffs)

libcaca/trunk/configure.ac

@@ -66 +66 @@
 dnl example programs features
 AC_ARG_ENABLE(imlib2,
-  [  --enable-imlib2         Imlib2 graphics support (default enabled)])
+  [  --enable-imlib2         Imlib2 graphics support (autodetected)])
 
 dnl conditional builds
@@ -307 +307 @@
   IMLIB2="no"
   PKG_CHECK_MODULES(IMLIB2, imlib2, [IMLIB2="yes"], [AC_MSG_RESULT(no)])
-  if test "${IMLIB2}" = no; then
-    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'.]])
-  fi
-  AC_DEFINE(USE_IMLIB2, 1, Define to 1 to use Imlib2)
+  if test "${IMLIB2}" != "no"; then
+    AC_DEFINE(USE_IMLIB2, 1, Define to 1 to use Imlib2)
+  fi
 fi
 
@@ -323 +322 @@
 if test "${enable_doc}" != "no"; then
   AC_PATH_PROG(DOXYGEN, doxygen, no)
-  if test "${DOXYGEN}" = "no"; then
-    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'.]])
-  fi
-
-  # Build LaTeX documentation?
-  AC_PATH_PROG(LATEX, pdflatex, no)
-  AC_PATH_PROG(DVIPS, dvips, no)
-  if test "${DVIPS}" = "no"; then
-    LATEX="no"
-  fi
-  AC_MSG_CHECKING(for a4wide.sty)
-  if test -f /usr/share/texmf/tex/latex/misc/a4wide.sty; then
-    AC_MSG_RESULT(yes)
-  elif test -f /usr/share/texmf-tetex/tex/latex/a4wide/a4wide.sty; then
-    AC_MSG_RESULT(yes)
-  else
-    LATEX="no"
-    AC_MSG_RESULT(no)
+  if test "${DOXYGEN}" != "no"; then
+    # Build LaTeX documentation?
+    AC_PATH_PROG(LATEX, pdflatex, no)
+    AC_PATH_PROG(DVIPS, dvips, no)
+    if test "${DVIPS}" = "no"; then
+      LATEX="no"
+    fi
+    AC_MSG_CHECKING(for a4wide.sty)
+    if test -f /usr/share/texmf/tex/latex/misc/a4wide.sty; then
+      AC_MSG_RESULT(yes)
+    elif test -f /usr/share/texmf-tetex/tex/latex/a4wide/a4wide.sty; then
+      AC_MSG_RESULT(yes)
+    else
+      LATEX="no"
+      AC_MSG_RESULT(no)
+    fi
   fi
 fi