Browse code

if pkg-config cannot find check look in standard places for check (such as /usr/local/lib)

git-svn: trunk@4162

Török Edvin authored on 2008/09/02 17:40:27
Showing 19 changed files
... ...
@@ -167,6 +167,8 @@ LCOV = @LCOV@
167 167
 LDFLAGS = @LDFLAGS@
168 168
 LIBBZ2 = @LIBBZ2@
169 169
 LIBBZ2_PREFIX = @LIBBZ2_PREFIX@
170
+LIBCHECK = @LIBCHECK@
171
+LIBCHECK_PREFIX = @LIBCHECK_PREFIX@
170 172
 LIBCLAMAV_LIBS = @LIBCLAMAV_LIBS@
171 173
 LIBCLAMAV_VERSION = @LIBCLAMAV_VERSION@
172 174
 LIBGMP = @LIBGMP@
... ...
@@ -176,6 +178,7 @@ LIBS = @LIBS@
176 176
 LIBTOOL = @LIBTOOL@
177 177
 LN_S = @LN_S@
178 178
 LTLIBBZ2 = @LTLIBBZ2@
179
+LTLIBCHECK = @LTLIBCHECK@
179 180
 LTLIBGMP = @LTLIBGMP@
180 181
 LTLIBOBJS = @LTLIBOBJS@
181 182
 MAINT = @MAINT@
... ...
@@ -150,6 +150,8 @@ LCOV = @LCOV@
150 150
 LDFLAGS = @LDFLAGS@
151 151
 LIBBZ2 = @LIBBZ2@
152 152
 LIBBZ2_PREFIX = @LIBBZ2_PREFIX@
153
+LIBCHECK = @LIBCHECK@
154
+LIBCHECK_PREFIX = @LIBCHECK_PREFIX@
153 155
 LIBCLAMAV_LIBS = @LIBCLAMAV_LIBS@
154 156
 LIBCLAMAV_VERSION = @LIBCLAMAV_VERSION@
155 157
 LIBGMP = @LIBGMP@
... ...
@@ -159,6 +161,7 @@ LIBS = $(top_builddir)/libclamav/libclamav.la @CLAMAV_MILTER_LIBS@ @THREAD_LIBS@
159 159
 LIBTOOL = @LIBTOOL@
160 160
 LN_S = @LN_S@
161 161
 LTLIBBZ2 = @LTLIBBZ2@
162
+LTLIBCHECK = @LTLIBCHECK@
162 163
 LTLIBGMP = @LTLIBGMP@
163 164
 LTLIBOBJS = @LTLIBOBJS@
164 165
 MAINT = @MAINT@
... ...
@@ -135,6 +135,8 @@ LCOV = @LCOV@
135 135
 LDFLAGS = @LDFLAGS@
136 136
 LIBBZ2 = @LIBBZ2@
137 137
 LIBBZ2_PREFIX = @LIBBZ2_PREFIX@
138
+LIBCHECK = @LIBCHECK@
139
+LIBCHECK_PREFIX = @LIBCHECK_PREFIX@
138 140
 LIBCLAMAV_LIBS = @LIBCLAMAV_LIBS@
139 141
 LIBCLAMAV_VERSION = @LIBCLAMAV_VERSION@
140 142
 LIBGMP = @LIBGMP@
... ...
@@ -144,6 +146,7 @@ LIBS = $(top_builddir)/libclamav/libclamav.la @THREAD_LIBS@
144 144
 LIBTOOL = @LIBTOOL@
145 145
 LN_S = @LN_S@
146 146
 LTLIBBZ2 = @LTLIBBZ2@
147
+LTLIBCHECK = @LTLIBCHECK@
147 148
 LTLIBGMP = @LTLIBGMP@
148 149
 LTLIBOBJS = @LTLIBOBJS@
149 150
 MAINT = @MAINT@
... ...
@@ -155,6 +155,8 @@ LCOV = @LCOV@
155 155
 LDFLAGS = @LDFLAGS@
156 156
 LIBBZ2 = @LIBBZ2@
157 157
 LIBBZ2_PREFIX = @LIBBZ2_PREFIX@
158
+LIBCHECK = @LIBCHECK@
159
+LIBCHECK_PREFIX = @LIBCHECK_PREFIX@
158 160
 LIBCLAMAV_LIBS = @LIBCLAMAV_LIBS@
159 161
 LIBCLAMAV_VERSION = @LIBCLAMAV_VERSION@
160 162
 LIBGMP = @LIBGMP@
... ...
@@ -164,6 +166,7 @@ LIBS = $(top_builddir)/libclamav/libclamav.la @CLAMD_LIBS@ @THREAD_LIBS@
164 164
 LIBTOOL = @LIBTOOL@
165 165
 LN_S = @LN_S@
166 166
 LTLIBBZ2 = @LTLIBBZ2@
167
+LTLIBCHECK = @LTLIBCHECK@
167 168
 LTLIBGMP = @LTLIBGMP@
168 169
 LTLIBOBJS = @LTLIBOBJS@
169 170
 MAINT = @MAINT@
... ...
@@ -146,6 +146,8 @@ LCOV = @LCOV@
146 146
 LDFLAGS = @LDFLAGS@
147 147
 LIBBZ2 = @LIBBZ2@
148 148
 LIBBZ2_PREFIX = @LIBBZ2_PREFIX@
149
+LIBCHECK = @LIBCHECK@
150
+LIBCHECK_PREFIX = @LIBCHECK_PREFIX@
149 151
 LIBCLAMAV_LIBS = @LIBCLAMAV_LIBS@
150 152
 LIBCLAMAV_VERSION = @LIBCLAMAV_VERSION@
151 153
 LIBGMP = @LIBGMP@
... ...
@@ -155,6 +157,7 @@ LIBS = $(top_builddir)/libclamav/libclamav_internal_utils.la @FRESHCLAM_LIBS@
155 155
 LIBTOOL = @LIBTOOL@
156 156
 LN_S = @LN_S@
157 157
 LTLIBBZ2 = @LTLIBBZ2@
158
+LTLIBCHECK = @LTLIBCHECK@
158 159
 LTLIBGMP = @LTLIBGMP@
159 160
 LTLIBOBJS = @LTLIBOBJS@
160 161
 MAINT = @MAINT@
... ...
@@ -137,6 +137,8 @@ LCOV = @LCOV@
137 137
 LDFLAGS = @LDFLAGS@
138 138
 LIBBZ2 = @LIBBZ2@
139 139
 LIBBZ2_PREFIX = @LIBBZ2_PREFIX@
140
+LIBCHECK = @LIBCHECK@
141
+LIBCHECK_PREFIX = @LIBCHECK_PREFIX@
140 142
 LIBCLAMAV_LIBS = @LIBCLAMAV_LIBS@
141 143
 LIBCLAMAV_VERSION = @LIBCLAMAV_VERSION@
142 144
 LIBGMP = @LIBGMP@
... ...
@@ -146,6 +148,7 @@ LIBS = $(top_builddir)/libclamav/libclamav.la @THREAD_LIBS@
146 146
 LIBTOOL = @LIBTOOL@
147 147
 LN_S = @LN_S@
148 148
 LTLIBBZ2 = @LTLIBBZ2@
149
+LTLIBCHECK = @LTLIBCHECK@
149 150
 LTLIBGMP = @LTLIBGMP@
150 151
 LTLIBOBJS = @LTLIBOBJS@
151 152
 MAINT = @MAINT@
... ...
@@ -871,6 +871,9 @@ GPERF
871 871
 PKG_CONFIG
872 872
 CHECK_CFLAGS
873 873
 CHECK_LIBS
874
+LIBCHECK
875
+LTLIBCHECK
876
+LIBCHECK_PREFIX
874 877
 GCOV
875 878
 LCOV
876 879
 GENHTML
... ...
@@ -1511,13 +1514,13 @@ Optional Features:
1511 1511
   --disable-gcc-vcheck	  do not check for buggy gcc version
1512 1512
   --enable-experimental	enable experimental code
1513 1513
   --enable-check           Enable 'check' unit tests (default=auto)
1514
+  --disable-rpath         do not hardcode runtime library paths
1514 1515
   --enable-tests-install  install unit tests [default=no]
1515 1516
   --enable-coverage       turn on test coverage [default=no]
1516 1517
   --enable-maintainer-mode enable make rules and dependencies not useful
1517 1518
                           (and sometimes confusing) to the casual installer
1518 1519
   --disable-zlib-vcheck	  do not check for buggy zlib version
1519 1520
   --disable-bzip2	  disable bzip2 support
1520
-  --disable-rpath         do not hardcode runtime library paths
1521 1521
   --disable-unrar	  don't build libclamunrar and libclamunrar_iface
1522 1522
   --disable-ipv6          disable IPv6 support
1523 1523
   --disable-dns           disable support for database verification through
... ...
@@ -1545,9 +1548,11 @@ Optional Packages:
1545 1545
   --with-pic              try to use only PIC/non-PIC objects [default=use
1546 1546
                           both]
1547 1547
   --with-fpu-words-bigendian=(yes/no/auto)    specify FPU endianess (default=auto)
1548
+  --with-gnu-ld           assume the C compiler uses GNU ld default=no
1549
+  --with-libcheck-prefix[=DIR]  search for libcheck in DIR/include and DIR/lib
1550
+  --without-libcheck-prefix     don't search for libcheck in includedir and libdir
1548 1551
   --with-zlib=DIR	  path to directory containing zlib library (default=
1549 1552
 			  /usr/local or /usr if not found in /usr/local)
1550
-  --with-gnu-ld           assume the C compiler uses GNU ld default=no
1551 1553
   --with-libbz2-prefix[=DIR]  search for libbz2 in DIR/include and DIR/lib
1552 1554
   --without-libbz2-prefix     don't search for libbz2 in includedir and libdir
1553 1555
   --with-libgmp-prefix[=DIR]  search for libgmp in DIR/include and DIR/lib
... ...
@@ -4787,7 +4792,7 @@ ia64-*-hpux*)
4787 4787
   ;;
4788 4788
 *-*-irix6*)
4789 4789
   # Find out which ABI we are using.
4790
-  echo '#line 4790 "configure"' > conftest.$ac_ext
4790
+  echo '#line 4795 "configure"' > conftest.$ac_ext
4791 4791
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
4792 4792
   (eval $ac_compile) 2>&5
4793 4793
   ac_status=$?
... ...
@@ -6877,11 +6882,11 @@ else
6877 6877
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
6878 6878
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
6879 6879
    -e 's:$: $lt_compiler_flag:'`
6880
-   (eval echo "\"\$as_me:6880: $lt_compile\"" >&5)
6880
+   (eval echo "\"\$as_me:6885: $lt_compile\"" >&5)
6881 6881
    (eval "$lt_compile" 2>conftest.err)
6882 6882
    ac_status=$?
6883 6883
    cat conftest.err >&5
6884
-   echo "$as_me:6884: \$? = $ac_status" >&5
6884
+   echo "$as_me:6889: \$? = $ac_status" >&5
6885 6885
    if (exit $ac_status) && test -s "$ac_outfile"; then
6886 6886
      # The compiler can only warn and ignore the option if not recognized
6887 6887
      # So say no if there are warnings other than the usual output.
... ...
@@ -7167,11 +7172,11 @@ else
7167 7167
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
7168 7168
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
7169 7169
    -e 's:$: $lt_compiler_flag:'`
7170
-   (eval echo "\"\$as_me:7170: $lt_compile\"" >&5)
7170
+   (eval echo "\"\$as_me:7175: $lt_compile\"" >&5)
7171 7171
    (eval "$lt_compile" 2>conftest.err)
7172 7172
    ac_status=$?
7173 7173
    cat conftest.err >&5
7174
-   echo "$as_me:7174: \$? = $ac_status" >&5
7174
+   echo "$as_me:7179: \$? = $ac_status" >&5
7175 7175
    if (exit $ac_status) && test -s "$ac_outfile"; then
7176 7176
      # The compiler can only warn and ignore the option if not recognized
7177 7177
      # So say no if there are warnings other than the usual output.
... ...
@@ -7271,11 +7276,11 @@ else
7271 7271
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
7272 7272
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
7273 7273
    -e 's:$: $lt_compiler_flag:'`
7274
-   (eval echo "\"\$as_me:7274: $lt_compile\"" >&5)
7274
+   (eval echo "\"\$as_me:7279: $lt_compile\"" >&5)
7275 7275
    (eval "$lt_compile" 2>out/conftest.err)
7276 7276
    ac_status=$?
7277 7277
    cat out/conftest.err >&5
7278
-   echo "$as_me:7278: \$? = $ac_status" >&5
7278
+   echo "$as_me:7283: \$? = $ac_status" >&5
7279 7279
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
7280 7280
    then
7281 7281
      # The compiler can only warn and ignore the option if not recognized
... ...
@@ -9648,7 +9653,7 @@ else
9648 9648
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
9649 9649
   lt_status=$lt_dlunknown
9650 9650
   cat > conftest.$ac_ext <<EOF
9651
-#line 9651 "configure"
9651
+#line 9656 "configure"
9652 9652
 #include "confdefs.h"
9653 9653
 
9654 9654
 #if HAVE_DLFCN_H
... ...
@@ -9748,7 +9753,7 @@ else
9748 9748
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
9749 9749
   lt_status=$lt_dlunknown
9750 9750
   cat > conftest.$ac_ext <<EOF
9751
-#line 9751 "configure"
9751
+#line 9756 "configure"
9752 9752
 #include "confdefs.h"
9753 9753
 
9754 9754
 #if HAVE_DLFCN_H
... ...
@@ -12983,9 +12988,683 @@ fi
12983 12983
 	save_LIBS="$LIBS"
12984 12984
 	if test -z "$CHECK_LIBS"; then
12985 12985
 		# when pkg-config is not available, use defaults
12986
-		CHECK_LIBS="-lcheck"
12986
+
12987
+      if test "X$prefix" = "XNONE"; then
12988
+    acl_final_prefix="$ac_default_prefix"
12989
+  else
12990
+    acl_final_prefix="$prefix"
12991
+  fi
12992
+  if test "X$exec_prefix" = "XNONE"; then
12993
+    acl_final_exec_prefix='${prefix}'
12994
+  else
12995
+    acl_final_exec_prefix="$exec_prefix"
12996
+  fi
12997
+  acl_save_prefix="$prefix"
12998
+  prefix="$acl_final_prefix"
12999
+  eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
13000
+  prefix="$acl_save_prefix"
13001
+
13002
+
13003
+# Check whether --with-gnu-ld was given.
13004
+if test "${with_gnu_ld+set}" = set; then
13005
+  withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
13006
+else
13007
+  with_gnu_ld=no
13008
+fi
13009
+
13010
+# Prepare PATH_SEPARATOR.
13011
+# The user is always right.
13012
+if test "${PATH_SEPARATOR+set}" != set; then
13013
+  echo "#! /bin/sh" >conf$$.sh
13014
+  echo  "exit 0"   >>conf$$.sh
13015
+  chmod +x conf$$.sh
13016
+  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
13017
+    PATH_SEPARATOR=';'
13018
+  else
13019
+    PATH_SEPARATOR=:
13020
+  fi
13021
+  rm -f conf$$.sh
13022
+fi
13023
+ac_prog=ld
13024
+if test "$GCC" = yes; then
13025
+  # Check if gcc -print-prog-name=ld gives a path.
13026
+  { echo "$as_me:$LINENO: checking for ld used by GCC" >&5
13027
+echo $ECHO_N "checking for ld used by GCC... $ECHO_C" >&6; }
13028
+  case $host in
13029
+  *-*-mingw*)
13030
+    # gcc leaves a trailing carriage return which upsets mingw
13031
+    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
13032
+  *)
13033
+    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
13034
+  esac
13035
+  case $ac_prog in
13036
+    # Accept absolute paths.
13037
+    [\\/]* | [A-Za-z]:[\\/]*)
13038
+      re_direlt='/[^/][^/]*/\.\./'
13039
+      # Canonicalize the path of ld
13040
+      ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
13041
+      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
13042
+	ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
13043
+      done
13044
+      test -z "$LD" && LD="$ac_prog"
13045
+      ;;
13046
+  "")
13047
+    # If it fails, then pretend we aren't using GCC.
13048
+    ac_prog=ld
13049
+    ;;
13050
+  *)
13051
+    # If it is relative, then search for the first ld in PATH.
13052
+    with_gnu_ld=unknown
13053
+    ;;
13054
+  esac
13055
+elif test "$with_gnu_ld" = yes; then
13056
+  { echo "$as_me:$LINENO: checking for GNU ld" >&5
13057
+echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; }
13058
+else
13059
+  { echo "$as_me:$LINENO: checking for non-GNU ld" >&5
13060
+echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; }
13061
+fi
13062
+if test "${acl_cv_path_LD+set}" = set; then
13063
+  echo $ECHO_N "(cached) $ECHO_C" >&6
13064
+else
13065
+  if test -z "$LD"; then
13066
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
13067
+  for ac_dir in $PATH; do
13068
+    test -z "$ac_dir" && ac_dir=.
13069
+    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
13070
+      acl_cv_path_LD="$ac_dir/$ac_prog"
13071
+      # Check to see if the program is GNU ld.  I'd rather use --version,
13072
+      # but apparently some GNU ld's only accept -v.
13073
+      # Break only if it was the GNU/non-GNU ld that we prefer.
13074
+      case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in
13075
+      *GNU* | *'with BFD'*)
13076
+	test "$with_gnu_ld" != no && break ;;
13077
+      *)
13078
+	test "$with_gnu_ld" != yes && break ;;
13079
+      esac
13080
+    fi
13081
+  done
13082
+  IFS="$ac_save_ifs"
13083
+else
13084
+  acl_cv_path_LD="$LD" # Let the user override the test with a path.
13085
+fi
13086
+fi
13087
+
13088
+LD="$acl_cv_path_LD"
13089
+if test -n "$LD"; then
13090
+  { echo "$as_me:$LINENO: result: $LD" >&5
13091
+echo "${ECHO_T}$LD" >&6; }
13092
+else
13093
+  { echo "$as_me:$LINENO: result: no" >&5
13094
+echo "${ECHO_T}no" >&6; }
13095
+fi
13096
+test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
13097
+echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
13098
+   { (exit 1); exit 1; }; }
13099
+{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
13100
+echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; }
13101
+if test "${acl_cv_prog_gnu_ld+set}" = set; then
13102
+  echo $ECHO_N "(cached) $ECHO_C" >&6
13103
+else
13104
+  # I'd rather use --version here, but apparently some GNU ld's only accept -v.
13105
+case `$LD -v 2>&1 </dev/null` in
13106
+*GNU* | *'with BFD'*)
13107
+  acl_cv_prog_gnu_ld=yes ;;
13108
+*)
13109
+  acl_cv_prog_gnu_ld=no ;;
13110
+esac
13111
+fi
13112
+{ echo "$as_me:$LINENO: result: $acl_cv_prog_gnu_ld" >&5
13113
+echo "${ECHO_T}$acl_cv_prog_gnu_ld" >&6; }
13114
+with_gnu_ld=$acl_cv_prog_gnu_ld
13115
+
13116
+
13117
+
13118
+
13119
+                                                { echo "$as_me:$LINENO: checking for shared library run path origin" >&5
13120
+echo $ECHO_N "checking for shared library run path origin... $ECHO_C" >&6; }
13121
+if test "${acl_cv_rpath+set}" = set; then
13122
+  echo $ECHO_N "(cached) $ECHO_C" >&6
13123
+else
13124
+
13125
+    CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
13126
+    ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
13127
+    . ./conftest.sh
13128
+    rm -f ./conftest.sh
13129
+    acl_cv_rpath=done
13130
+
13131
+fi
13132
+{ echo "$as_me:$LINENO: result: $acl_cv_rpath" >&5
13133
+echo "${ECHO_T}$acl_cv_rpath" >&6; }
13134
+  wl="$acl_cv_wl"
13135
+  acl_libext="$acl_cv_libext"
13136
+  acl_shlibext="$acl_cv_shlibext"
13137
+  acl_libname_spec="$acl_cv_libname_spec"
13138
+  acl_library_names_spec="$acl_cv_library_names_spec"
13139
+  acl_hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
13140
+  acl_hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
13141
+  acl_hardcode_direct="$acl_cv_hardcode_direct"
13142
+  acl_hardcode_minus_L="$acl_cv_hardcode_minus_L"
13143
+    # Check whether --enable-rpath was given.
13144
+if test "${enable_rpath+set}" = set; then
13145
+  enableval=$enable_rpath; :
13146
+else
13147
+  enable_rpath=yes
13148
+fi
13149
+
13150
+
13151
+
13152
+                  acl_libdirstem=lib
13153
+  searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'`
13154
+  if test -n "$searchpath"; then
13155
+    acl_save_IFS="${IFS= 	}"; IFS=":"
13156
+    for searchdir in $searchpath; do
13157
+      if test -d "$searchdir"; then
13158
+        case "$searchdir" in
13159
+          */lib64/ | */lib64 ) acl_libdirstem=lib64 ;;
13160
+          *) searchdir=`cd "$searchdir" && pwd`
13161
+             case "$searchdir" in
13162
+               */lib64 ) acl_libdirstem=lib64 ;;
13163
+             esac ;;
13164
+        esac
13165
+      fi
13166
+    done
13167
+    IFS="$acl_save_IFS"
13168
+  fi
13169
+
13170
+
13171
+
13172
+
13173
+
13174
+
13175
+  { echo "$as_me:$LINENO: checking how to link with libcheck" >&5
13176
+echo $ECHO_N "checking how to link with libcheck... $ECHO_C" >&6; }
13177
+if test "${ac_cv_libcheck_libs+set}" = set; then
13178
+  echo $ECHO_N "(cached) $ECHO_C" >&6
13179
+else
13180
+
13181
+
13182
+
13183
+
13184
+
13185
+    use_additional=yes
13186
+
13187
+  acl_save_prefix="$prefix"
13188
+  prefix="$acl_final_prefix"
13189
+  acl_save_exec_prefix="$exec_prefix"
13190
+  exec_prefix="$acl_final_exec_prefix"
13191
+
13192
+    eval additional_includedir=\"$includedir\"
13193
+    eval additional_libdir=\"$libdir\"
13194
+
13195
+  exec_prefix="$acl_save_exec_prefix"
13196
+  prefix="$acl_save_prefix"
13197
+
13198
+
13199
+# Check whether --with-libcheck-prefix was given.
13200
+if test "${with_libcheck_prefix+set}" = set; then
13201
+  withval=$with_libcheck_prefix;
13202
+    if test "X$withval" = "Xno"; then
13203
+      use_additional=no
13204
+    else
13205
+      if test "X$withval" = "X"; then
13206
+
13207
+  acl_save_prefix="$prefix"
13208
+  prefix="$acl_final_prefix"
13209
+  acl_save_exec_prefix="$exec_prefix"
13210
+  exec_prefix="$acl_final_exec_prefix"
13211
+
13212
+          eval additional_includedir=\"$includedir\"
13213
+          eval additional_libdir=\"$libdir\"
13214
+
13215
+  exec_prefix="$acl_save_exec_prefix"
13216
+  prefix="$acl_save_prefix"
13217
+
13218
+      else
13219
+        additional_includedir="$withval/include"
13220
+        additional_libdir="$withval/$acl_libdirstem"
13221
+      fi
13222
+    fi
13223
+
13224
+fi
13225
+
13226
+      LIBCHECK=
13227
+  LTLIBCHECK=
13228
+  INCCHECK=
13229
+  LIBCHECK_PREFIX=
13230
+  rpathdirs=
13231
+  ltrpathdirs=
13232
+  names_already_handled=
13233
+  names_next_round='check '
13234
+  while test -n "$names_next_round"; do
13235
+    names_this_round="$names_next_round"
13236
+    names_next_round=
13237
+    for name in $names_this_round; do
13238
+      already_handled=
13239
+      for n in $names_already_handled; do
13240
+        if test "$n" = "$name"; then
13241
+          already_handled=yes
13242
+          break
13243
+        fi
13244
+      done
13245
+      if test -z "$already_handled"; then
13246
+        names_already_handled="$names_already_handled $name"
13247
+                        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
13248
+        eval value=\"\$HAVE_LIB$uppername\"
13249
+        if test -n "$value"; then
13250
+          if test "$value" = yes; then
13251
+            eval value=\"\$LIB$uppername\"
13252
+            test -z "$value" || LIBCHECK="${LIBCHECK}${LIBCHECK:+ }$value"
13253
+            eval value=\"\$LTLIB$uppername\"
13254
+            test -z "$value" || LTLIBCHECK="${LTLIBCHECK}${LTLIBCHECK:+ }$value"
13255
+          else
13256
+                                    :
13257
+          fi
13258
+        else
13259
+                              found_dir=
13260
+          found_la=
13261
+          found_so=
13262
+          found_a=
13263
+          eval libname=\"$acl_libname_spec\"    # typically: libname=lib$name
13264
+          if test -n "$acl_shlibext"; then
13265
+            shrext=".$acl_shlibext"             # typically: shrext=.so
13266
+          else
13267
+            shrext=
13268
+          fi
13269
+          if test $use_additional = yes; then
13270
+            dir="$additional_libdir"
13271
+                                    if test -n "$acl_shlibext"; then
13272
+              if test -f "$dir/$libname$shrext"; then
13273
+                found_dir="$dir"
13274
+                found_so="$dir/$libname$shrext"
13275
+              else
13276
+                if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
13277
+                  ver=`(cd "$dir" && \
13278
+                        for f in "$libname$shrext".*; do echo "$f"; done \
13279
+                        | sed -e "s,^$libname$shrext\\\\.,," \
13280
+                        | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
13281
+                        | sed 1q ) 2>/dev/null`
13282
+                  if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
13283
+                    found_dir="$dir"
13284
+                    found_so="$dir/$libname$shrext.$ver"
13285
+                  fi
13286
+                else
13287
+                  eval library_names=\"$acl_library_names_spec\"
13288
+                  for f in $library_names; do
13289
+                    if test -f "$dir/$f"; then
13290
+                      found_dir="$dir"
13291
+                      found_so="$dir/$f"
13292
+                      break
13293
+                    fi
13294
+                  done
13295
+                fi
13296
+              fi
13297
+            fi
13298
+                        if test "X$found_dir" = "X"; then
13299
+              if test -f "$dir/$libname.$acl_libext"; then
13300
+                found_dir="$dir"
13301
+                found_a="$dir/$libname.$acl_libext"
13302
+              fi
13303
+            fi
13304
+            if test "X$found_dir" != "X"; then
13305
+              if test -f "$dir/$libname.la"; then
13306
+                found_la="$dir/$libname.la"
13307
+              fi
13308
+            fi
13309
+          fi
13310
+          if test "X$found_dir" = "X"; then
13311
+            for x in $LDFLAGS $LTLIBCHECK; do
13312
+
13313
+  acl_save_prefix="$prefix"
13314
+  prefix="$acl_final_prefix"
13315
+  acl_save_exec_prefix="$exec_prefix"
13316
+  exec_prefix="$acl_final_exec_prefix"
13317
+  eval x=\"$x\"
13318
+  exec_prefix="$acl_save_exec_prefix"
13319
+  prefix="$acl_save_prefix"
13320
+
13321
+              case "$x" in
13322
+                -L*)
13323
+                  dir=`echo "X$x" | sed -e 's/^X-L//'`
13324
+                                    if test -n "$acl_shlibext"; then
13325
+                    if test -f "$dir/$libname$shrext"; then
13326
+                      found_dir="$dir"
13327
+                      found_so="$dir/$libname$shrext"
13328
+                    else
13329
+                      if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
13330
+                        ver=`(cd "$dir" && \
13331
+                              for f in "$libname$shrext".*; do echo "$f"; done \
13332
+                              | sed -e "s,^$libname$shrext\\\\.,," \
13333
+                              | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
13334
+                              | sed 1q ) 2>/dev/null`
13335
+                        if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
13336
+                          found_dir="$dir"
13337
+                          found_so="$dir/$libname$shrext.$ver"
13338
+                        fi
13339
+                      else
13340
+                        eval library_names=\"$acl_library_names_spec\"
13341
+                        for f in $library_names; do
13342
+                          if test -f "$dir/$f"; then
13343
+                            found_dir="$dir"
13344
+                            found_so="$dir/$f"
13345
+                            break
13346
+                          fi
13347
+                        done
13348
+                      fi
13349
+                    fi
13350
+                  fi
13351
+                                    if test "X$found_dir" = "X"; then
13352
+                    if test -f "$dir/$libname.$acl_libext"; then
13353
+                      found_dir="$dir"
13354
+                      found_a="$dir/$libname.$acl_libext"
13355
+                    fi
13356
+                  fi
13357
+                  if test "X$found_dir" != "X"; then
13358
+                    if test -f "$dir/$libname.la"; then
13359
+                      found_la="$dir/$libname.la"
13360
+                    fi
13361
+                  fi
13362
+                  ;;
13363
+              esac
13364
+              if test "X$found_dir" != "X"; then
13365
+                break
13366
+              fi
13367
+            done
13368
+          fi
13369
+          if test "X$found_dir" != "X"; then
13370
+                        LTLIBCHECK="${LTLIBCHECK}${LTLIBCHECK:+ }-L$found_dir -l$name"
13371
+            if test "X$found_so" != "X"; then
13372
+                                                        if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/$acl_libdirstem"; then
13373
+                                LIBCHECK="${LIBCHECK}${LIBCHECK:+ }$found_so"
13374
+              else
13375
+                                                                                haveit=
13376
+                for x in $ltrpathdirs; do
13377
+                  if test "X$x" = "X$found_dir"; then
13378
+                    haveit=yes
13379
+                    break
13380
+                  fi
13381
+                done
13382
+                if test -z "$haveit"; then
13383
+                  ltrpathdirs="$ltrpathdirs $found_dir"
13384
+                fi
13385
+                                if test "$acl_hardcode_direct" = yes; then
13386
+                                                      LIBCHECK="${LIBCHECK}${LIBCHECK:+ }$found_so"
13387
+                else
13388
+                  if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
13389
+                                                            LIBCHECK="${LIBCHECK}${LIBCHECK:+ }$found_so"
13390
+                                                            haveit=
13391
+                    for x in $rpathdirs; do
13392
+                      if test "X$x" = "X$found_dir"; then
13393
+                        haveit=yes
13394
+                        break
13395
+                      fi
13396
+                    done
13397
+                    if test -z "$haveit"; then
13398
+                      rpathdirs="$rpathdirs $found_dir"
13399
+                    fi
13400
+                  else
13401
+                                                                                haveit=
13402
+                    for x in $LDFLAGS $LIBCHECK; do
13403
+
13404
+  acl_save_prefix="$prefix"
13405
+  prefix="$acl_final_prefix"
13406
+  acl_save_exec_prefix="$exec_prefix"
13407
+  exec_prefix="$acl_final_exec_prefix"
13408
+  eval x=\"$x\"
13409
+  exec_prefix="$acl_save_exec_prefix"
13410
+  prefix="$acl_save_prefix"
13411
+
13412
+                      if test "X$x" = "X-L$found_dir"; then
13413
+                        haveit=yes
13414
+                        break
13415
+                      fi
13416
+                    done
13417
+                    if test -z "$haveit"; then
13418
+                      LIBCHECK="${LIBCHECK}${LIBCHECK:+ }-L$found_dir"
13419
+                    fi
13420
+                    if test "$acl_hardcode_minus_L" != no; then
13421
+                                                                                        LIBCHECK="${LIBCHECK}${LIBCHECK:+ }$found_so"
13422
+                    else
13423
+                                                                                                                                                                                LIBCHECK="${LIBCHECK}${LIBCHECK:+ }-l$name"
13424
+                    fi
13425
+                  fi
13426
+                fi
13427
+              fi
13428
+            else
13429
+              if test "X$found_a" != "X"; then
13430
+                                LIBCHECK="${LIBCHECK}${LIBCHECK:+ }$found_a"
13431
+              else
13432
+                                                LIBCHECK="${LIBCHECK}${LIBCHECK:+ }-L$found_dir -l$name"
13433
+              fi
13434
+            fi
13435
+                        additional_includedir=
13436
+            case "$found_dir" in
13437
+              */$acl_libdirstem | */$acl_libdirstem/)
13438
+                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'`
13439
+                LIBCHECK_PREFIX="$basedir"
13440
+                additional_includedir="$basedir/include"
13441
+                ;;
13442
+            esac
13443
+            if test "X$additional_includedir" != "X"; then
13444
+                                                                                                                if test "X$additional_includedir" != "X/usr/include"; then
13445
+                haveit=
13446
+                if test "X$additional_includedir" = "X/usr/local/include"; then
13447
+                  if test -n "$GCC"; then
13448
+                    case $host_os in
13449
+                      linux* | gnu* | k*bsd*-gnu) haveit=yes;;
13450
+                    esac
13451
+                  fi
13452
+                fi
13453
+                if test -z "$haveit"; then
13454
+                  for x in $CPPFLAGS $INCCHECK; do
13455
+
13456
+  acl_save_prefix="$prefix"
13457
+  prefix="$acl_final_prefix"
13458
+  acl_save_exec_prefix="$exec_prefix"
13459
+  exec_prefix="$acl_final_exec_prefix"
13460
+  eval x=\"$x\"
13461
+  exec_prefix="$acl_save_exec_prefix"
13462
+  prefix="$acl_save_prefix"
13463
+
13464
+                    if test "X$x" = "X-I$additional_includedir"; then
13465
+                      haveit=yes
13466
+                      break
13467
+                    fi
13468
+                  done
13469
+                  if test -z "$haveit"; then
13470
+                    if test -d "$additional_includedir"; then
13471
+                                            INCCHECK="${INCCHECK}${INCCHECK:+ }-I$additional_includedir"
13472
+                    fi
13473
+                  fi
13474
+                fi
13475
+              fi
13476
+            fi
13477
+                        if test -n "$found_la"; then
13478
+                                                        save_libdir="$libdir"
13479
+              case "$found_la" in
13480
+                */* | *\\*) . "$found_la" ;;
13481
+                *) . "./$found_la" ;;
13482
+              esac
13483
+              libdir="$save_libdir"
13484
+                            for dep in $dependency_libs; do
13485
+                case "$dep" in
13486
+                  -L*)
13487
+                    additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
13488
+                                                                                                                                                                if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then
13489
+                      haveit=
13490
+                      if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then
13491
+                        if test -n "$GCC"; then
13492
+                          case $host_os in
13493
+                            linux* | gnu* | k*bsd*-gnu) haveit=yes;;
13494
+                          esac
13495
+                        fi
13496
+                      fi
13497
+                      if test -z "$haveit"; then
13498
+                        haveit=
13499
+                        for x in $LDFLAGS $LIBCHECK; do
13500
+
13501
+  acl_save_prefix="$prefix"
13502
+  prefix="$acl_final_prefix"
13503
+  acl_save_exec_prefix="$exec_prefix"
13504
+  exec_prefix="$acl_final_exec_prefix"
13505
+  eval x=\"$x\"
13506
+  exec_prefix="$acl_save_exec_prefix"
13507
+  prefix="$acl_save_prefix"
13508
+
13509
+                          if test "X$x" = "X-L$additional_libdir"; then
13510
+                            haveit=yes
13511
+                            break
13512
+                          fi
13513
+                        done
13514
+                        if test -z "$haveit"; then
13515
+                          if test -d "$additional_libdir"; then
13516
+                                                        LIBCHECK="${LIBCHECK}${LIBCHECK:+ }-L$additional_libdir"
13517
+                          fi
13518
+                        fi
13519
+                        haveit=
13520
+                        for x in $LDFLAGS $LTLIBCHECK; do
13521
+
13522
+  acl_save_prefix="$prefix"
13523
+  prefix="$acl_final_prefix"
13524
+  acl_save_exec_prefix="$exec_prefix"
13525
+  exec_prefix="$acl_final_exec_prefix"
13526
+  eval x=\"$x\"
13527
+  exec_prefix="$acl_save_exec_prefix"
13528
+  prefix="$acl_save_prefix"
13529
+
13530
+                          if test "X$x" = "X-L$additional_libdir"; then
13531
+                            haveit=yes
13532
+                            break
13533
+                          fi
13534
+                        done
13535
+                        if test -z "$haveit"; then
13536
+                          if test -d "$additional_libdir"; then
13537
+                                                        LTLIBCHECK="${LTLIBCHECK}${LTLIBCHECK:+ }-L$additional_libdir"
13538
+                          fi
13539
+                        fi
13540
+                      fi
13541
+                    fi
13542
+                    ;;
13543
+                  -R*)
13544
+                    dir=`echo "X$dep" | sed -e 's/^X-R//'`
13545
+                    if test "$enable_rpath" != no; then
13546
+                                                                  haveit=
13547
+                      for x in $rpathdirs; do
13548
+                        if test "X$x" = "X$dir"; then
13549
+                          haveit=yes
13550
+                          break
13551
+                        fi
13552
+                      done
13553
+                      if test -z "$haveit"; then
13554
+                        rpathdirs="$rpathdirs $dir"
13555
+                      fi
13556
+                                                                  haveit=
13557
+                      for x in $ltrpathdirs; do
13558
+                        if test "X$x" = "X$dir"; then
13559
+                          haveit=yes
13560
+                          break
13561
+                        fi
13562
+                      done
13563
+                      if test -z "$haveit"; then
13564
+                        ltrpathdirs="$ltrpathdirs $dir"
13565
+                      fi
13566
+                    fi
13567
+                    ;;
13568
+                  -l*)
13569
+                                        names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
13570
+                    ;;
13571
+                  *.la)
13572
+                                                                                names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
13573
+                    ;;
13574
+                  *)
13575
+                                        LIBCHECK="${LIBCHECK}${LIBCHECK:+ }$dep"
13576
+                    LTLIBCHECK="${LTLIBCHECK}${LTLIBCHECK:+ }$dep"
13577
+                    ;;
13578
+                esac
13579
+              done
13580
+            fi
13581
+          else
13582
+                                                            LIBCHECK="${LIBCHECK}${LIBCHECK:+ }-l$name"
13583
+            LTLIBCHECK="${LTLIBCHECK}${LTLIBCHECK:+ }-l$name"
13584
+          fi
13585
+        fi
13586
+      fi
13587
+    done
13588
+  done
13589
+  if test "X$rpathdirs" != "X"; then
13590
+    if test -n "$acl_hardcode_libdir_separator"; then
13591
+                        alldirs=
13592
+      for found_dir in $rpathdirs; do
13593
+        alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir"
13594
+      done
13595
+            acl_save_libdir="$libdir"
13596
+      libdir="$alldirs"
13597
+      eval flag=\"$acl_hardcode_libdir_flag_spec\"
13598
+      libdir="$acl_save_libdir"
13599
+      LIBCHECK="${LIBCHECK}${LIBCHECK:+ }$flag"
13600
+    else
13601
+            for found_dir in $rpathdirs; do
13602
+        acl_save_libdir="$libdir"
13603
+        libdir="$found_dir"
13604
+        eval flag=\"$acl_hardcode_libdir_flag_spec\"
13605
+        libdir="$acl_save_libdir"
13606
+        LIBCHECK="${LIBCHECK}${LIBCHECK:+ }$flag"
13607
+      done
13608
+    fi
13609
+  fi
13610
+  if test "X$ltrpathdirs" != "X"; then
13611
+            for found_dir in $ltrpathdirs; do
13612
+      LTLIBCHECK="${LTLIBCHECK}${LTLIBCHECK:+ }-R$found_dir"
13613
+    done
13614
+  fi
13615
+
13616
+    ac_cv_libcheck_libs="$LIBCHECK"
13617
+    ac_cv_libcheck_ltlibs="$LTLIBCHECK"
13618
+    ac_cv_libcheck_cppflags="$INCCHECK"
13619
+    ac_cv_libcheck_prefix="$LIBCHECK_PREFIX"
13620
+
13621
+fi
13622
+{ echo "$as_me:$LINENO: result: $ac_cv_libcheck_libs" >&5
13623
+echo "${ECHO_T}$ac_cv_libcheck_libs" >&6; }
13624
+  LIBCHECK="$ac_cv_libcheck_libs"
13625
+  LTLIBCHECK="$ac_cv_libcheck_ltlibs"
13626
+  INCCHECK="$ac_cv_libcheck_cppflags"
13627
+  LIBCHECK_PREFIX="$ac_cv_libcheck_prefix"
13628
+
13629
+  for element in $INCCHECK; do
13630
+    haveit=
13631
+    for x in $CPPFLAGS; do
13632
+
13633
+  acl_save_prefix="$prefix"
13634
+  prefix="$acl_final_prefix"
13635
+  acl_save_exec_prefix="$exec_prefix"
13636
+  exec_prefix="$acl_final_exec_prefix"
13637
+  eval x=\"$x\"
13638
+  exec_prefix="$acl_save_exec_prefix"
13639
+  prefix="$acl_save_prefix"
13640
+
13641
+      if test "X$x" = "X$element"; then
13642
+        haveit=yes
13643
+        break
13644
+      fi
13645
+    done
13646
+    if test -z "$haveit"; then
13647
+      CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }$element"
13648
+    fi
13649
+  done
13650
+
13651
+
13652
+
13653
+
13654
+      HAVE_LIBCHECK=yes
13655
+
13656
+
13657
+
13658
+		LIBS="$LIBS -L$LIBCHECK_PREFIX/lib -lcheck"
13659
+		CHECK_LIBS="$LTLIBCHECK"
13660
+	else
13661
+		LIBS="$LIBS $CHECK_LIBS"
12987 13662
 	fi
12988
-	LIBS="$LIBS $CHECK_LIBS"
12989 13663
 	if test "${ac_cv_header_check_h+set}" = set; then
12990 13664
   { echo "$as_me:$LINENO: checking for check.h" >&5
12991 13665
 echo $ECHO_N "checking for check.h... $ECHO_C" >&6; }
... ...
@@ -13188,6 +13867,8 @@ fi
13188 13188
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
13189 13189
       conftest$ac_exeext conftest.$ac_ext
13190 13190
 
13191
+else
13192
+  CHECK_LIBS=
13191 13193
 fi
13192 13194
 
13193 13195
 
... ...
@@ -13924,190 +14605,6 @@ fi
13924 13924
 if test "$want_bzip2" = "yes"
13925 13925
 then
13926 13926
 
13927
-      if test "X$prefix" = "XNONE"; then
13928
-    acl_final_prefix="$ac_default_prefix"
13929
-  else
13930
-    acl_final_prefix="$prefix"
13931
-  fi
13932
-  if test "X$exec_prefix" = "XNONE"; then
13933
-    acl_final_exec_prefix='${prefix}'
13934
-  else
13935
-    acl_final_exec_prefix="$exec_prefix"
13936
-  fi
13937
-  acl_save_prefix="$prefix"
13938
-  prefix="$acl_final_prefix"
13939
-  eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
13940
-  prefix="$acl_save_prefix"
13941
-
13942
-
13943
-# Check whether --with-gnu-ld was given.
13944
-if test "${with_gnu_ld+set}" = set; then
13945
-  withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
13946
-else
13947
-  with_gnu_ld=no
13948
-fi
13949
-
13950
-# Prepare PATH_SEPARATOR.
13951
-# The user is always right.
13952
-if test "${PATH_SEPARATOR+set}" != set; then
13953
-  echo "#! /bin/sh" >conf$$.sh
13954
-  echo  "exit 0"   >>conf$$.sh
13955
-  chmod +x conf$$.sh
13956
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
13957
-    PATH_SEPARATOR=';'
13958
-  else
13959
-    PATH_SEPARATOR=:
13960
-  fi
13961
-  rm -f conf$$.sh
13962
-fi
13963
-ac_prog=ld
13964
-if test "$GCC" = yes; then
13965
-  # Check if gcc -print-prog-name=ld gives a path.
13966
-  { echo "$as_me:$LINENO: checking for ld used by GCC" >&5
13967
-echo $ECHO_N "checking for ld used by GCC... $ECHO_C" >&6; }
13968
-  case $host in
13969
-  *-*-mingw*)
13970
-    # gcc leaves a trailing carriage return which upsets mingw
13971
-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
13972
-  *)
13973
-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
13974
-  esac
13975
-  case $ac_prog in
13976
-    # Accept absolute paths.
13977
-    [\\/]* | [A-Za-z]:[\\/]*)
13978
-      re_direlt='/[^/][^/]*/\.\./'
13979
-      # Canonicalize the path of ld
13980
-      ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
13981
-      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
13982
-	ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
13983
-      done
13984
-      test -z "$LD" && LD="$ac_prog"
13985
-      ;;
13986
-  "")
13987
-    # If it fails, then pretend we aren't using GCC.
13988
-    ac_prog=ld
13989
-    ;;
13990
-  *)
13991
-    # If it is relative, then search for the first ld in PATH.
13992
-    with_gnu_ld=unknown
13993
-    ;;
13994
-  esac
13995
-elif test "$with_gnu_ld" = yes; then
13996
-  { echo "$as_me:$LINENO: checking for GNU ld" >&5
13997
-echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; }
13998
-else
13999
-  { echo "$as_me:$LINENO: checking for non-GNU ld" >&5
14000
-echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; }
14001
-fi
14002
-if test "${acl_cv_path_LD+set}" = set; then
14003
-  echo $ECHO_N "(cached) $ECHO_C" >&6
14004
-else
14005
-  if test -z "$LD"; then
14006
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
14007
-  for ac_dir in $PATH; do
14008
-    test -z "$ac_dir" && ac_dir=.
14009
-    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
14010
-      acl_cv_path_LD="$ac_dir/$ac_prog"
14011
-      # Check to see if the program is GNU ld.  I'd rather use --version,
14012
-      # but apparently some GNU ld's only accept -v.
14013
-      # Break only if it was the GNU/non-GNU ld that we prefer.
14014
-      case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in
14015
-      *GNU* | *'with BFD'*)
14016
-	test "$with_gnu_ld" != no && break ;;
14017
-      *)
14018
-	test "$with_gnu_ld" != yes && break ;;
14019
-      esac
14020
-    fi
14021
-  done
14022
-  IFS="$ac_save_ifs"
14023
-else
14024
-  acl_cv_path_LD="$LD" # Let the user override the test with a path.
14025
-fi
14026
-fi
14027
-
14028
-LD="$acl_cv_path_LD"
14029
-if test -n "$LD"; then
14030
-  { echo "$as_me:$LINENO: result: $LD" >&5
14031
-echo "${ECHO_T}$LD" >&6; }
14032
-else
14033
-  { echo "$as_me:$LINENO: result: no" >&5
14034
-echo "${ECHO_T}no" >&6; }
14035
-fi
14036
-test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
14037
-echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
14038
-   { (exit 1); exit 1; }; }
14039
-{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
14040
-echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; }
14041
-if test "${acl_cv_prog_gnu_ld+set}" = set; then
14042
-  echo $ECHO_N "(cached) $ECHO_C" >&6
14043
-else
14044
-  # I'd rather use --version here, but apparently some GNU ld's only accept -v.
14045
-case `$LD -v 2>&1 </dev/null` in
14046
-*GNU* | *'with BFD'*)
14047
-  acl_cv_prog_gnu_ld=yes ;;
14048
-*)
14049
-  acl_cv_prog_gnu_ld=no ;;
14050
-esac
14051
-fi
14052
-{ echo "$as_me:$LINENO: result: $acl_cv_prog_gnu_ld" >&5
14053
-echo "${ECHO_T}$acl_cv_prog_gnu_ld" >&6; }
14054
-with_gnu_ld=$acl_cv_prog_gnu_ld
14055
-
14056
-
14057
-
14058
-
14059
-                                                { echo "$as_me:$LINENO: checking for shared library run path origin" >&5
14060
-echo $ECHO_N "checking for shared library run path origin... $ECHO_C" >&6; }
14061
-if test "${acl_cv_rpath+set}" = set; then
14062
-  echo $ECHO_N "(cached) $ECHO_C" >&6
14063
-else
14064
-
14065
-    CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
14066
-    ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
14067
-    . ./conftest.sh
14068
-    rm -f ./conftest.sh
14069
-    acl_cv_rpath=done
14070
-
14071
-fi
14072
-{ echo "$as_me:$LINENO: result: $acl_cv_rpath" >&5
14073
-echo "${ECHO_T}$acl_cv_rpath" >&6; }
14074
-  wl="$acl_cv_wl"
14075
-  acl_libext="$acl_cv_libext"
14076
-  acl_shlibext="$acl_cv_shlibext"
14077
-  acl_libname_spec="$acl_cv_libname_spec"
14078
-  acl_library_names_spec="$acl_cv_library_names_spec"
14079
-  acl_hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
14080
-  acl_hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
14081
-  acl_hardcode_direct="$acl_cv_hardcode_direct"
14082
-  acl_hardcode_minus_L="$acl_cv_hardcode_minus_L"
14083
-    # Check whether --enable-rpath was given.
14084
-if test "${enable_rpath+set}" = set; then
14085
-  enableval=$enable_rpath; :
14086
-else
14087
-  enable_rpath=yes
14088
-fi
14089
-
14090
-
14091
-
14092
-                  acl_libdirstem=lib
14093
-  searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'`
14094
-  if test -n "$searchpath"; then
14095
-    acl_save_IFS="${IFS= 	}"; IFS=":"
14096
-    for searchdir in $searchpath; do
14097
-      if test -d "$searchdir"; then
14098
-        case "$searchdir" in
14099
-          */lib64/ | */lib64 ) acl_libdirstem=lib64 ;;
14100
-          *) searchdir=`cd "$searchdir" && pwd`
14101
-             case "$searchdir" in
14102
-               */lib64 ) acl_libdirstem=lib64 ;;
14103
-             esac ;;
14104
-        esac
14105
-      fi
14106
-    done
14107
-    IFS="$acl_save_IFS"
14108
-  fi
14109
-
14110
-
14111 13927
 
14112 13928
 
14113 13929
 
... ...
@@ -20516,6 +21013,9 @@ GPERF!$GPERF$ac_delim
20516 20516
 PKG_CONFIG!$PKG_CONFIG$ac_delim
20517 20517
 CHECK_CFLAGS!$CHECK_CFLAGS$ac_delim
20518 20518
 CHECK_LIBS!$CHECK_LIBS$ac_delim
20519
+LIBCHECK!$LIBCHECK$ac_delim
20520
+LTLIBCHECK!$LTLIBCHECK$ac_delim
20521
+LIBCHECK_PREFIX!$LIBCHECK_PREFIX$ac_delim
20519 20522
 GCOV!$GCOV$ac_delim
20520 20523
 LCOV!$LCOV$ac_delim
20521 20524
 GENHTML!$GENHTML$ac_delim
... ...
@@ -20555,7 +21055,7 @@ LIBOBJS!$LIBOBJS$ac_delim
20555 20555
 LTLIBOBJS!$LTLIBOBJS$ac_delim
20556 20556
 _ACEOF
20557 20557
 
20558
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 46; then
20558
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 49; then
20559 20559
     break
20560 20560
   elif $ac_last_try; then
20561 20561
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
... ...
@@ -330,10 +330,13 @@ _PKG_TEXT])])
330 330
 	CPPFLAGS="$CPPFLAGS $CHECK_CFLAGS"
331 331
 	save_LIBS="$LIBS"
332 332
 	if test -z "$CHECK_LIBS"; then
333
-		# when pkg-config is not available, use defaults		
334
-		CHECK_LIBS="-lcheck"
333
+		# when pkg-config is not available, use defaults
334
+		AC_LIB_LINKFLAGS([check])
335
+		LIBS="$LIBS -L$LIBCHECK_PREFIX/lib -lcheck"
336
+		CHECK_LIBS="$LTLIBCHECK"
337
+	else
338
+		LIBS="$LIBS $CHECK_LIBS"
335 339
 	fi
336
-	LIBS="$LIBS $CHECK_LIBS"
337 340
 	AC_CHECK_HEADER(check.h,
338 341
 			[
339 342
 				AC_MSG_CHECKING([linking with check])
... ...
@@ -348,7 +351,7 @@ _PKG_TEXT])])
348 348
 					],
349 349
 					[AC_MSG_RESULT([failed]);CHECK_LIBS=]
350 350
 				)
351
-			])
351
+			],[CHECK_LIBS=])
352 352
 	LIBS="$save_LIBS"
353 353
 	CPPFLAGS="$save_CPPFLAGS"
354 354
 fi
... ...
@@ -113,6 +113,8 @@ LCOV = @LCOV@
113 113
 LDFLAGS = @LDFLAGS@
114 114
 LIBBZ2 = @LIBBZ2@
115 115
 LIBBZ2_PREFIX = @LIBBZ2_PREFIX@
116
+LIBCHECK = @LIBCHECK@
117
+LIBCHECK_PREFIX = @LIBCHECK_PREFIX@
116 118
 LIBCLAMAV_LIBS = @LIBCLAMAV_LIBS@
117 119
 LIBCLAMAV_VERSION = @LIBCLAMAV_VERSION@
118 120
 LIBGMP = @LIBGMP@
... ...
@@ -122,6 +124,7 @@ LIBS = @LIBS@
122 122
 LIBTOOL = @LIBTOOL@
123 123
 LN_S = @LN_S@
124 124
 LTLIBBZ2 = @LTLIBBZ2@
125
+LTLIBCHECK = @LTLIBCHECK@
125 126
 LTLIBGMP = @LTLIBGMP@
126 127
 LTLIBOBJS = @LTLIBOBJS@
127 128
 MAINT = @MAINT@
... ...
@@ -119,6 +119,8 @@ LCOV = @LCOV@
119 119
 LDFLAGS = @LDFLAGS@
120 120
 LIBBZ2 = @LIBBZ2@
121 121
 LIBBZ2_PREFIX = @LIBBZ2_PREFIX@
122
+LIBCHECK = @LIBCHECK@
123
+LIBCHECK_PREFIX = @LIBCHECK_PREFIX@
122 124
 LIBCLAMAV_LIBS = @LIBCLAMAV_LIBS@
123 125
 LIBCLAMAV_VERSION = @LIBCLAMAV_VERSION@
124 126
 LIBGMP = @LIBGMP@
... ...
@@ -128,6 +130,7 @@ LIBS = @LIBS@
128 128
 LIBTOOL = @LIBTOOL@
129 129
 LN_S = @LN_S@
130 130
 LTLIBBZ2 = @LTLIBBZ2@
131
+LTLIBCHECK = @LTLIBCHECK@
131 132
 LTLIBGMP = @LTLIBGMP@
132 133
 LTLIBOBJS = @LTLIBOBJS@
133 134
 MAINT = @MAINT@
... ...
@@ -112,6 +112,8 @@ LCOV = @LCOV@
112 112
 LDFLAGS = @LDFLAGS@
113 113
 LIBBZ2 = @LIBBZ2@
114 114
 LIBBZ2_PREFIX = @LIBBZ2_PREFIX@
115
+LIBCHECK = @LIBCHECK@
116
+LIBCHECK_PREFIX = @LIBCHECK_PREFIX@
115 117
 LIBCLAMAV_LIBS = @LIBCLAMAV_LIBS@
116 118
 LIBCLAMAV_VERSION = @LIBCLAMAV_VERSION@
117 119
 LIBGMP = @LIBGMP@
... ...
@@ -121,6 +123,7 @@ LIBS = @LIBS@
121 121
 LIBTOOL = @LIBTOOL@
122 122
 LN_S = @LN_S@
123 123
 LTLIBBZ2 = @LTLIBBZ2@
124
+LTLIBCHECK = @LTLIBCHECK@
124 125
 LTLIBGMP = @LTLIBGMP@
125 126
 LTLIBOBJS = @LTLIBOBJS@
126 127
 MAINT = @MAINT@
... ...
@@ -140,6 +140,8 @@ LCOV = @LCOV@
140 140
 LDFLAGS = @LDFLAGS@
141 141
 LIBBZ2 = @LIBBZ2@
142 142
 LIBBZ2_PREFIX = @LIBBZ2_PREFIX@
143
+LIBCHECK = @LIBCHECK@
144
+LIBCHECK_PREFIX = @LIBCHECK_PREFIX@
143 145
 LIBCLAMAV_LIBS = @LIBCLAMAV_LIBS@
144 146
 LIBCLAMAV_VERSION = @LIBCLAMAV_VERSION@
145 147
 LIBGMP = @LIBGMP@
... ...
@@ -149,6 +151,7 @@ LIBS = $(top_builddir)/libclamav/libclamav.la @FRESHCLAM_LIBS@ @THREAD_LIBS@
149 149
 LIBTOOL = @LIBTOOL@
150 150
 LN_S = @LN_S@
151 151
 LTLIBBZ2 = @LTLIBBZ2@
152
+LTLIBCHECK = @LTLIBCHECK@
152 153
 LTLIBGMP = @LTLIBGMP@
153 154
 LTLIBOBJS = @LTLIBOBJS@
154 155
 MAINT = @MAINT@
... ...
@@ -184,6 +184,8 @@ LCOV = @LCOV@
184 184
 LDFLAGS = @LDFLAGS@
185 185
 LIBBZ2 = @LIBBZ2@
186 186
 LIBBZ2_PREFIX = @LIBBZ2_PREFIX@
187
+LIBCHECK = @LIBCHECK@
188
+LIBCHECK_PREFIX = @LIBCHECK_PREFIX@
187 189
 LIBCLAMAV_LIBS = @LIBCLAMAV_LIBS@
188 190
 LIBCLAMAV_VERSION = @LIBCLAMAV_VERSION@
189 191
 LIBGMP = @LIBGMP@
... ...
@@ -193,6 +195,7 @@ LIBS = @LIBS@
193 193
 LIBTOOL = @LIBTOOL@
194 194
 LN_S = @LN_S@
195 195
 LTLIBBZ2 = @LTLIBBZ2@
196
+LTLIBCHECK = @LTLIBCHECK@
196 197
 LTLIBGMP = @LTLIBGMP@
197 198
 LTLIBOBJS = @LTLIBOBJS@
198 199
 MAINT = @MAINT@
... ...
@@ -132,6 +132,8 @@ LCOV = @LCOV@
132 132
 LDFLAGS = @LDFLAGS@
133 133
 LIBBZ2 = @LIBBZ2@
134 134
 LIBBZ2_PREFIX = @LIBBZ2_PREFIX@
135
+LIBCHECK = @LIBCHECK@
136
+LIBCHECK_PREFIX = @LIBCHECK_PREFIX@
135 137
 LIBCLAMAV_LIBS = @LIBCLAMAV_LIBS@
136 138
 LIBCLAMAV_VERSION = @LIBCLAMAV_VERSION@
137 139
 LIBGMP = @LIBGMP@
... ...
@@ -141,6 +143,7 @@ LIBS = @LIBS@
141 141
 LIBTOOL = @LIBTOOL@
142 142
 LN_S = @LN_S@
143 143
 LTLIBBZ2 = @LTLIBBZ2@
144
+LTLIBCHECK = @LTLIBCHECK@
144 145
 LTLIBGMP = @LTLIBGMP@
145 146
 LTLIBOBJS = @LTLIBOBJS@
146 147
 MAINT = @MAINT@
... ...
@@ -136,6 +136,8 @@ LCOV = @LCOV@
136 136
 LDFLAGS = @LDFLAGS@
137 137
 LIBBZ2 = @LIBBZ2@
138 138
 LIBBZ2_PREFIX = @LIBBZ2_PREFIX@
139
+LIBCHECK = @LIBCHECK@
140
+LIBCHECK_PREFIX = @LIBCHECK_PREFIX@
139 141
 LIBCLAMAV_LIBS = @LIBCLAMAV_LIBS@
140 142
 LIBCLAMAV_VERSION = @LIBCLAMAV_VERSION@
141 143
 LIBGMP = @LIBGMP@
... ...
@@ -145,6 +147,7 @@ LIBS = @LIBS@
145 145
 LIBTOOL = @LIBTOOL@
146 146
 LN_S = @LN_S@
147 147
 LTLIBBZ2 = @LTLIBBZ2@
148
+LTLIBCHECK = @LTLIBCHECK@
148 149
 LTLIBGMP = @LTLIBGMP@
149 150
 LTLIBOBJS = @LTLIBOBJS@
150 151
 MAINT = @MAINT@
... ...
@@ -131,6 +131,8 @@ LCOV = @LCOV@
131 131
 LDFLAGS = @LDFLAGS@
132 132
 LIBBZ2 = @LIBBZ2@
133 133
 LIBBZ2_PREFIX = @LIBBZ2_PREFIX@
134
+LIBCHECK = @LIBCHECK@
135
+LIBCHECK_PREFIX = @LIBCHECK_PREFIX@
134 136
 LIBCLAMAV_LIBS = @LIBCLAMAV_LIBS@
135 137
 LIBCLAMAV_VERSION = @LIBCLAMAV_VERSION@
136 138
 LIBGMP = @LIBGMP@
... ...
@@ -140,6 +142,7 @@ LIBS = @LIBS@
140 140
 LIBTOOL = @LIBTOOL@
141 141
 LN_S = @LN_S@
142 142
 LTLIBBZ2 = @LTLIBBZ2@
143
+LTLIBCHECK = @LTLIBCHECK@
143 144
 LTLIBGMP = @LTLIBGMP@
144 145
 LTLIBOBJS = @LTLIBOBJS@
145 146
 MAINT = @MAINT@
... ...
@@ -139,6 +139,8 @@ LCOV = @LCOV@
139 139
 LDFLAGS = @LDFLAGS@
140 140
 LIBBZ2 = @LIBBZ2@
141 141
 LIBBZ2_PREFIX = @LIBBZ2_PREFIX@
142
+LIBCHECK = @LIBCHECK@
143
+LIBCHECK_PREFIX = @LIBCHECK_PREFIX@
142 144
 LIBCLAMAV_LIBS = @LIBCLAMAV_LIBS@
143 145
 LIBCLAMAV_VERSION = @LIBCLAMAV_VERSION@
144 146
 LIBGMP = @LIBGMP@
... ...
@@ -148,6 +150,7 @@ LIBS = $(top_builddir)/libclamav/libclamav.la @FRESHCLAM_LIBS@ @THREAD_LIBS@
148 148
 LIBTOOL = @LIBTOOL@
149 149
 LN_S = @LN_S@
150 150
 LTLIBBZ2 = @LTLIBBZ2@
151
+LTLIBCHECK = @LTLIBCHECK@
151 152
 LTLIBGMP = @LTLIBGMP@
152 153
 LTLIBOBJS = @LTLIBOBJS@
153 154
 MAINT = @MAINT@
... ...
@@ -94,6 +94,8 @@ LCOV = @LCOV@
94 94
 LDFLAGS = @LDFLAGS@
95 95
 LIBBZ2 = @LIBBZ2@
96 96
 LIBBZ2_PREFIX = @LIBBZ2_PREFIX@
97
+LIBCHECK = @LIBCHECK@
98
+LIBCHECK_PREFIX = @LIBCHECK_PREFIX@
97 99
 LIBCLAMAV_LIBS = @LIBCLAMAV_LIBS@
98 100
 LIBCLAMAV_VERSION = @LIBCLAMAV_VERSION@
99 101
 LIBGMP = @LIBGMP@
... ...
@@ -103,6 +105,7 @@ LIBS = @LIBS@
103 103
 LIBTOOL = @LIBTOOL@
104 104
 LN_S = @LN_S@
105 105
 LTLIBBZ2 = @LTLIBBZ2@
106
+LTLIBCHECK = @LTLIBCHECK@
106 107
 LTLIBGMP = @LTLIBGMP@
107 108
 LTLIBOBJS = @LTLIBOBJS@
108 109
 MAINT = @MAINT@
... ...
@@ -134,6 +134,8 @@ LCOV = @LCOV@
134 134
 LDFLAGS = @LDFLAGS@
135 135
 LIBBZ2 = @LIBBZ2@
136 136
 LIBBZ2_PREFIX = @LIBBZ2_PREFIX@
137
+LIBCHECK = @LIBCHECK@
138
+LIBCHECK_PREFIX = @LIBCHECK_PREFIX@
137 139
 LIBCLAMAV_LIBS = @LIBCLAMAV_LIBS@
138 140
 LIBCLAMAV_VERSION = @LIBCLAMAV_VERSION@
139 141
 LIBGMP = @LIBGMP@
... ...
@@ -143,6 +145,7 @@ LIBS = @LIBS@
143 143
 LIBTOOL = @LIBTOOL@
144 144
 LN_S = @LN_S@
145 145
 LTLIBBZ2 = @LTLIBBZ2@
146
+LTLIBCHECK = @LTLIBCHECK@
146 147
 LTLIBGMP = @LTLIBGMP@
147 148
 LTLIBOBJS = @LTLIBOBJS@
148 149
 MAINT = @MAINT@