Changeset 346 for libcacaTweet

Timestamp:

Jan 13, 2004, 5:45:45 PM (18 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:

• build-win32 (modified) (2 diffs)
• configure.ac (modified) (4 diffs)
• debian/rules (modified) (1 diff)
• doc/Makefile.am (modified) (4 diffs)
• libcaca.spec (modified) (2 diffs)

libcaca/trunk/build-win32

@@ -15 +15 @@
 
 # Build for win32
-./configure --host=i586-mingw32msvc --prefix=/ --bindir=/ --libdir=/ --disable-imlib2
+./configure --host=i586-mingw32msvc --prefix=/ --bindir=/ --libdir=/ --disable-imlib2 --disable-doc
 make pkglibdir=/lib pkgdatadir=/data
 
@@ -25 +25 @@
 rm -f "${DESTDIR}/caca-config"
 rm -f "${DESTDIR}/"*.a
-mv "${DESTDIR}/share/doc/libcaca-dev/html" "${DESTDIR}/html"
-mv "${DESTDIR}/share/doc/libcaca-dev/ps" "${DESTDIR}/doc"
-mv "${DESTDIR}/share/doc/libcaca-dev/"* "${DESTDIR}/doc"
-rmdir "${DESTDIR}/share/doc/libcaca-dev"
+mv "${DESTDIR}/share/doc/libcaca-dev/" "${DESTDIR}/doc"
 rmdir "${DESTDIR}/share/doc"
 rmdir "${DESTDIR}/share"

libcaca/trunk/configure.ac

@@ -21 +21 @@
 AC_EGREP_CPP(foo, foo)
 
+dnl output driver features
 AC_ARG_ENABLE(slang,
   [  --enable-slang          slang graphics support (autodetected)])
@@ -31 +32 @@
 AC_ARG_ENABLE(x11,
   [  --enable-x11            X11 support (autodetected)])
+
+dnl example programs features
+AC_ARG_ENABLE(imlib2,
+  [  --enable-imlib2         Imlib2 graphics support (default enabled)])
+
+dnl conditional builds
+AC_ARG_ENABLE(doc,
+  [  --enable-doc            build documentation (needs doxygen and LaTeX)])
 
 AC_CHECK_HEADERS(sys/time.h inttypes.h endian.h unistd.h)
@@ -151 +160 @@
 # Use Imlib2?
 ac_cv_my_have_imlib2="no"
-AC_ARG_ENABLE(imlib2,
-  [  --enable-imlib2         Imlib2 graphics support (default enabled)])
 save_CPPFLAGS="${CPPFLAGS}"
 if test "${enable_imlib2}" != "no"; then
@@ -168 +175 @@
 
 # Build documentation?
-AC_PATH_PROG(DOXYGEN, doxygen, no)
-AM_CONDITIONAL(DOXYGEN, test "${DOXYGEN}" != "no")
-
-# Build LaTeX documentation?
-AC_PATH_PROG(LATEX, latex, 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)
-else
-  LATEX="no"
-  AC_MSG_RESULT(no)
-fi
-AM_CONDITIONAL(LATEX, test "${LATEX}" != "no")
+DOXYGEN="no"
+LATEX="no"
+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, latex, 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)
+  else
+    LATEX="no"
+    AC_MSG_RESULT(no)
+  fi
+fi
+AM_CONDITIONAL(BUILD_DOCUMENTATION, test "${DOXYGEN}" != "no")
+AM_CONDITIONAL(USE_LATEX, test "${LATEX}" != "no")
 
 AC_CONFIG_FILES([

libcaca/trunk/debian/rules

@@ -13 +13 @@
 
 confflags += --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
-confflags += --enable-ncurses --enable-slang --enable-x11 --enable-imlib2
+confflags += --enable-ncurses --enable-slang --enable-x11 \
+             --enable-imlib2 --enable-doc
 
 configure: configure-stamp

libcaca/trunk/doc/Makefile.am

@@ -5 +5 @@
 man_MANS = caca-config.1 cacademo.1 cacaview.1
 
-if DOXYGEN
+if BUILD_DOCUMENTATION
 htmldoc_DATA = html/doxygen.css
 htmldocdir = $(datadir)/doc/libcaca-dev/html
-if LATEX
+if USE_LATEX
 psdoc_DATA = latex/libcaca.ps
 psdocdir = $(datadir)/doc/libcaca-dev/ps
@@ -18 +18 @@
 
 stamp-doxygen:
-if DOXYGEN
+if BUILD_DOCUMENTATION
         doxygen doxygen.cfg
         touch stamp-doxygen
@@ -24 +24 @@
 
 stamp-latex: stamp-doxygen
-if DOXYGEN
-if LATEX
+if BUILD_DOCUMENTATION
+if USE_LATEX
         rm -f latex/libcaca.tex latex/libcaca.ps
         mv latex/refman.tex latex/libcaca.tex
@@ -41 +41 @@
 
 install-data-local:
-if DOXYGEN
+if BUILD_DOCUMENTATION
         $(mkinstalldirs) $(DESTDIR)$(datadir)/doc/libcaca-dev/html
         cp `find html -name '*.html' -o -name '*.gif' -o -name '*.png'` \

libcaca/trunk/libcaca.spec

@@ -1 @@
-%define name  libcaca
+%define name libcaca
 %define version 0.7
 %define release 1
@@ -70 +70 @@
   --mandir=\${prefix}/share/man \
   --infodir=\${prefix}/share/info \
-  --enable-slang --enable-ncurses --enable-x11 --enable-imlib2
+  --enable-slang --enable-ncurses --enable-x11 --enable-imlib2 --enable-doc
 ;;esac
 make