=================================================================== RCS file: /cvs/mandoc/configure,v retrieving revision 1.43.2.6 retrieving revision 1.43.2.10 diff -u -p -r1.43.2.6 -r1.43.2.10 --- mandoc/configure 2016/10/20 18:52:27 1.43.2.6 +++ mandoc/configure 2017/02/17 14:50:13 1.43.2.10 @@ -1,8 +1,8 @@ #!/bin/sh # -# $Id: configure,v 1.43.2.6 2016/10/20 18:52:27 schwarze Exp $ +# $Id: configure,v 1.43.2.10 2017/02/17 14:50:13 schwarze Exp $ # -# Copyright (c) 2014, 2015, 2016 Ingo Schwarze +# Copyright (c) 2014, 2015, 2016, 2017 Ingo Schwarze # # Permission to use, copy, modify, and distribute this software for any # purpose with or without fee is hereby granted, provided that the above @@ -33,6 +33,8 @@ echo "config.log: writing..." # Initialize all variables here, # such that nothing can leak in from the environment. +SOURCEDIR=`dirname "$0"` + MANPATH_DEFAULT="/usr/share/man:/usr/X11R6/man:/usr/local/man" OSNAME= UTF8_LOCALE= @@ -111,6 +113,7 @@ INSTALL_PROGRAM= INSTALL_LIB= INSTALL_MAN= INSTALL_DATA= +LN="ln -f" # --- manual settings from configure.local ----------------------------- @@ -147,10 +150,11 @@ ismanual() { singletest() { cat 1>&3 << __HEREDOC__ ${1}${3}: testing... -${COMP} ${3} -o test-${1} test-${1}.c +${COMP} -o test-${1} test-${1}.c ${3} __HEREDOC__ - if ${COMP} ${3} -o "test-${1}" "test-${1}.c" 1>&3 2>&3; then + if ${COMP} -o "test-${1}" "${SOURCEDIR}/test-${1}.c" ${3} 1>&3 2>&3 + then echo "${1}${3}: ${CC} succeeded" 1>&3 else echo "${1}${3}: ${CC} failed with $?" 1>&3 @@ -262,6 +266,7 @@ elif runtest sqlite3 SQLITE3 \ "-I/usr/local/include -L/usr/local/lib -lsqlite3"; then LD_SQLITE3="-L/usr/local/lib -lsqlite3" CFLAGS="${CFLAGS} -I/usr/local/include" + COMP="${COMP} -I/usr/local/include" fi if [ ${HAVE_SQLITE3} -eq 0 ]; then LD_SQLITE3= @@ -517,6 +522,7 @@ INSTALL_PROGRAM = ${INSTALL_PROGRAM} INSTALL_LIB = ${INSTALL_LIB} INSTALL_MAN = ${INSTALL_MAN} INSTALL_DATA = ${INSTALL_DATA} +LN = ${LN} __HEREDOC__ [ ${BUILD_DB} -gt 0 ] && \