diff options
author | Peter Korsgaard <jacmet@sunsite.dk> | 2010-05-21 20:30:28 +0200 |
---|---|---|
committer | Peter Korsgaard <jacmet@sunsite.dk> | 2010-05-21 20:30:28 +0200 |
commit | c89b725978616a24e066e6b01030bdd3fc0ab5c0 (patch) | |
tree | c869c538c6d0b7b7c702ef7c24c4c59a89a973b2 /package/libcgicc/libcgicc-3.2.9-disable-documentation-option.patch | |
parent | 319a4751c4a3a0209f628a7470a6d8e400d3479d (diff) | |
parent | 52e600ebec9cb571edee8f791da851035ae6b969 (diff) | |
download | buildroot-novena-c89b725978616a24e066e6b01030bdd3fc0ab5c0.tar.gz buildroot-novena-c89b725978616a24e066e6b01030bdd3fc0ab5c0.zip |
Merge branch '2010-05-15-fixes' of git://git.busybox.net/~tpetazzoni/git/buildroot
Diffstat (limited to 'package/libcgicc/libcgicc-3.2.9-disable-documentation-option.patch')
-rw-r--r-- | package/libcgicc/libcgicc-3.2.9-disable-documentation-option.patch | 50 |
1 files changed, 50 insertions, 0 deletions
diff --git a/package/libcgicc/libcgicc-3.2.9-disable-documentation-option.patch b/package/libcgicc/libcgicc-3.2.9-disable-documentation-option.patch new file mode 100644 index 000000000..a7b04a83a --- /dev/null +++ b/package/libcgicc/libcgicc-3.2.9-disable-documentation-option.patch @@ -0,0 +1,50 @@ +Index: cgicc-3.2.9/Makefile.am +=================================================================== +--- cgicc-3.2.9.orig/Makefile.am 2010-02-25 16:34:06.000000000 +0100 ++++ cgicc-3.2.9/Makefile.am 2010-02-25 16:34:14.000000000 +0100 +@@ -8,9 +8,15 @@ + DEMO = + endif + ++if DOC ++DOCDIR = doc ++else ++DOC = ++endif ++ + ACLOCAL_AMFLAGS= + +-SUBDIRS = cgicc doc support $(DEMO) ++SUBDIRS = cgicc $(DOCDIR) support $(DEMO) + + CLEANFILES = *~ + +Index: cgicc-3.2.9/configure.ac +=================================================================== +--- cgicc-3.2.9.orig/configure.ac 2010-02-25 16:34:06.000000000 +0100 ++++ cgicc-3.2.9/configure.ac 2010-02-25 16:45:46.000000000 +0100 +@@ -17,9 +17,23 @@ + AC_PROG_CXX + AC_PROG_INSTALL + AC_PROG_LIBTOOL +-AC_CHECK_PROG(DOXYGEN, doxygen, doxygen, /bin/echo) + + ++AC_ARG_ENABLE(doc, ++ [ --enable-doc build doc [[default=yes]]], ++ [case "${enableval}" in ++ yes) cgicc_doc=yes ;; ++ no) cgicc_doc=no ;; ++ *) AC_MSG_ERROR(bad value ${enableval} for --enable-doc) ;; ++ esac], cgicc_doc=yes) ++ ++if test "$cgicc_doc" = yes; then ++ AC_CHECK_PROG(DOXYGEN, doxygen, doxygen) ++ if test -z "$DOXYGEN" ; then ++ AC_MSG_ERROR([Doxygen is required to build the documentation]) ++ fi ++fi ++AM_CONDITIONAL(DOC, test "$cgicc_doc" = yes) + + dnl Determine host system type + |