Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ISC Open Source Projects
BIND
Commits
c5826852
Commit
c5826852
authored
Jul 23, 2004
by
Mark Andrews
Browse files
1692. [bug] Don't set -I, -L and -R flags when librcypto is in
/usr/lib. [RT #11971]
parent
c4f9e613
Changes
3
Hide whitespace changes
Inline
Side-by-side
CHANGES
View file @
c5826852
1692. [bug] Don't set -I, -L and -R flags when librcypto is in
/usr/lib. [RT #11971]
1691. [bug] sdb's attachversion was not complete. [RT #11990]
1690. [bug] Delay detaching view from the client until UPDATE
...
...
configure
View file @
c5826852
...
...
@@ -14,7 +14,7 @@
# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
#
# $Id: configure,v 1.34
3
2004/07/
01 00:22:29
marka Exp $
# $Id: configure,v 1.34
4
2004/07/
23 04:35:08
marka Exp $
#
# Portions Copyright (C) 1996-2001 Nominum, Inc.
#
...
...
@@ -29,7 +29,7 @@
# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
# From configure.in Revision: 1.3
59
.
# From configure.in Revision: 1.3
60
.
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.59.
#
...
...
@@ -4653,21 +4653,29 @@ echo "$as_me: error: OpenSSL was not found in any of $openssldirs; use --with-op
{ (exit 1); exit 1; }; }
elif test "$use_openssl" = "auto"
then
DST_OPENSSL_INC=""
USE_OPENSSL=""
echo "$as_me:$LINENO: result: not found" >&5
echo "${ECHO_T}not found" >&6
break
fi
fi
USE_OPENSSL='-DOPENSSL'
DST_OPENSSL_INC="-I$use_openssl/include"
case $host in
*-solaris*)
DNS_OPENSSL_LIBS="-L$use_openssl/lib -R$use_openssl/lib -lcrypto"
;;
*)
DNS_OPENSSL_LIBS="-L$use_openssl/lib -lcrypto"
;;
esac
if test "$use_openssl" = "/usr"
then
DST_OPENSSL_INC=""
DNS_OPENSSL_LIBS="-lcrypto"
else
DST_OPENSSL_INC="-I$use_openssl/include"
case $host in
*-solaris*)
DNS_OPENSSL_LIBS="-L$use_openssl/lib -R$use_openssl/lib -lcrypto"
;;
*)
DNS_OPENSSL_LIBS="-L$use_openssl/lib -lcrypto"
;;
esac
fi
echo "$as_me:$LINENO: result: using openssl from $use_openssl/lib and $use_openssl/include" >&5
echo "${ECHO_T}using openssl from $use_openssl/lib and $use_openssl/include" >&6
...
...
@@ -7834,7 +7842,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
echo '#line 78
37
"configure"' > conftest.$ac_ext
echo '#line 78
45
"configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
...
...
@@ -8824,7 +8832,7 @@ fi
# Provide some information about the compiler.
echo "$as_me:88
27
:" \
echo "$as_me:88
35
:" \
"checking for Fortran 77 compiler version" >&5
ac_compiler=`set X $ac_compile; echo $2`
{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
...
...
@@ -9862,11 +9870,11 @@ else
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:98
65
: $lt_compile\"" >&5)
(eval echo "\"\$as_me:98
73
: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
echo "$as_me:98
69
: \$? = $ac_status" >&5
echo "$as_me:98
77
: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
...
...
@@ -10095,11 +10103,11 @@ else
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:10
098
: $lt_compile\"" >&5)
(eval echo "\"\$as_me:10
106
: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
echo "$as_me:1010
2
: \$? = $ac_status" >&5
echo "$as_me:101
1
0: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
...
...
@@ -10155,11 +10163,11 @@ else
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:101
58
: $lt_compile\"" >&5)
(eval echo "\"\$as_me:101
66
: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
echo "$as_me:101
62
: \$? = $ac_status" >&5
echo "$as_me:101
70
: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
...
...
@@ -12339,7 +12347,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
#line 123
42
"configure"
#line 123
50
"configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
...
...
@@ -12437,7 +12445,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
#line 1244
0
"configure"
#line 1244
8
"configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
...
...
@@ -14620,11 +14628,11 @@ else
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:146
2
3: $lt_compile\"" >&5)
(eval echo "\"\$as_me:1463
1
: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
echo "$as_me:146
27
: \$? = $ac_status" >&5
echo "$as_me:146
35
: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
...
...
@@ -14680,11 +14688,11 @@ else
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:146
83
: $lt_compile\"" >&5)
(eval echo "\"\$as_me:146
91
: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
echo "$as_me:146
87
: \$? = $ac_status" >&5
echo "$as_me:146
95
: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
...
...
@@ -16041,7 +16049,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
#line 160
44
"configure"
#line 160
52
"configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
...
...
@@ -16139,7 +16147,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
#line 161
42
"configure"
#line 161
50
"configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
...
...
@@ -16966,11 +16974,11 @@ else
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:169
69
: $lt_compile\"" >&5)
(eval echo "\"\$as_me:169
77
: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
echo "$as_me:169
73
: \$? = $ac_status" >&5
echo "$as_me:169
81
: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
...
...
@@ -17026,11 +17034,11 @@ else
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:170
29
: $lt_compile\"" >&5)
(eval echo "\"\$as_me:170
37
: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
echo "$as_me:170
33
: \$? = $ac_status" >&5
echo "$as_me:170
41
: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
...
...
@@ -19064,11 +19072,11 @@ else
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:190
6
7: $lt_compile\"" >&5)
(eval echo "\"\$as_me:1907
5
: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
echo "$as_me:1907
1
: \$? = $ac_status" >&5
echo "$as_me:1907
9
: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
...
...
@@ -19297,11 +19305,11 @@ else
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:1930
0
: $lt_compile\"" >&5)
(eval echo "\"\$as_me:1930
8
: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
echo "$as_me:193
04
: \$? = $ac_status" >&5
echo "$as_me:193
12
: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
...
...
@@ -19357,11 +19365,11 @@ else
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:1936
0
: $lt_compile\"" >&5)
(eval echo "\"\$as_me:1936
8
: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
echo "$as_me:193
64
: \$? = $ac_status" >&5
echo "$as_me:193
72
: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
...
...
@@ -21541,7 +21549,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
#line 215
44
"configure"
#line 215
52
"configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
...
...
@@ -21639,7 +21647,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
#line 216
42
"configure"
#line 216
50
"configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
...
...
configure.in
View file @
c5826852
...
...
@@ -18,7 +18,7 @@ AC_DIVERT_PUSH(1)dnl
esyscmd([sed "s/^/# /" COPYRIGHT])dnl
AC_DIVERT_POP()dnl
AC_REVISION($Revision: 1.3
59
$)
AC_REVISION($Revision: 1.3
60
$)
AC_INIT(lib/dns/name.c)
AC_PREREQ(2.13)
...
...
@@ -371,20 +371,28 @@ case "$use_openssl" in
[OpenSSL was not found in any of $openssldirs; use --with-openssl=/path])
elif test "$use_openssl" = "auto"
then
DST_OPENSSL_INC=""
USE_OPENSSL=""
AC_MSG_RESULT(not found)
break
fi
fi
USE_OPENSSL='-DOPENSSL'
DST_OPENSSL_INC="-I$use_openssl/include"
case $host in
*-solaris*)
DNS_OPENSSL_LIBS="-L$use_openssl/lib -R$use_openssl/lib -lcrypto"
;;
*)
DNS_OPENSSL_LIBS="-L$use_openssl/lib -lcrypto"
;;
esac
if test "$use_openssl" = "/usr"
then
DST_OPENSSL_INC=""
DNS_OPENSSL_LIBS="-lcrypto"
else
DST_OPENSSL_INC="-I$use_openssl/include"
case $host in
*-solaris*)
DNS_OPENSSL_LIBS="-L$use_openssl/lib -R$use_openssl/lib -lcrypto"
;;
*)
DNS_OPENSSL_LIBS="-L$use_openssl/lib -lcrypto"
;;
esac
fi
AC_MSG_RESULT(using openssl from $use_openssl/lib and $use_openssl/include)
saved_cflags="$CFLAGS"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment