Switch to unified view

a/src/configure b/src/configure
...
...
1159
    are really simple.
1159
    are really simple.
1160
EOF
1160
EOF
1161
   exit 1
1161
   exit 1
1162
fi
1162
fi
1163
1163
1164
##### Look for iconv in libc (Linux), or libiconv in /usr/local/lib:/usr/lib
1164
##### Look for iconv. We first look for libiconv in /usr/local/lib:/usr/lib
1165
##    then in libc (Linux, solaris)
1165
ac_ext=c
1166
ac_ext=c
1166
ac_cpp='$CPP $CPPFLAGS'
1167
ac_cpp='$CPP $CPPFLAGS'
1167
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
1168
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
1168
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
1169
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
1169
ac_compiler_gnu=$ac_cv_c_compiler_gnu
1170
ac_compiler_gnu=$ac_cv_c_compiler_gnu
1170
1171
1171
LIBICONV=""
1172
LIBICONV=""
1172
S_LDFLAGS=$LDFLAGS
1173
S_LDFLAGS=$LDFLAGS
1173
dir=/usr/lib
1174
dir=/usr/local/lib
1174
LDFLAGS="$S_LDFLAGS -L$dir"
1175
LDFLAGS="$S_LDFLAGS -L$dir"
1176
unset ac_cv_lib_iconv_iconv_open
1175
ac_ext=c
1177
ac_ext=c
1176
ac_cpp='$CPP $CPPFLAGS'
1178
ac_cpp='$CPP $CPPFLAGS'
1177
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
1179
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
1178
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
1180
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
1179
ac_compiler_gnu=$ac_cv_c_compiler_gnu
1181
ac_compiler_gnu=$ac_cv_c_compiler_gnu
...
...
1929
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
1931
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
1930
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
1932
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
1931
ac_compiler_gnu=$ac_cv_c_compiler_gnu
1933
ac_compiler_gnu=$ac_cv_c_compiler_gnu
1932
1934
1933
1935
1934
echo "$as_me:$LINENO: checking for iconv_open in -lc" >&5
1936
echo "$as_me:$LINENO: checking for iconv_open in -liconv" >&5
1935
echo $ECHO_N "checking for iconv_open in -lc... $ECHO_C" >&6
1937
echo $ECHO_N "checking for iconv_open in -liconv... $ECHO_C" >&6
1936
if test "${ac_cv_lib_c_iconv_open+set}" = set; then
1938
if test "${ac_cv_lib_iconv_iconv_open+set}" = set; then
1937
  echo $ECHO_N "(cached) $ECHO_C" >&6
1939
  echo $ECHO_N "(cached) $ECHO_C" >&6
1938
else
1940
else
1939
  ac_check_lib_save_LIBS=$LIBS
1941
  ac_check_lib_save_LIBS=$LIBS
1940
LIBS="-lc  $LIBS"
1942
LIBS="-liconv  $LIBS"
1941
cat >conftest.$ac_ext <<_ACEOF
1943
cat >conftest.$ac_ext <<_ACEOF
1942
#line $LINENO "configure"
1944
#line $LINENO "configure"
1943
#include "confdefs.h"
1945
#include "confdefs.h"
1944
1946
1945
/* Override any gcc2 internal prototype to avoid an error.  */
1947
/* Override any gcc2 internal prototype to avoid an error.  */
...
...
1973
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1975
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1974
  (eval $ac_try) 2>&5
1976
  (eval $ac_try) 2>&5
1975
  ac_status=$?
1977
  ac_status=$?
1976
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
1978
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
1977
  (exit $ac_status); }; }; then
1979
  (exit $ac_status); }; }; then
1978
  ac_cv_lib_c_iconv_open=yes
1980
  ac_cv_lib_iconv_iconv_open=yes
1979
else
1981
else
1980
  echo "$as_me: failed program was:" >&5
1982
  echo "$as_me: failed program was:" >&5
1981
cat conftest.$ac_ext >&5
1983
cat conftest.$ac_ext >&5
1982
ac_cv_lib_c_iconv_open=no
1984
ac_cv_lib_iconv_iconv_open=no
1983
fi
1985
fi
1984
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
1986
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
1985
LIBS=$ac_check_lib_save_LIBS
1987
LIBS=$ac_check_lib_save_LIBS
1986
fi
1988
fi
1987
echo "$as_me:$LINENO: result: $ac_cv_lib_c_iconv_open" >&5
1989
echo "$as_me:$LINENO: result: $ac_cv_lib_iconv_iconv_open" >&5
1988
echo "${ECHO_T}$ac_cv_lib_c_iconv_open" >&6
1990
echo "${ECHO_T}$ac_cv_lib_iconv_iconv_open" >&6
1989
if test $ac_cv_lib_c_iconv_open = yes; then
1991
if test $ac_cv_lib_iconv_iconv_open = yes; then
1990
  LIBICONV=NONE;INCICONV=-I/usr/include
1992
  LIBICONV="-L$dir -liconv";INCICONV=-I/usr/local/include
1991
fi
1993
fi
1992
1994
1993
if test A"$LIBICONV" = A ; then
1995
if test A"$LIBICONV" = A ; then
1994
  dir=/usr/local/lib
1996
  dir=/usr/lib
1995
  LDFLAGS="$S_LDFLAGS -L$dir"
1997
  LDFLAGS="$S_LDFLAGS -L$dir"
1996
  unset ac_cv_lib_iconv_iconv_open
1998
  unset ac_cv_lib_iconv_iconv_open
1997
  echo "$as_me:$LINENO: checking for iconv_open in -liconv" >&5
1999
  echo "$as_me:$LINENO: checking for iconv_open in -liconv" >&5
1998
echo $ECHO_N "checking for iconv_open in -liconv... $ECHO_C" >&6
2000
echo $ECHO_N "checking for iconv_open in -liconv... $ECHO_C" >&6
1999
if test "${ac_cv_lib_iconv_iconv_open+set}" = set; then
2001
if test "${ac_cv_lib_iconv_iconv_open+set}" = set; then
...
...
2048
LIBS=$ac_check_lib_save_LIBS
2050
LIBS=$ac_check_lib_save_LIBS
2049
fi
2051
fi
2050
echo "$as_me:$LINENO: result: $ac_cv_lib_iconv_iconv_open" >&5
2052
echo "$as_me:$LINENO: result: $ac_cv_lib_iconv_iconv_open" >&5
2051
echo "${ECHO_T}$ac_cv_lib_iconv_iconv_open" >&6
2053
echo "${ECHO_T}$ac_cv_lib_iconv_iconv_open" >&6
2052
if test $ac_cv_lib_iconv_iconv_open = yes; then
2054
if test $ac_cv_lib_iconv_iconv_open = yes; then
2053
  LIBICONV="-L$dir -liconv";INCICONV=-I/usr/local/include
2055
  LIBICONV="-L$dir -liconv";INCICONV=-I/usr/include
2054
fi
2056
fi
2055
2057
2056
  if test A"$LIBICONV" = A; then
2058
  if test A"$LIBICONV" = A; then
2057
    dir=/usr/local/lib
2059
    dir=/usr/lib
2058
    LDFLAGS="$S_LDFLAGS -L$dir"
2060
    LDFLAGS="$S_LDFLAGS -L$dir"
2059
    unset ac_cv_lib_iconv_iconv_open
2061
    unset ac_cv_lib_iconv_iconv_open
2060
    echo "$as_me:$LINENO: checking for iconv_open in -liconv" >&5
2062
    echo "$as_me:$LINENO: checking for iconv_open in -lc" >&5
2061
echo $ECHO_N "checking for iconv_open in -liconv... $ECHO_C" >&6
2063
echo $ECHO_N "checking for iconv_open in -lc... $ECHO_C" >&6
2062
if test "${ac_cv_lib_iconv_iconv_open+set}" = set; then
2064
if test "${ac_cv_lib_c_iconv_open+set}" = set; then
2063
  echo $ECHO_N "(cached) $ECHO_C" >&6
2065
  echo $ECHO_N "(cached) $ECHO_C" >&6
2064
else
2066
else
2065
  ac_check_lib_save_LIBS=$LIBS
2067
  ac_check_lib_save_LIBS=$LIBS
2066
LIBS="-liconv  $LIBS"
2068
LIBS="-lc  $LIBS"
2067
cat >conftest.$ac_ext <<_ACEOF
2069
cat >conftest.$ac_ext <<_ACEOF
2068
#line $LINENO "configure"
2070
#line $LINENO "configure"
2069
#include "confdefs.h"
2071
#include "confdefs.h"
2070
2072
2071
/* Override any gcc2 internal prototype to avoid an error.  */
2073
/* Override any gcc2 internal prototype to avoid an error.  */
...
...
2099
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
2101
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
2100
  (eval $ac_try) 2>&5
2102
  (eval $ac_try) 2>&5
2101
  ac_status=$?
2103
  ac_status=$?
2102
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
2104
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
2103
  (exit $ac_status); }; }; then
2105
  (exit $ac_status); }; }; then
2104
  ac_cv_lib_iconv_iconv_open=yes
2106
  ac_cv_lib_c_iconv_open=yes
2105
else
2107
else
2106
  echo "$as_me: failed program was:" >&5
2108
  echo "$as_me: failed program was:" >&5
2107
cat conftest.$ac_ext >&5
2109
cat conftest.$ac_ext >&5
2108
ac_cv_lib_iconv_iconv_open=no
2110
ac_cv_lib_c_iconv_open=no
2109
fi
2111
fi
2110
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
2112
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
2111
LIBS=$ac_check_lib_save_LIBS
2113
LIBS=$ac_check_lib_save_LIBS
2112
fi
2114
fi
2113
echo "$as_me:$LINENO: result: $ac_cv_lib_iconv_iconv_open" >&5
2115
echo "$as_me:$LINENO: result: $ac_cv_lib_c_iconv_open" >&5
2114
echo "${ECHO_T}$ac_cv_lib_iconv_iconv_open" >&6
2116
echo "${ECHO_T}$ac_cv_lib_c_iconv_open" >&6
2115
if test $ac_cv_lib_iconv_iconv_open = yes; then
2117
if test $ac_cv_lib_c_iconv_open = yes; then
2116
  LIBICONV="-L$dir -liconv";INCICONV=-I/usr/include
2118
  LIBICONV=NONE;INCICONV=-I/usr/include
2117
fi
2119
fi
2118
2120
2119
  fi
2121
  fi
2120
fi
2122
fi
2121
LDFLAGS=$S_LDFLAGS
2123
LDFLAGS=$S_LDFLAGS