diff options
| author | Christian Grothoff <christian@grothoff.org> | 2013-12-10 13:04:15 +0000 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2013-12-10 13:04:15 +0000 |
| commit | 2aa75f592d2b538fb3a6dd0ffa2b93bcc7b2cd0e (patch) | |
| tree | 858b6831a42cff28db27c7dc54cc59667138db50 | |
| parent | e82e13bba5f93be46f4870a0bb32e4367d7d4021 (diff) | |
| download | libmicrohttpd-2aa75f592d2b538fb3a6dd0ffa2b93bcc7b2cd0e.tar.gz libmicrohttpd-2aa75f592d2b538fb3a6dd0ffa2b93bcc7b2cd0e.zip | |
-check for makeinfo
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | doc/Makefile.am | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index e2a99157..08ebd289 100644 --- a/configure.ac +++ b/configure.ac | |||
| @@ -85,7 +85,8 @@ AC_CHECK_MEMBER([struct sockaddr_in.sin_len], | |||
| 85 | 85 | ||
| 86 | AC_CHECK_PROG(HAVE_CURL_BINARY,[curl],true,false) | 86 | AC_CHECK_PROG(HAVE_CURL_BINARY,[curl],true,false) |
| 87 | AM_CONDITIONAL(HAVE_CURL_BINARY,$HAVE_CURL_BINARY) | 87 | AM_CONDITIONAL(HAVE_CURL_BINARY,$HAVE_CURL_BINARY) |
| 88 | 88 | AC_CHECK_PROG(HAVE_MAKEINFO_BINARY,[makeinfo],true,false) | |
| 89 | AM_CONDITIONAL(HAVE_MAKEINFO_BINARY,$HAVE_MAKEINFO_BINARY) | ||
| 89 | 90 | ||
| 90 | # set GCC options | 91 | # set GCC options |
| 91 | # use '-fno-strict-aliasing', but only if the compiler can take it | 92 | # use '-fno-strict-aliasing', but only if the compiler can take it |
diff --git a/doc/Makefile.am b/doc/Makefile.am index 179841aa..cb8ce47a 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am | |||
| @@ -7,9 +7,11 @@ DISTCLEANFILES = \ | |||
| 7 | libmicrohttpd.dvi \ | 7 | libmicrohttpd.dvi \ |
| 8 | libmicrohttpd-tutorial.cps \ | 8 | libmicrohttpd-tutorial.cps \ |
| 9 | libmicrohttpd-tutorial.dvi | 9 | libmicrohttpd-tutorial.dvi |
| 10 | if HAVE_MAKEINFO_BINARY | ||
| 10 | info_TEXINFOS = \ | 11 | info_TEXINFOS = \ |
| 11 | libmicrohttpd.texi \ | 12 | libmicrohttpd.texi \ |
| 12 | libmicrohttpd-tutorial.texi | 13 | libmicrohttpd-tutorial.texi |
| 14 | endif | ||
| 13 | microhttpd_TEXINFOS = \ | 15 | microhttpd_TEXINFOS = \ |
| 14 | chapters/basicauthentication.inc \ | 16 | chapters/basicauthentication.inc \ |
| 15 | chapters/bibliography.inc \ | 17 | chapters/bibliography.inc \ |