Browse code

autoreconf -fvi with proper versions, one of the previous commits used autotools I had in /usr/local.

Török Edvin authored on 2009/09/24 22:04:08
Showing 8 changed files
... ...
@@ -384,8 +384,7 @@ DISTCLEANFILES = target.h
384 384
 @DISTCHECK_ENABLE_FLAGS_TRUE@	-D_FORTIFY_SOURCE=2 \
385 385
 @DISTCHECK_ENABLE_FLAGS_TRUE@	-fstack-protector-all \
386 386
 @DISTCHECK_ENABLE_FLAGS_TRUE@	-Wstack-protector \
387
-@DISTCHECK_ENABLE_FLAGS_TRUE@	-Wno-error=aggregate-return" \
388
-@DISTCHECK_ENABLE_FLAGS_TRUE@	VERBOSE=1
387
+@DISTCHECK_ENABLE_FLAGS_TRUE@	-Wno-error=aggregate-return"
389 388
 all: clamav-config.h
390 389
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
391 390
 
... ...
@@ -741,6 +741,23 @@ AC_DEFUN([_AM_SET_OPTIONS],
741 741
 AC_DEFUN([_AM_IF_OPTION],
742 742
 [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
743 743
 
744
+# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
745
+#
746
+# This file is free software; the Free Software Foundation
747
+# gives unlimited permission to copy and/or distribute it,
748
+# with or without modifications, as long as this notice is preserved.
749
+
750
+# AM_RUN_LOG(COMMAND)
751
+# -------------------
752
+# Run COMMAND, save the exit status in ac_status, and log it.
753
+# (This has been adapted from Autoconf's _AC_RUN_LOG macro.)
754
+AC_DEFUN([AM_RUN_LOG],
755
+[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD
756
+   ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD
757
+   ac_status=$?
758
+   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
759
+   (exit $ac_status); }])
760
+
744 761
 # Check to make sure that the build environment is sane.    -*- Autoconf -*-
745 762
 
746 763
 # Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008
... ...
@@ -92,11 +92,9 @@ am__clamd_SOURCES_DIST = $(top_srcdir)/shared/output.c \
92 92
 @BUILD_CLAMD_TRUE@	localserver.$(OBJEXT) session.$(OBJEXT) \
93 93
 @BUILD_CLAMD_TRUE@	thrmgr.$(OBJEXT) server-th.$(OBJEXT) \
94 94
 @BUILD_CLAMD_TRUE@	scanner.$(OBJEXT) others.$(OBJEXT) \
95
-@BUILD_CLAMD_TRUE@	clamuko.$(OBJEXT) \
96
-@BUILD_CLAMD_TRUE@	clamukofs.$(OBJEXT) \
95
+@BUILD_CLAMD_TRUE@	clamuko.$(OBJEXT) clamukofs.$(OBJEXT) \
97 96
 @BUILD_CLAMD_TRUE@	dazukoio_compat12.$(OBJEXT) \
98
-@BUILD_CLAMD_TRUE@	dazukofs.$(OBJEXT) \
99
-@BUILD_CLAMD_TRUE@	dazukoio.$(OBJEXT)
97
+@BUILD_CLAMD_TRUE@	dazukoio.$(OBJEXT) dazukofs.$(OBJEXT)
100 98
 clamd_OBJECTS = $(am_clamd_OBJECTS)
101 99
 clamd_LDADD = $(LDADD)
102 100
 AM_V_lt = $(am__v_lt_$(V))
... ...
@@ -442,9 +440,9 @@ distclean-compile:
442 442
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clamd.Po@am__quote@
443 443
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clamuko.Po@am__quote@
444 444
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clamukofs.Po@am__quote@
445
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dazukofs.Po@am__quote@
445 446
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dazukoio.Po@am__quote@
446 447
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dazukoio_compat12.Po@am__quote@
447
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dazukofs.Po@am__quote@
448 448
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getopt.Po@am__quote@
449 449
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/localserver.Po@am__quote@
450 450
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/misc.Po@am__quote@
... ...
@@ -65,7 +65,7 @@
65 65
 #       compiler:		$LTCC
66 66
 #       compiler flags:		$LTCFLAGS
67 67
 #       linker:		$LD (gnu? $with_gnu_ld)
68
-#       $progname:		(GNU libtool) 2.2.6
68
+#       $progname:		(GNU libtool) 2.2.6 Debian-2.2.6a-4
69 69
 #       automake:		$automake_version
70 70
 #       autoconf:		$autoconf_version
71 71
 #
... ...
@@ -73,7 +73,7 @@
73 73
 
74 74
 PROGRAM=ltmain.sh
75 75
 PACKAGE=libtool
76
-VERSION=2.2.6
76
+VERSION="2.2.6 Debian-2.2.6a-4"
77 77
 TIMESTAMP=""
78 78
 package_revision=1.3012
79 79
 
... ...
@@ -116,15 +116,15 @@ $lt_unset CDPATH
116 116
 
117 117
 : ${CP="cp -f"}
118 118
 : ${ECHO="echo"}
119
-: ${EGREP="/usr/bin/grep -E"}
120
-: ${FGREP="/usr/bin/grep -F"}
121
-: ${GREP="/usr/bin/grep"}
119
+: ${EGREP="/bin/grep -E"}
120
+: ${FGREP="/bin/grep -F"}
121
+: ${GREP="/bin/grep"}
122 122
 : ${LN_S="ln -s"}
123 123
 : ${MAKE="make"}
124 124
 : ${MKDIR="mkdir"}
125 125
 : ${MV="mv -f"}
126 126
 : ${RM="rm -f"}
127
-: ${SED="/opt/local/bin/gsed"}
127
+: ${SED="/bin/sed"}
128 128
 : ${SHELL="${CONFIG_SHELL-/bin/sh}"}
129 129
 : ${Xsed="$SED -e 1s/^X//"}
130 130
 
... ...
@@ -5033,7 +5033,10 @@ func_mode_link ()
5033 5033
 	case $pass in
5034 5034
 	dlopen) libs="$dlfiles" ;;
5035 5035
 	dlpreopen) libs="$dlprefiles" ;;
5036
-	link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
5036
+	link)
5037
+	  libs="$deplibs %DEPLIBS%"
5038
+	  test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
5039
+	  ;;
5037 5040
 	esac
5038 5041
       fi
5039 5042
       if test "$linkmode,$pass" = "lib,dlpreopen"; then
... ...
@@ -5344,19 +5347,19 @@ func_mode_link ()
5344 5344
 	    # It is a libtool convenience library, so add in its objects.
5345 5345
 	    convenience="$convenience $ladir/$objdir/$old_library"
5346 5346
 	    old_convenience="$old_convenience $ladir/$objdir/$old_library"
5347
+	    tmp_libs=
5348
+	    for deplib in $dependency_libs; do
5349
+	      deplibs="$deplib $deplibs"
5350
+	      if $opt_duplicate_deps ; then
5351
+		case "$tmp_libs " in
5352
+		*" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
5353
+		esac
5354
+	      fi
5355
+	      tmp_libs="$tmp_libs $deplib"
5356
+	    done
5347 5357
 	  elif test "$linkmode" != prog && test "$linkmode" != lib; then
5348 5358
 	    func_fatal_error "\`$lib' is not a convenience library"
5349 5359
 	  fi
5350
-	  tmp_libs=
5351
-	  for deplib in $dependency_libs; do
5352
-	    deplibs="$deplib $deplibs"
5353
-	    if $opt_duplicate_deps ; then
5354
-	      case "$tmp_libs " in
5355
-	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
5356
-	      esac
5357
-	    fi
5358
-	    tmp_libs="$tmp_libs $deplib"
5359
-	  done
5360 5360
 	  continue
5361 5361
 	fi # $pass = conv
5362 5362
 
... ...
@@ -5893,6 +5896,7 @@ func_mode_link ()
5893 5893
 	  if test "$link_all_deplibs" != no; then
5894 5894
 	    # Add the search paths of all dependency libraries
5895 5895
 	    for deplib in $dependency_libs; do
5896
+	      path=
5896 5897
 	      case $deplib in
5897 5898
 	      -L*) path="$deplib" ;;
5898 5899
 	      *.la)
... ...
@@ -6206,6 +6210,9 @@ func_mode_link ()
6206 6206
 	    revision="$number_minor"
6207 6207
 	    lt_irix_increment=no
6208 6208
 	    ;;
6209
+	  *)
6210
+	    func_fatal_configuration "$modename: unknown library version type \`$version_type'"
6211
+	    ;;
6209 6212
 	  esac
6210 6213
 	  ;;
6211 6214
 	no)
... ...
@@ -3353,7 +3353,88 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
3353 3353
 
3354 3354
 AMTAR=${AMTAR-"${am_missing_run}tar"}
3355 3355
 
3356
-am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
3356
+
3357
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to create a ustar tar archive" >&5
3358
+$as_echo_n "checking how to create a ustar tar archive... " >&6; }
3359
+# Loop over all known methods to create a tar archive until one works.
3360
+_am_tools='gnutar plaintar pax cpio none'
3361
+_am_tools=${am_cv_prog_tar_ustar-$_am_tools}
3362
+# Do not fold the above two line into one, because Tru64 sh and
3363
+# Solaris sh will not grok spaces in the rhs of `-'.
3364
+for _am_tool in $_am_tools
3365
+do
3366
+  case $_am_tool in
3367
+  gnutar)
3368
+    for _am_tar in tar gnutar gtar;
3369
+    do
3370
+      { echo "$as_me:$LINENO: $_am_tar --version" >&5
3371
+   ($_am_tar --version) >&5 2>&5
3372
+   ac_status=$?
3373
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
3374
+   (exit $ac_status); } && break
3375
+    done
3376
+    am__tar="$_am_tar --format=ustar -chf - "'"$$tardir"'
3377
+    am__tar_="$_am_tar --format=ustar -chf - "'"$tardir"'
3378
+    am__untar="$_am_tar -xf -"
3379
+    ;;
3380
+  plaintar)
3381
+    # Must skip GNU tar: if it does not support --format= it doesn't create
3382
+    # ustar tarball either.
3383
+    (tar --version) >/dev/null 2>&1 && continue
3384
+    am__tar='tar chf - "$$tardir"'
3385
+    am__tar_='tar chf - "$tardir"'
3386
+    am__untar='tar xf -'
3387
+    ;;
3388
+  pax)
3389
+    am__tar='pax -L -x ustar -w "$$tardir"'
3390
+    am__tar_='pax -L -x ustar -w "$tardir"'
3391
+    am__untar='pax -r'
3392
+    ;;
3393
+  cpio)
3394
+    am__tar='find "$$tardir" -print | cpio -o -H ustar -L'
3395
+    am__tar_='find "$tardir" -print | cpio -o -H ustar -L'
3396
+    am__untar='cpio -i -H ustar -d'
3397
+    ;;
3398
+  none)
3399
+    am__tar=false
3400
+    am__tar_=false
3401
+    am__untar=false
3402
+    ;;
3403
+  esac
3404
+
3405
+  # If the value was cached, stop now.  We just wanted to have am__tar
3406
+  # and am__untar set.
3407
+  test -n "${am_cv_prog_tar_ustar}" && break
3408
+
3409
+  # tar/untar a dummy directory, and stop if the command works
3410
+  rm -rf conftest.dir
3411
+  mkdir conftest.dir
3412
+  echo GrepMe > conftest.dir/file
3413
+  { echo "$as_me:$LINENO: tardir=conftest.dir && eval $am__tar_ >conftest.tar" >&5
3414
+   (tardir=conftest.dir && eval $am__tar_ >conftest.tar) >&5 2>&5
3415
+   ac_status=$?
3416
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
3417
+   (exit $ac_status); }
3418
+  rm -rf conftest.dir
3419
+  if test -s conftest.tar; then
3420
+    { echo "$as_me:$LINENO: $am__untar <conftest.tar" >&5
3421
+   ($am__untar <conftest.tar) >&5 2>&5
3422
+   ac_status=$?
3423
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
3424
+   (exit $ac_status); }
3425
+    grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
3426
+  fi
3427
+done
3428
+rm -rf conftest.dir
3429
+
3430
+if test "${am_cv_prog_tar_ustar+set}" = set; then :
3431
+  $as_echo_n "(cached) " >&6
3432
+else
3433
+  am_cv_prog_tar_ustar=$_am_tool
3434
+fi
3435
+
3436
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_tar_ustar" >&5
3437
+$as_echo "$am_cv_prog_tar_ustar" >&6; }
3357 3438
 
3358 3439
 
3359 3440
 
... ...
@@ -5048,13 +5129,13 @@ if test "${lt_cv_nm_interface+set}" = set; then :
5048 5048
 else
5049 5049
   lt_cv_nm_interface="BSD nm"
5050 5050
   echo "int some_variable = 0;" > conftest.$ac_ext
5051
-  (eval echo "\"\$as_me:5051: $ac_compile\"" >&5)
5051
+  (eval echo "\"\$as_me:5132: $ac_compile\"" >&5)
5052 5052
   (eval "$ac_compile" 2>conftest.err)
5053 5053
   cat conftest.err >&5
5054
-  (eval echo "\"\$as_me:5054: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
5054
+  (eval echo "\"\$as_me:5135: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
5055 5055
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
5056 5056
   cat conftest.err >&5
5057
-  (eval echo "\"\$as_me:5057: output\"" >&5)
5057
+  (eval echo "\"\$as_me:5138: output\"" >&5)
5058 5058
   cat conftest.out >&5
5059 5059
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
5060 5060
     lt_cv_nm_interface="MS dumpbin"
... ...
@@ -5513,7 +5594,7 @@ linux* | k*bsd*-gnu)
5513 5513
   lt_cv_deplibs_check_method=pass_all
5514 5514
   ;;
5515 5515
 
5516
-netbsd*)
5516
+netbsd* | netbsdelf*-gnu)
5517 5517
   if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
5518 5518
     lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
5519 5519
   else
... ...
@@ -6249,7 +6330,7 @@ ia64-*-hpux*)
6249 6249
   ;;
6250 6250
 *-*-irix6*)
6251 6251
   # Find out which ABI we are using.
6252
-  echo '#line 6252 "configure"' > conftest.$ac_ext
6252
+  echo '#line 6333 "configure"' > conftest.$ac_ext
6253 6253
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
6254 6254
   (eval $ac_compile) 2>&5
6255 6255
   ac_status=$?
... ...
@@ -7778,11 +7859,11 @@ else
7778 7778
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
7779 7779
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
7780 7780
    -e 's:$: $lt_compiler_flag:'`
7781
-   (eval echo "\"\$as_me:7781: $lt_compile\"" >&5)
7781
+   (eval echo "\"\$as_me:7862: $lt_compile\"" >&5)
7782 7782
    (eval "$lt_compile" 2>conftest.err)
7783 7783
    ac_status=$?
7784 7784
    cat conftest.err >&5
7785
-   echo "$as_me:7785: \$? = $ac_status" >&5
7785
+   echo "$as_me:7866: \$? = $ac_status" >&5
7786 7786
    if (exit $ac_status) && test -s "$ac_outfile"; then
7787 7787
      # The compiler can only warn and ignore the option if not recognized
7788 7788
      # So say no if there are warnings other than the usual output.
... ...
@@ -8117,11 +8198,11 @@ else
8117 8117
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
8118 8118
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
8119 8119
    -e 's:$: $lt_compiler_flag:'`
8120
-   (eval echo "\"\$as_me:8120: $lt_compile\"" >&5)
8120
+   (eval echo "\"\$as_me:8201: $lt_compile\"" >&5)
8121 8121
    (eval "$lt_compile" 2>conftest.err)
8122 8122
    ac_status=$?
8123 8123
    cat conftest.err >&5
8124
-   echo "$as_me:8124: \$? = $ac_status" >&5
8124
+   echo "$as_me:8205: \$? = $ac_status" >&5
8125 8125
    if (exit $ac_status) && test -s "$ac_outfile"; then
8126 8126
      # The compiler can only warn and ignore the option if not recognized
8127 8127
      # So say no if there are warnings other than the usual output.
... ...
@@ -8222,11 +8303,11 @@ else
8222 8222
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
8223 8223
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
8224 8224
    -e 's:$: $lt_compiler_flag:'`
8225
-   (eval echo "\"\$as_me:8225: $lt_compile\"" >&5)
8225
+   (eval echo "\"\$as_me:8306: $lt_compile\"" >&5)
8226 8226
    (eval "$lt_compile" 2>out/conftest.err)
8227 8227
    ac_status=$?
8228 8228
    cat out/conftest.err >&5
8229
-   echo "$as_me:8229: \$? = $ac_status" >&5
8229
+   echo "$as_me:8310: \$? = $ac_status" >&5
8230 8230
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
8231 8231
    then
8232 8232
      # The compiler can only warn and ignore the option if not recognized
... ...
@@ -8277,11 +8358,11 @@ else
8277 8277
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
8278 8278
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
8279 8279
    -e 's:$: $lt_compiler_flag:'`
8280
-   (eval echo "\"\$as_me:8280: $lt_compile\"" >&5)
8280
+   (eval echo "\"\$as_me:8361: $lt_compile\"" >&5)
8281 8281
    (eval "$lt_compile" 2>out/conftest.err)
8282 8282
    ac_status=$?
8283 8283
    cat out/conftest.err >&5
8284
-   echo "$as_me:8284: \$? = $ac_status" >&5
8284
+   echo "$as_me:8365: \$? = $ac_status" >&5
8285 8285
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
8286 8286
    then
8287 8287
      # The compiler can only warn and ignore the option if not recognized
... ...
@@ -8396,6 +8477,9 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
8396 8396
   openbsd*)
8397 8397
     with_gnu_ld=no
8398 8398
     ;;
8399
+  linux* | k*bsd*-gnu)
8400
+    link_all_deplibs=no
8401
+    ;;
8399 8402
   esac
8400 8403
 
8401 8404
   ld_shlibs=yes
... ...
@@ -8578,7 +8662,7 @@ _LT_EOF
8578 8578
       fi
8579 8579
       ;;
8580 8580
 
8581
-    netbsd*)
8581
+    netbsd* | netbsdelf*-gnu)
8582 8582
       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
8583 8583
 	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
8584 8584
 	wlarc=
... ...
@@ -8753,6 +8837,7 @@ _LT_EOF
8753 8753
 	if test "$aix_use_runtimelinking" = yes; then
8754 8754
 	  shared_flag="$shared_flag "'${wl}-G'
8755 8755
 	fi
8756
+	link_all_deplibs=no
8756 8757
       else
8757 8758
 	# not using gcc
8758 8759
 	if test "$host_cpu" = ia64; then
... ...
@@ -9079,7 +9164,7 @@ rm -f core conftest.err conftest.$ac_objext \
9079 9079
       link_all_deplibs=yes
9080 9080
       ;;
9081 9081
 
9082
-    netbsd*)
9082
+    netbsd* | netbsdelf*-gnu)
9083 9083
       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
9084 9084
 	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
9085 9085
       else
... ...
@@ -10024,6 +10109,18 @@ rm -f core conftest.err conftest.$ac_objext \
10024 10024
   dynamic_linker='GNU/Linux ld.so'
10025 10025
   ;;
10026 10026
 
10027
+netbsdelf*-gnu)
10028
+  version_type=linux
10029
+  need_lib_prefix=no
10030
+  need_version=no
10031
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
10032
+  soname_spec='${libname}${release}${shared_ext}$major'
10033
+  shlibpath_var=LD_LIBRARY_PATH
10034
+  shlibpath_overrides_runpath=no
10035
+  hardcode_into_libs=yes
10036
+  dynamic_linker='NetBSD ld.elf_so'
10037
+  ;;
10038
+
10027 10039
 netbsd*)
10028 10040
   version_type=sunos
10029 10041
   need_lib_prefix=no
... ...
@@ -10644,7 +10741,7 @@ else
10644 10644
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
10645 10645
   lt_status=$lt_dlunknown
10646 10646
   cat > conftest.$ac_ext <<_LT_EOF
10647
-#line 10647 "configure"
10647
+#line 10744 "configure"
10648 10648
 #include "confdefs.h"
10649 10649
 
10650 10650
 #if HAVE_DLFCN_H
... ...
@@ -10740,7 +10837,7 @@ else
10740 10740
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
10741 10741
   lt_status=$lt_dlunknown
10742 10742
   cat > conftest.$ac_ext <<_LT_EOF
10743
-#line 10743 "configure"
10743
+#line 10840 "configure"
10744 10744
 #include "confdefs.h"
10745 10745
 
10746 10746
 #if HAVE_DLFCN_H
... ...
@@ -11412,7 +11509,7 @@ else
11412 11412
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
11413 11413
   lt_status=$lt_dlunknown
11414 11414
   cat > conftest.$ac_ext <<_LT_EOF
11415
-#line 11415 "configure"
11415
+#line 11512 "configure"
11416 11416
 #include "confdefs.h"
11417 11417
 
11418 11418
 #if HAVE_DLFCN_H
... ...
@@ -11558,7 +11655,7 @@ else
11558 11558
     # at 6.2 and later dlopen does load deplibs.
11559 11559
     lt_cv_sys_dlopen_deplibs=yes
11560 11560
     ;;
11561
-  netbsd*)
11561
+  netbsd* | netbsdelf*-gnu)
11562 11562
     lt_cv_sys_dlopen_deplibs=yes
11563 11563
     ;;
11564 11564
   openbsd*)
... ...
@@ -1614,6 +1614,9 @@ lt_dlopenadvise (const char *filename, lt_dladvise advise)
1614 1614
 {
1615 1615
   lt_dlhandle	handle	= 0;
1616 1616
   int		errors	= 0;
1617
+  const char *	saved_error	= 0;
1618
+
1619
+  LT__GETERROR (saved_error);
1617 1620
 
1618 1621
   /* Can't have symbols hidden and visible at the same time!  */
1619 1622
   if (advise && advise->is_symlocal && advise->is_symglobal)
... ...
@@ -1650,6 +1653,7 @@ lt_dlopenadvise (const char *filename, lt_dladvise advise)
1650 1650
 
1651 1651
 #if defined(LT_MODULE_EXT)
1652 1652
       /* Try appending SHLIB_EXT.   */
1653
+      LT__SETERRORSTR (saved_error);
1653 1654
       errors = try_dlopen (&handle, filename, shlib_ext, advise);
1654 1655
 
1655 1656
       /* As before, if the file was found but loading failed, return now
... ...
@@ -2485,6 +2485,18 @@ linux* | k*bsd*-gnu)
2485 2485
   dynamic_linker='GNU/Linux ld.so'
2486 2486
   ;;
2487 2487
 
2488
+netbsdelf*-gnu)
2489
+  version_type=linux
2490
+  need_lib_prefix=no
2491
+  need_version=no
2492
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
2493
+  soname_spec='${libname}${release}${shared_ext}$major'
2494
+  shlibpath_var=LD_LIBRARY_PATH
2495
+  shlibpath_overrides_runpath=no
2496
+  hardcode_into_libs=yes
2497
+  dynamic_linker='NetBSD ld.elf_so'
2498
+  ;;
2499
+
2488 2500
 netbsd*)
2489 2501
   version_type=sunos
2490 2502
   need_lib_prefix=no
... ...
@@ -3076,7 +3088,7 @@ linux* | k*bsd*-gnu)
3076 3076
   lt_cv_deplibs_check_method=pass_all
3077 3077
   ;;
3078 3078
 
3079
-netbsd*)
3079
+netbsd* | netbsdelf*-gnu)
3080 3080
   if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
3081 3081
     lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
3082 3082
   else
... ...
@@ -3757,7 +3769,7 @@ m4_if([$1], [CXX], [
3757 3757
 	    ;;
3758 3758
 	esac
3759 3759
 	;;
3760
-      netbsd*)
3760
+      netbsd* | netbsdelf*-gnu)
3761 3761
 	;;
3762 3762
       *qnx* | *nto*)
3763 3763
         # QNX uses GNU C++, but need to define -shared option too, otherwise
... ...
@@ -4182,6 +4194,9 @@ m4_if([$1], [CXX], [
4182 4182
   cygwin* | mingw* | cegcc*)
4183 4183
     _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
4184 4184
   ;;
4185
+  linux* | k*bsd*-gnu)
4186
+    _LT_TAGVAR(link_all_deplibs, $1)=no
4187
+  ;;
4185 4188
   *)
4186 4189
     _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
4187 4190
   ;;
... ...
@@ -4246,6 +4261,9 @@ dnl Note also adjust exclude_expsyms for C++ above.
4246 4246
   openbsd*)
4247 4247
     with_gnu_ld=no
4248 4248
     ;;
4249
+  linux* | k*bsd*-gnu)
4250
+    _LT_TAGVAR(link_all_deplibs, $1)=no
4251
+    ;;
4249 4252
   esac
4250 4253
 
4251 4254
   _LT_TAGVAR(ld_shlibs, $1)=yes
... ...
@@ -4428,7 +4446,7 @@ _LT_EOF
4428 4428
       fi
4429 4429
       ;;
4430 4430
 
4431
-    netbsd*)
4431
+    netbsd* | netbsdelf*-gnu)
4432 4432
       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
4433 4433
 	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
4434 4434
 	wlarc=
... ...
@@ -4603,6 +4621,7 @@ _LT_EOF
4603 4603
 	if test "$aix_use_runtimelinking" = yes; then
4604 4604
 	  shared_flag="$shared_flag "'${wl}-G'
4605 4605
 	fi
4606
+	_LT_TAGVAR(link_all_deplibs, $1)=no
4606 4607
       else
4607 4608
 	# not using gcc
4608 4609
 	if test "$host_cpu" = ia64; then
... ...
@@ -4841,7 +4860,7 @@ _LT_EOF
4841 4841
       _LT_TAGVAR(link_all_deplibs, $1)=yes
4842 4842
       ;;
4843 4843
 
4844
-    netbsd*)
4844
+    netbsd* | netbsdelf*-gnu)
4845 4845
       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
4846 4846
 	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
4847 4847
       else
... ...
@@ -487,7 +487,7 @@ AC_CACHE_CHECK([whether deplibs are loaded by dlopen],
487 487
     # at 6.2 and later dlopen does load deplibs.
488 488
     lt_cv_sys_dlopen_deplibs=yes
489 489
     ;;
490
-  netbsd*)
490
+  netbsd* | netbsdelf*-gnu)
491 491
     lt_cv_sys_dlopen_deplibs=yes
492 492
     ;;
493 493
   openbsd*)