mirror of
https://github.com/beard7n/bsdports.git
synced 2026-04-14 12:31:18 +02:00
577 lines
19 KiB
Plaintext
577 lines
19 KiB
Plaintext
--- ./configure.orig 2015-04-05 19:02:09.000000000 +0200
|
|
+++ ./configure 2015-05-19 16:14:37.739162000 +0200
|
|
@@ -1,9 +1,11 @@
|
|
#! /bin/sh
|
|
# Guess values for system-dependent variables and create Makefiles.
|
|
-# Generated by GNU Autoconf 2.69.
|
|
+# Generated by GNU Autoconf 2.68.
|
|
#
|
|
#
|
|
-# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
|
|
+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
|
|
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
|
|
+# Foundation, Inc.
|
|
#
|
|
#
|
|
# This configure script is free software; the Free Software Foundation
|
|
@@ -132,31 +134,6 @@
|
|
# CDPATH.
|
|
(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
|
|
|
|
-# Use a proper internal environment variable to ensure we don't fall
|
|
- # into an infinite loop, continuously re-executing ourselves.
|
|
- if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
|
|
- _as_can_reexec=no; export _as_can_reexec;
|
|
- # We cannot yet assume a decent shell, so we have to provide a
|
|
-# neutralization value for shells without unset; and this also
|
|
-# works around shells that cannot unset nonexistent variables.
|
|
-# Preserve -v and -x to the replacement shell.
|
|
-BASH_ENV=/dev/null
|
|
-ENV=/dev/null
|
|
-(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
|
|
-case $- in # ((((
|
|
- *v*x* | *x*v* ) as_opts=-vx ;;
|
|
- *v* ) as_opts=-v ;;
|
|
- *x* ) as_opts=-x ;;
|
|
- * ) as_opts= ;;
|
|
-esac
|
|
-exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
|
|
-# Admittedly, this is quite paranoid, since all the known shells bail
|
|
-# out after a failed `exec'.
|
|
-$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
|
|
-as_fn_exit 255
|
|
- fi
|
|
- # We don't want this to propagate to other subprocesses.
|
|
- { _as_can_reexec=; unset _as_can_reexec;}
|
|
if test "x$CONFIG_SHELL" = x; then
|
|
as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
|
|
emulate sh
|
|
@@ -190,8 +167,7 @@
|
|
else
|
|
exitcode=1; echo positional parameters were not saved.
|
|
fi
|
|
-test x\$exitcode = x0 || exit 1
|
|
-test -x / || exit 1"
|
|
+test x\$exitcode = x0 || exit 1"
|
|
as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
|
|
as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
|
|
eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
|
|
@@ -236,25 +212,21 @@
|
|
|
|
|
|
if test "x$CONFIG_SHELL" != x; then :
|
|
- export CONFIG_SHELL
|
|
- # We cannot yet assume a decent shell, so we have to provide a
|
|
-# neutralization value for shells without unset; and this also
|
|
-# works around shells that cannot unset nonexistent variables.
|
|
-# Preserve -v and -x to the replacement shell.
|
|
-BASH_ENV=/dev/null
|
|
-ENV=/dev/null
|
|
-(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
|
|
-case $- in # ((((
|
|
- *v*x* | *x*v* ) as_opts=-vx ;;
|
|
- *v* ) as_opts=-v ;;
|
|
- *x* ) as_opts=-x ;;
|
|
- * ) as_opts= ;;
|
|
-esac
|
|
-exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
|
|
-# Admittedly, this is quite paranoid, since all the known shells bail
|
|
-# out after a failed `exec'.
|
|
-$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
|
|
-exit 255
|
|
+ # We cannot yet assume a decent shell, so we have to provide a
|
|
+ # neutralization value for shells without unset; and this also
|
|
+ # works around shells that cannot unset nonexistent variables.
|
|
+ # Preserve -v and -x to the replacement shell.
|
|
+ BASH_ENV=/dev/null
|
|
+ ENV=/dev/null
|
|
+ (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
|
|
+ export CONFIG_SHELL
|
|
+ case $- in # ((((
|
|
+ *v*x* | *x*v* ) as_opts=-vx ;;
|
|
+ *v* ) as_opts=-v ;;
|
|
+ *x* ) as_opts=-x ;;
|
|
+ * ) as_opts= ;;
|
|
+ esac
|
|
+ exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
|
|
fi
|
|
|
|
if test x$as_have_required = xno; then :
|
|
@@ -356,14 +328,6 @@
|
|
|
|
|
|
} # as_fn_mkdir_p
|
|
-
|
|
-# as_fn_executable_p FILE
|
|
-# -----------------------
|
|
-# Test if FILE is an executable regular file.
|
|
-as_fn_executable_p ()
|
|
-{
|
|
- test -f "$1" && test -x "$1"
|
|
-} # as_fn_executable_p
|
|
# as_fn_append VAR VALUE
|
|
# ----------------------
|
|
# Append the text in VALUE to the end of the definition contained in VAR. Take
|
|
@@ -485,10 +449,6 @@
|
|
chmod +x "$as_me.lineno" ||
|
|
{ $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
|
|
|
|
- # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
|
|
- # already done that, so ensure we don't try to do so again and fall
|
|
- # in an infinite loop. This has already happened in practice.
|
|
- _as_can_reexec=no; export _as_can_reexec
|
|
# Don't try to exec as it changes $[0], causing all sort of problems
|
|
# (the dirname of $[0] is not the place where we might find the
|
|
# original and so on. Autoconf is especially sensitive to this).
|
|
@@ -523,16 +483,16 @@
|
|
# ... but there are two gotchas:
|
|
# 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
|
|
# 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
|
|
- # In both cases, we have to default to `cp -pR'.
|
|
+ # In both cases, we have to default to `cp -p'.
|
|
ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
|
|
- as_ln_s='cp -pR'
|
|
+ as_ln_s='cp -p'
|
|
elif ln conf$$.file conf$$ 2>/dev/null; then
|
|
as_ln_s=ln
|
|
else
|
|
- as_ln_s='cp -pR'
|
|
+ as_ln_s='cp -p'
|
|
fi
|
|
else
|
|
- as_ln_s='cp -pR'
|
|
+ as_ln_s='cp -p'
|
|
fi
|
|
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
|
|
rmdir conf$$.dir 2>/dev/null
|
|
@@ -544,8 +504,28 @@
|
|
as_mkdir_p=false
|
|
fi
|
|
|
|
-as_test_x='test -x'
|
|
-as_executable_p=as_fn_executable_p
|
|
+if test -x / >/dev/null 2>&1; then
|
|
+ as_test_x='test -x'
|
|
+else
|
|
+ if ls -dL / >/dev/null 2>&1; then
|
|
+ as_ls_L_option=L
|
|
+ else
|
|
+ as_ls_L_option=
|
|
+ fi
|
|
+ as_test_x='
|
|
+ eval sh -c '\''
|
|
+ if test -d "$1"; then
|
|
+ test -d "$1/.";
|
|
+ else
|
|
+ case $1 in #(
|
|
+ -*)set "./$1";;
|
|
+ esac;
|
|
+ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
|
|
+ ???[sx]*):;;*)false;;esac;fi
|
|
+ '\'' sh
|
|
+ '
|
|
+fi
|
|
+as_executable_p=$as_test_x
|
|
|
|
# Sed expression to map a string onto a valid CPP name.
|
|
as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
|
|
@@ -583,7 +563,6 @@
|
|
PACKAGE_URL=
|
|
|
|
ac_unique_file="base/icinga.c"
|
|
-ac_default_prefix=/usr/local/icinga
|
|
# Factoring default headers for most tests.
|
|
ac_includes_default="\
|
|
#include <stdio.h>
|
|
@@ -1304,6 +1283,8 @@
|
|
if test "x$host_alias" != x; then
|
|
if test "x$build_alias" = x; then
|
|
cross_compiling=maybe
|
|
+ $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
|
|
+ If a cross compiler is detected then cross compile mode will be used" >&2
|
|
elif test "x$build_alias" != "x$host_alias"; then
|
|
cross_compiling=yes
|
|
fi
|
|
@@ -1654,9 +1635,9 @@
|
|
if $ac_init_version; then
|
|
cat <<\_ACEOF
|
|
configure
|
|
-generated by GNU Autoconf 2.69
|
|
+generated by GNU Autoconf 2.68
|
|
|
|
-Copyright (C) 2012 Free Software Foundation, Inc.
|
|
+Copyright (C) 2010 Free Software Foundation, Inc.
|
|
This configure script is free software; the Free Software Foundation
|
|
gives unlimited permission to copy, distribute and modify it.
|
|
_ACEOF
|
|
@@ -2032,7 +2013,7 @@
|
|
test ! -s conftest.err
|
|
} && test -s conftest$ac_exeext && {
|
|
test "$cross_compiling" = yes ||
|
|
- test -x conftest$ac_exeext
|
|
+ $as_test_x conftest$ac_exeext
|
|
}; then :
|
|
ac_retval=0
|
|
else
|
|
@@ -2176,7 +2157,7 @@
|
|
running configure, to aid debugging if configure makes a mistake.
|
|
|
|
It was created by $as_me, which was
|
|
-generated by GNU Autoconf 2.69. Invocation command line was
|
|
+generated by GNU Autoconf 2.68. Invocation command line was
|
|
|
|
$ $0 $@
|
|
|
|
@@ -2510,7 +2491,6 @@
|
|
ac_config_headers="$ac_config_headers include/config.h"
|
|
|
|
|
|
-
|
|
PKG_NAME=icinga-core
|
|
PKG_VERSION="1.13.1"
|
|
PKG_HOME_URL="http://www.icinga.org/"
|
|
@@ -2582,7 +2562,7 @@
|
|
# by default.
|
|
for ac_prog in ginstall scoinst install; do
|
|
for ac_exec_ext in '' $ac_executable_extensions; do
|
|
- if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
|
|
+ if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
|
|
if test $ac_prog = install &&
|
|
grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
|
|
# AIX install. It has an incompatible calling convention.
|
|
@@ -2734,7 +2714,7 @@
|
|
IFS=$as_save_IFS
|
|
test -z "$as_dir" && as_dir=.
|
|
for ac_exec_ext in '' $ac_executable_extensions; do
|
|
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
|
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
|
ac_cv_prog_CC="${ac_tool_prefix}gcc"
|
|
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
break 2
|
|
@@ -2774,7 +2754,7 @@
|
|
IFS=$as_save_IFS
|
|
test -z "$as_dir" && as_dir=.
|
|
for ac_exec_ext in '' $ac_executable_extensions; do
|
|
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
|
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
|
ac_cv_prog_ac_ct_CC="gcc"
|
|
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
break 2
|
|
@@ -2827,7 +2807,7 @@
|
|
IFS=$as_save_IFS
|
|
test -z "$as_dir" && as_dir=.
|
|
for ac_exec_ext in '' $ac_executable_extensions; do
|
|
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
|
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
|
ac_cv_prog_CC="${ac_tool_prefix}cc"
|
|
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
break 2
|
|
@@ -2868,7 +2848,7 @@
|
|
IFS=$as_save_IFS
|
|
test -z "$as_dir" && as_dir=.
|
|
for ac_exec_ext in '' $ac_executable_extensions; do
|
|
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
|
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
|
if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
|
|
ac_prog_rejected=yes
|
|
continue
|
|
@@ -2926,7 +2906,7 @@
|
|
IFS=$as_save_IFS
|
|
test -z "$as_dir" && as_dir=.
|
|
for ac_exec_ext in '' $ac_executable_extensions; do
|
|
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
|
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
|
ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
|
|
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
break 2
|
|
@@ -2970,7 +2950,7 @@
|
|
IFS=$as_save_IFS
|
|
test -z "$as_dir" && as_dir=.
|
|
for ac_exec_ext in '' $ac_executable_extensions; do
|
|
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
|
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
|
ac_cv_prog_ac_ct_CC="$ac_prog"
|
|
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
break 2
|
|
@@ -3416,7 +3396,8 @@
|
|
/* end confdefs.h. */
|
|
#include <stdarg.h>
|
|
#include <stdio.h>
|
|
-struct stat;
|
|
+#include <sys/types.h>
|
|
+#include <sys/stat.h>
|
|
/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
|
|
struct buf { int x; };
|
|
FILE * (*rcsopen) (struct buf *, struct stat *, int);
|
|
@@ -3550,7 +3531,7 @@
|
|
IFS=$as_save_IFS
|
|
test -z "$as_dir" && as_dir=.
|
|
for ac_exec_ext in '' $ac_executable_extensions; do
|
|
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
|
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
|
ac_cv_path_STRIP="$as_dir/$ac_word$ac_exec_ext"
|
|
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
break 2
|
|
@@ -3729,7 +3710,7 @@
|
|
for ac_prog in grep ggrep; do
|
|
for ac_exec_ext in '' $ac_executable_extensions; do
|
|
ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
|
|
- as_fn_executable_p "$ac_path_GREP" || continue
|
|
+ { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
|
|
# Check for GNU ac_path_GREP and select it if it is found.
|
|
# Check for GNU $ac_path_GREP
|
|
case `"$ac_path_GREP" --version 2>&1` in
|
|
@@ -3795,7 +3776,7 @@
|
|
for ac_prog in egrep; do
|
|
for ac_exec_ext in '' $ac_executable_extensions; do
|
|
ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
|
|
- as_fn_executable_p "$ac_path_EGREP" || continue
|
|
+ { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
|
|
# Check for GNU ac_path_EGREP and select it if it is found.
|
|
# Check for GNU $ac_path_EGREP
|
|
case `"$ac_path_EGREP" --version 2>&1` in
|
|
@@ -4073,11 +4054,11 @@
|
|
int
|
|
main ()
|
|
{
|
|
-
|
|
+/* FIXME: Include the comments suggested by Paul. */
|
|
#ifndef __cplusplus
|
|
- /* Ultrix mips cc rejects this sort of thing. */
|
|
+ /* Ultrix mips cc rejects this. */
|
|
typedef int charset[2];
|
|
- const charset cs = { 0, 0 };
|
|
+ const charset cs;
|
|
/* SunOS 4.1.1 cc rejects this. */
|
|
char const *const *pcpcc;
|
|
char **ppc;
|
|
@@ -4094,9 +4075,8 @@
|
|
++pcpcc;
|
|
ppc = (char**) pcpcc;
|
|
pcpcc = (char const *const *) ppc;
|
|
- { /* SCO 3.2v4 cc rejects this sort of thing. */
|
|
- char tx;
|
|
- char *t = &tx;
|
|
+ { /* SCO 3.2v4 cc rejects this. */
|
|
+ char *t;
|
|
char const *s = 0 ? (char *) 0 : (char const *) 0;
|
|
|
|
*t++ = 0;
|
|
@@ -4112,10 +4092,10 @@
|
|
iptr p = 0;
|
|
++p;
|
|
}
|
|
- { /* AIX XL C 1.02.0.0 rejects this sort of thing, saying
|
|
+ { /* AIX XL C 1.02.0.0 rejects this saying
|
|
"k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
|
|
- struct s { int j; const int *ap[3]; } bx;
|
|
- struct s *b = &bx; b->j = 5;
|
|
+ struct s { int j; const int *ap[3]; };
|
|
+ struct s *b; b->j = 5;
|
|
}
|
|
{ /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
|
|
const int foo = 10;
|
|
@@ -4870,6 +4850,58 @@
|
|
|
|
THREADLIBS=""
|
|
have_pthreads="no"
|
|
+have_thr="no"
|
|
+
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lthr" >&5
|
|
+$as_echo_n "checking for pthread_create in -lthr... " >&6; }
|
|
+if ${ac_cv_lib_thr_pthread_create+:} false; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
+else
|
|
+ ac_check_lib_save_LIBS=$LIBS
|
|
+LIBS="-lthr $LIBS"
|
|
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
+/* end confdefs.h. */
|
|
+
|
|
+/* Override any GCC internal prototype to avoid an error.
|
|
+ Use char because int might match the return type of a GCC
|
|
+ builtin and then its argument prototype would still apply. */
|
|
+#ifdef __cplusplus
|
|
+extern "C"
|
|
+#endif
|
|
+char pthread_create ();
|
|
+int
|
|
+main ()
|
|
+{
|
|
+return pthread_create ();
|
|
+ ;
|
|
+ return 0;
|
|
+}
|
|
+_ACEOF
|
|
+if ac_fn_c_try_link "$LINENO"; then :
|
|
+ ac_cv_lib_thr_pthread_create=yes
|
|
+else
|
|
+ ac_cv_lib_thr_pthread_create=no
|
|
+fi
|
|
+rm -f core conftest.err conftest.$ac_objext \
|
|
+ conftest$ac_exeext conftest.$ac_ext
|
|
+LIBS=$ac_check_lib_save_LIBS
|
|
+fi
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_thr_pthread_create" >&5
|
|
+$as_echo "$ac_cv_lib_thr_pthread_create" >&6; }
|
|
+if test "x$ac_cv_lib_thr_pthread_create" = xyes; then :
|
|
+ cat >>confdefs.h <<_ACEOF
|
|
+#define HAVE_LIBTHR 1
|
|
+_ACEOF
|
|
+
|
|
+ LIBS="-lthr $LIBS"
|
|
+
|
|
+fi
|
|
+
|
|
+if test $ac_cv_lib_thr_pthread_create = yes; then
|
|
+ THREADLIBS="-lthr"
|
|
+ have_pthreads="yes"
|
|
+ have_thr="yes"
|
|
+else
|
|
|
|
|
|
|
|
@@ -5141,6 +5173,7 @@
|
|
|
|
|
|
fi
|
|
+fi
|
|
|
|
|
|
|
|
@@ -5245,7 +5278,6 @@
|
|
#define DEFAULT_NAGIOS_GROUP "$icinga_grp"
|
|
_ACEOF
|
|
|
|
-INSTALL_OPTS="-o $icinga_user -g $icinga_grp"
|
|
|
|
|
|
|
|
@@ -5355,7 +5387,7 @@
|
|
IFS=$as_save_IFS
|
|
test -z "$as_dir" && as_dir=.
|
|
for ac_exec_ext in '' $ac_executable_extensions; do
|
|
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
|
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
|
ac_cv_path_MAIL_PROG="$as_dir/$ac_word$ac_exec_ext"
|
|
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
break 2
|
|
@@ -5752,7 +5784,7 @@
|
|
fi
|
|
|
|
if test x$P1FILELOC = xno; then
|
|
- P1FILELOC="$libdir"
|
|
+ P1FILELOC="$bindir"
|
|
fi
|
|
|
|
|
|
@@ -7036,6 +7068,9 @@
|
|
_ACEOF
|
|
|
|
PERLLIBS="`perl -MExtUtils::Embed -e ldopts`"
|
|
+ if test x$have_thr = xyes; then
|
|
+ PERLLIBS="`echo $PERLLIBS | sed 's#pthread #lthr #'`"
|
|
+ fi
|
|
PERLDIR="`perl -MConfig -e 'print $Config{installsitearch}'`"
|
|
CFLAGS="${CFLAGS} `perl -MExtUtils::Embed -e ccopts`"
|
|
USEPERL=yes
|
|
@@ -7187,7 +7222,7 @@
|
|
IFS=$as_save_IFS
|
|
test -z "$as_dir" && as_dir=.
|
|
for ac_exec_ext in '' $ac_executable_extensions; do
|
|
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
|
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
|
ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext"
|
|
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
break 2
|
|
@@ -7728,16 +7763,16 @@
|
|
# ... but there are two gotchas:
|
|
# 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
|
|
# 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
|
|
- # In both cases, we have to default to `cp -pR'.
|
|
+ # In both cases, we have to default to `cp -p'.
|
|
ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
|
|
- as_ln_s='cp -pR'
|
|
+ as_ln_s='cp -p'
|
|
elif ln conf$$.file conf$$ 2>/dev/null; then
|
|
as_ln_s=ln
|
|
else
|
|
- as_ln_s='cp -pR'
|
|
+ as_ln_s='cp -p'
|
|
fi
|
|
else
|
|
- as_ln_s='cp -pR'
|
|
+ as_ln_s='cp -p'
|
|
fi
|
|
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
|
|
rmdir conf$$.dir 2>/dev/null
|
|
@@ -7797,16 +7832,28 @@
|
|
as_mkdir_p=false
|
|
fi
|
|
|
|
-
|
|
-# as_fn_executable_p FILE
|
|
-# -----------------------
|
|
-# Test if FILE is an executable regular file.
|
|
-as_fn_executable_p ()
|
|
-{
|
|
- test -f "$1" && test -x "$1"
|
|
-} # as_fn_executable_p
|
|
-as_test_x='test -x'
|
|
-as_executable_p=as_fn_executable_p
|
|
+if test -x / >/dev/null 2>&1; then
|
|
+ as_test_x='test -x'
|
|
+else
|
|
+ if ls -dL / >/dev/null 2>&1; then
|
|
+ as_ls_L_option=L
|
|
+ else
|
|
+ as_ls_L_option=
|
|
+ fi
|
|
+ as_test_x='
|
|
+ eval sh -c '\''
|
|
+ if test -d "$1"; then
|
|
+ test -d "$1/.";
|
|
+ else
|
|
+ case $1 in #(
|
|
+ -*)set "./$1";;
|
|
+ esac;
|
|
+ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
|
|
+ ???[sx]*):;;*)false;;esac;fi
|
|
+ '\'' sh
|
|
+ '
|
|
+fi
|
|
+as_executable_p=$as_test_x
|
|
|
|
# Sed expression to map a string onto a valid CPP name.
|
|
as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
|
|
@@ -7828,7 +7875,7 @@
|
|
# values after options handling.
|
|
ac_log="
|
|
This file was extended by $as_me, which was
|
|
-generated by GNU Autoconf 2.69. Invocation command line was
|
|
+generated by GNU Autoconf 2.68. Invocation command line was
|
|
|
|
CONFIG_FILES = $CONFIG_FILES
|
|
CONFIG_HEADERS = $CONFIG_HEADERS
|
|
@@ -7890,10 +7937,10 @@
|
|
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
|
|
ac_cs_version="\\
|
|
config.status
|
|
-configured by $0, generated by GNU Autoconf 2.69,
|
|
+configured by $0, generated by GNU Autoconf 2.68,
|
|
with options \\"\$ac_cs_config\\"
|
|
|
|
-Copyright (C) 2012 Free Software Foundation, Inc.
|
|
+Copyright (C) 2010 Free Software Foundation, Inc.
|
|
This config.status script is free software; the Free Software Foundation
|
|
gives unlimited permission to copy, distribute and modify it."
|
|
|
|
@@ -7982,7 +8029,7 @@
|
|
_ACEOF
|
|
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
|
|
if \$ac_cs_recheck; then
|
|
- set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
|
|
+ set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
|
|
shift
|
|
\$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
|
|
CONFIG_SHELL='$SHELL'
|