Switch to unified view

a/src/configure b/src/configure
...
...
1988
echo "${ECHO_T}$ac_cv_lib_c_iconv_open" >&6
1988
echo "${ECHO_T}$ac_cv_lib_c_iconv_open" >&6
1989
if test $ac_cv_lib_c_iconv_open = yes; then
1989
if test $ac_cv_lib_c_iconv_open = yes; then
1990
  LIBICONV=NONE;INCICONV=-I/usr/include
1990
  LIBICONV=NONE;INCICONV=-I/usr/include
1991
fi
1991
fi
1992
1992
1993
if test A$LIBICONV = A ; then
1993
if test A"$LIBICONV" = A ; then
1994
  dir=/usr/local/lib
1994
  dir=/usr/local/lib
1995
  LDFLAGS="$S_LDFLAGS -L$dir"
1995
  LDFLAGS="$S_LDFLAGS -L$dir"
1996
  unset ac_cv_lib_iconv_iconv_open
1996
  unset ac_cv_lib_iconv_iconv_open
1997
  echo "$as_me:$LINENO: checking for iconv_open in -liconv" >&5
1997
  echo "$as_me:$LINENO: checking for iconv_open in -liconv" >&5
1998
echo $ECHO_N "checking for iconv_open in -liconv... $ECHO_C" >&6
1998
echo $ECHO_N "checking for iconv_open in -liconv... $ECHO_C" >&6
...
...
2051
echo "${ECHO_T}$ac_cv_lib_iconv_iconv_open" >&6
2051
echo "${ECHO_T}$ac_cv_lib_iconv_iconv_open" >&6
2052
if test $ac_cv_lib_iconv_iconv_open = yes; then
2052
if test $ac_cv_lib_iconv_iconv_open = yes; then
2053
  LIBICONV="-L$dir -liconv";INCICONV=-I/usr/local/include
2053
  LIBICONV="-L$dir -liconv";INCICONV=-I/usr/local/include
2054
fi
2054
fi
2055
2055
2056
  if test A$LIBICONV = A; then
2056
  if test A"$LIBICONV" = A; then
2057
    dir=/usr/local/lib
2057
    dir=/usr/local/lib
2058
    LDFLAGS="$S_LDFLAGS -L$dir"
2058
    LDFLAGS="$S_LDFLAGS -L$dir"
2059
    unset ac_cv_lib_iconv_iconv_open
2059
    unset ac_cv_lib_iconv_iconv_open
2060
    echo "$as_me:$LINENO: checking for iconv_open in -liconv" >&5
2060
    echo "$as_me:$LINENO: checking for iconv_open in -liconv" >&5
2061
echo $ECHO_N "checking for iconv_open in -liconv... $ECHO_C" >&6
2061
echo $ECHO_N "checking for iconv_open in -liconv... $ECHO_C" >&6
...
...
2117
fi
2117
fi
2118
2118
2119
  fi
2119
  fi
2120
fi
2120
fi
2121
LDFLAGS=$S_LDFLAGS
2121
LDFLAGS=$S_LDFLAGS
2122
if test A$LIBICONV = A ; then
2122
if test A"$LIBICONV" = A ; then
2123
   { { echo "$as_me:$LINENO: error: Cannot find iconv_open anywhere. Please install iconv" >&5
2123
   { { echo "$as_me:$LINENO: error: Cannot find iconv_open anywhere. Please install iconv" >&5
2124
echo "$as_me: error: Cannot find iconv_open anywhere. Please install iconv" >&2;}
2124
echo "$as_me: error: Cannot find iconv_open anywhere. Please install iconv" >&2;}
2125
   { (exit 1); exit 1; }; }
2125
   { (exit 1); exit 1; }; }
2126
   exit 1
2126
   exit 1
2127
fi
2127
fi
2128
if test A$LIBICONV = ANONE ; then
2128
if test A"$LIBICONV" = ANONE ; then
2129
   LIBICONV=""
2129
   LIBICONV=""
2130
fi
2130
fi
2131
echo LIBICONV $LIBICONV
2131
#echo LIBICONV $LIBICONV
2132
echo INCICONV $INCICONV
2132
#echo INCICONV $INCICONV
2133
2133
2134
#### Look for Xapian
2134
#### Look for Xapian
2135
# Extract the first word of "xapian-config", so it can be a program name with args.
2135
# Extract the first word of "xapian-config", so it can be a program name with args.
2136
set dummy xapian-config; ac_word=$2
2136
set dummy xapian-config; ac_word=$2
2137
echo "$as_me:$LINENO: checking for $ac_word" >&5
2137
echo "$as_me:$LINENO: checking for $ac_word" >&5
...
...
2180
   { (exit 1); exit 1; }; }
2180
   { (exit 1); exit 1; }; }
2181
   exit 1
2181
   exit 1
2182
fi
2182
fi
2183
LIBXAPIAN=`$XAPIAN_CONFIG --libs`
2183
LIBXAPIAN=`$XAPIAN_CONFIG --libs`
2184
XAPIANCXXFLAGS=`$XAPIAN_CONFIG --cxxflags`
2184
XAPIANCXXFLAGS=`$XAPIAN_CONFIG --cxxflags`
2185
2185
echo XAPIAN_CONFIG $XAPIAN_CONFIG
2186
#echo XAPIAN_CONFIG $XAPIAN_CONFIG
2186
echo LIBXAPIAN $LIBXAPIAN
2187
#echo LIBXAPIAN $LIBXAPIAN
2187
echo XAPIANCXXFLAGS $XAPIANCXXFLAGS
2188
#echo XAPIANCXXFLAGS $XAPIANCXXFLAGS
2189
2188
2190
2189
2191
2190
2192
2191
2193
2192
2194
2193
ac_config_files="$ac_config_files mk/localdefs"
2195
ac_config_files="$ac_config_files mk/localdefs"
2196
2197
2198
for d in bincimapmime index lib query
2199
do
2200
    rm -f $d/alldeps.stamp
2201
    cp -f /dev/null $d/alldeps
2202
done
2194
2203
2195
cat >confcache <<\_ACEOF
2204
cat >confcache <<\_ACEOF
2196
# This file is a shell script that caches the results of configure
2205
# This file is a shell script that caches the results of configure
2197
# tests run on this system so they can be shared between configure
2206
# tests run on this system so they can be shared between configure
2198
# scripts and configure runs, see configure's option --config-cache.
2207
# scripts and configure runs, see configure's option --config-cache.