Cope with another one of the many kinds of DocBook stupidity:

[mandoc.git] / configure

diff --git a/configure b/configure
index eb9311e3faf605161f4998d99acef94709714d4a..000d11ecc4cd9d75a52e85f3843997bc858bdd98 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
 #!/bin/sh
 #

-# Copyright (c) 2014 Ingo Schwarze <schwarze@openbsd.org>
+# Copyright (c) 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>

 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above


@@ -31,10 +31,6 @@ echo "config.log: writing..."
 # Initialize all variables here,
 # such that nothing can leak in from the environment.
 
 # Initialize all variables here,
 # such that nothing can leak in from the environment.
 

-VERSION="1.13.1"
-echo "VERSION=\"${VERSION}\"" 1>&2
-echo "VERSION=\"${VERSION}\"" 1>&3
-

 OSNAME=
 
 CC=`printf "all:\\n\\t@echo \\\$(CC)\\n" | make -f -`
 OSNAME=
 
 CC=`printf "all:\\n\\t@echo \\\$(CC)\\n" | make -f -`


@@ -56,6 +52,7 @@ HAVE_STRLCAT=
 HAVE_STRLCPY=
 HAVE_STRPTIME=
 HAVE_STRSEP=
 HAVE_STRLCPY=
 HAVE_STRPTIME=
 HAVE_STRSEP=

+HAVE_STRTONUM=

 HAVE_WCHAR=
 
 HAVE_SQLITE3=
 HAVE_WCHAR=
 
 HAVE_SQLITE3=


@@ -70,11 +67,22 @@ INCLUDEDIR=
 LIBDIR=
 MANDIR=
 EXAMPLEDIR=
 LIBDIR=
 MANDIR=
 EXAMPLEDIR=

+HOMEBREWDIR=

 
 WWWPREFIX="/var/www"
 HTDOCDIR=
 CGIBINDIR=
 
 
 WWWPREFIX="/var/www"
 HTDOCDIR=
 CGIBINDIR=
 

+BINM_APROPOS="apropos"
+BINM_MAN="man"
+BINM_WHATIS="whatis"
+BINM_MAKEWHATIS="makewhatis"
+MANM_MAN="man"
+MANM_MDOC="mdoc"
+MANM_ROFF="roff"
+MANM_EQN="eqn"
+MANM_TBL="tbl"
+

 INSTALL="install"
 INSTALL_PROGRAM=
 INSTALL_LIB=
 INSTALL="install"
 INSTALL_PROGRAM=
 INSTALL_LIB=


@@ -166,6 +174,7 @@ runtest strlcat             STRLCAT         || true
 runtest strlcpy                STRLCPY         || true
 runtest strptime       STRPTIME        || true
 runtest strsep         STRSEP          || true
 runtest strlcpy                STRLCPY         || true
 runtest strptime       STRPTIME        || true
 runtest strsep         STRSEP          || true

+runtest strtonum       STRTONUM        || true

 runtest wchar          WCHAR           || true
 
 # --- sqlite3 ---
 runtest wchar          WCHAR           || true
 
 # --- sqlite3 ---


@@ -253,7 +262,7 @@ cat << __HEREDOC__
 #define MANDOC_CONFIG_H
 
 #if defined(__linux__) || defined(__MINT__)
 #define MANDOC_CONFIG_H
 
 #if defined(__linux__) || defined(__MINT__)

-#define _GNU_SOURCE /* getsubopt(), strcasestr(), strptime() */
+#define _GNU_SOURCE    /* See test-*.c what needs this. */

 #endif
 
 __HEREDOC__
 #endif
 
 __HEREDOC__


@@ -264,8 +273,8 @@ __HEREDOC__
 [ ${HAVE_FGETLN} -eq 0 ] && echo "#include <stdio.h>"
 
 echo
 [ ${HAVE_FGETLN} -eq 0 ] && echo "#include <stdio.h>"
 
 echo

-echo "#define VERSION \"${VERSION}\""

 [ -n "${OSNAME}" ] && echo "#define OSNAME \"${OSNAME}\""
 [ -n "${OSNAME}" ] && echo "#define OSNAME \"${OSNAME}\""

+[ -n "${HOMEBREWDIR}" ] && echo "#define HOMEBREWDIR \"${HOMEBREWDIR}\""

 
 cat << __HEREDOC__
 #define HAVE_DIRENT_NAMLEN ${HAVE_DIRENT_NAMLEN}
 
 cat << __HEREDOC__
 #define HAVE_DIRENT_NAMLEN ${HAVE_DIRENT_NAMLEN}


@@ -279,12 +288,18 @@ cat << __HEREDOC__
 #define HAVE_STRLCPY ${HAVE_STRLCPY}
 #define HAVE_STRPTIME ${HAVE_STRPTIME}
 #define HAVE_STRSEP ${HAVE_STRSEP}
 #define HAVE_STRLCPY ${HAVE_STRLCPY}
 #define HAVE_STRPTIME ${HAVE_STRPTIME}
 #define HAVE_STRSEP ${HAVE_STRSEP}

+#define HAVE_STRTONUM ${HAVE_STRTONUM}

 #define HAVE_WCHAR ${HAVE_WCHAR}
 #define HAVE_SQLITE3 ${HAVE_SQLITE3}
 #define HAVE_SQLITE3_ERRSTR ${HAVE_SQLITE3_ERRSTR}
 #define HAVE_OHASH ${HAVE_OHASH}
 #define HAVE_MANPATH ${HAVE_MANPATH}
 
 #define HAVE_WCHAR ${HAVE_WCHAR}
 #define HAVE_SQLITE3 ${HAVE_SQLITE3}
 #define HAVE_SQLITE3_ERRSTR ${HAVE_SQLITE3_ERRSTR}
 #define HAVE_OHASH ${HAVE_OHASH}
 #define HAVE_MANPATH ${HAVE_MANPATH}
 

+#define BINM_APROPOS "${BINM_APROPOS}"
+#define BINM_MAN "${BINM_MAN}"
+#define BINM_WHATIS "${BINM_WHATIS}"
+#define BINM_MAKEWHATIS "${BINM_MAKEWHATIS}"
+

 #if !defined(__BEGIN_DECLS)
 #  ifdef __cplusplus
 #  define      __BEGIN_DECLS           extern "C" {
 #if !defined(__BEGIN_DECLS)
 #  ifdef __cplusplus
 #  define      __BEGIN_DECLS           extern "C" {


@@ -305,10 +320,8 @@ __HEREDOC__
 [ ${HAVE_FGETLN} -eq 0 ] && \
        echo "extern    char     *fgetln(FILE *, size_t *);"
 
 [ ${HAVE_FGETLN} -eq 0 ] && \
        echo "extern    char     *fgetln(FILE *, size_t *);"
 

-if [ ${HAVE_GETSUBOPT} -eq 0 ]; then
+[ ${HAVE_GETSUBOPT} -eq 0 ] && \

        echo "extern    int       getsubopt(char **, char * const *, char **);"
        echo "extern    int       getsubopt(char **, char * const *, char **);"

-       echo "extern    char     *suboptarg;"
-fi

 
 [ ${HAVE_REALLOCARRAY} -eq 0 ] && \
        echo "extern    void     *reallocarray(void *, size_t, size_t);"
 
 [ ${HAVE_REALLOCARRAY} -eq 0 ] && \
        echo "extern    void     *reallocarray(void *, size_t, size_t);"


@@ -328,6 +341,9 @@ fi
 [ ${HAVE_STRSEP} -eq 0 ] && \
        echo "extern    char     *strsep(char **, const char *);"
 
 [ ${HAVE_STRSEP} -eq 0 ] && \
        echo "extern    char     *strsep(char **, const char *);"
 

+[ ${HAVE_STRTONUM} -eq 0 ] && \
+       echo "extern    long long strtonum(const char *, long long, long long, const char **);"
+

 echo
 echo "#endif /* MANDOC_CONFIG_H */"
 
 echo
 echo "#endif /* MANDOC_CONFIG_H */"
 


@@ -360,12 +376,14 @@ if [ ${BUILD_DB} -eq 0 -a ${BUILD_CGI} -gt 0 ]; then
 fi
 
 BUILD_TARGETS="base-build"
 fi
 
 BUILD_TARGETS="base-build"

-[ ${BUILD_DB}  -gt 0 ] && BUILD_TARGETS="${BUILD_TARGETS} db-build"

 [ ${BUILD_CGI} -gt 0 ] && BUILD_TARGETS="${BUILD_TARGETS} cgi-build"
 [ ${BUILD_CGI} -gt 0 ] && BUILD_TARGETS="${BUILD_TARGETS} cgi-build"

+INSTALL_TARGETS="base-install"
+[ ${BUILD_DB}  -gt 0 ] && INSTALL_TARGETS="${INSTALL_TARGETS} db-install"
+[ ${BUILD_CGI} -gt 0 ] && INSTALL_TARGETS="${INSTALL_TARGETS} cgi-install"

 
 cat << __HEREDOC__
 
 cat << __HEREDOC__

-VERSION                = ${VERSION}

 BUILD_TARGETS  = ${BUILD_TARGETS}
 BUILD_TARGETS  = ${BUILD_TARGETS}

+INSTALL_TARGETS        = ${INSTALL_TARGETS}

 CFLAGS         = ${CFLAGS}
 DBLIB          = ${DBLIB}
 STATIC         = ${STATIC}
 CFLAGS         = ${CFLAGS}
 DBLIB          = ${DBLIB}
 STATIC         = ${STATIC}


@@ -379,6 +397,15 @@ EXAMPLEDIR = ${EXAMPLEDIR}
 WWWPREFIX      = ${WWWPREFIX}
 HTDOCDIR       = ${HTDOCDIR}
 CGIBINDIR      = ${CGIBINDIR}
 WWWPREFIX      = ${WWWPREFIX}
 HTDOCDIR       = ${HTDOCDIR}
 CGIBINDIR      = ${CGIBINDIR}

+BINM_APROPOS   = ${BINM_APROPOS}
+BINM_MAN       = ${BINM_MAN}
+BINM_WHATIS    = ${BINM_WHATIS}
+BINM_MAKEWHATIS        = ${BINM_MAKEWHATIS}
+MANM_MAN       = ${MANM_MAN}
+MANM_MDOC      = ${MANM_MDOC}
+MANM_ROFF      = ${MANM_ROFF}
+MANM_EQN       = ${MANM_EQN}
+MANM_TBL       = ${MANM_TBL}

 INSTALL                = ${INSTALL}
 INSTALL_PROGRAM        = ${INSTALL_PROGRAM}
 INSTALL_LIB    = ${INSTALL_LIB}
 INSTALL                = ${INSTALL}
 INSTALL_PROGRAM        = ${INSTALL_PROGRAM}
 INSTALL_LIB    = ${INSTALL_LIB}


@@ -387,7 +414,7 @@ INSTALL_DATA        = ${INSTALL_DATA}
 __HEREDOC__
 
 [ ${BUILD_DB} -gt 0 ] && \
 __HEREDOC__
 
 [ ${BUILD_DB} -gt 0 ] && \

-       echo "MAN_OBJS  = \$(MANDOC_OBJS) \$(APROPOS_OBJS)"
+       echo "MAIN_OBJS = \$(BASE_OBJS) \$(DB_OBJS)"

 
 echo "Makefile.local: written" 1>&2
 echo "Makefile.local: written" 1>&3
 
 echo "Makefile.local: written" 1>&2
 echo "Makefile.local: written" 1>&3