tris/recoll
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

glitches in linux/solaris compil. + install

Browse Source
This commit is contained in:
dockes
2005-11-21 17:18:58 +00:00
parent 771ef0055b
commit 5b5be0c853
8 changed files with 101 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/configure
Vendored
+73 -71
View File
@@ -1161,7 +1161,8 @@ EOF
exit 1
fi
##### Look for iconv in libc (Linux), or libiconv in /usr/local/lib:/usr/lib
##### Look for iconv. We first look for libiconv in /usr/local/lib:/usr/lib
## then in libc (Linux, solaris)
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -1170,8 +1171,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
LIBICONV=""
S_LDFLAGS=$LDFLAGS
dir=/usr/lib
dir=/usr/local/lib
LDFLAGS="$S_LDFLAGS -L$dir"
unset ac_cv_lib_iconv_iconv_open
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -1931,70 +1933,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
ac_compiler_gnu=$ac_cv_c_compiler_gnu
echo "$as_me:$LINENO: checking for iconv_open in -lc" >&5
echo $ECHO_N "checking for iconv_open in -lc... $ECHO_C" >&6
if test "${ac_cv_lib_c_iconv_open+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lc $LIBS"
cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
#ifdef __cplusplus
extern "C"
#endif
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
char iconv_open ();
#ifdef F77_DUMMY_MAIN
# ifdef __cplusplus
extern "C"
# endif
int F77_DUMMY_MAIN() { return 1; }
#endif
int
main ()
{
iconv_open ();
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_c_iconv_open=yes
else
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
ac_cv_lib_c_iconv_open=no
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
echo "$as_me:$LINENO: result: $ac_cv_lib_c_iconv_open" >&5
echo "${ECHO_T}$ac_cv_lib_c_iconv_open" >&6
if test $ac_cv_lib_c_iconv_open = yes; then
LIBICONV=NONE;INCICONV=-I/usr/include
fi
if test A"$LIBICONV" = A ; then
dir=/usr/local/lib
LDFLAGS="$S_LDFLAGS -L$dir"
unset ac_cv_lib_iconv_iconv_open
echo "$as_me:$LINENO: checking for iconv_open in -liconv" >&5
echo "$as_me:$LINENO: checking for iconv_open in -liconv" >&5
echo $ECHO_N "checking for iconv_open in -liconv... $ECHO_C" >&6
if test "${ac_cv_lib_iconv_iconv_open+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2053,11 +1992,11 @@ if test $ac_cv_lib_iconv_iconv_open = yes; then
LIBICONV="-L$dir -liconv";INCICONV=-I/usr/local/include
fi
if test A"$LIBICONV" = A; then
dir=/usr/local/lib
LDFLAGS="$S_LDFLAGS -L$dir"
unset ac_cv_lib_iconv_iconv_open
echo "$as_me:$LINENO: checking for iconv_open in -liconv" >&5
if test A"$LIBICONV" = A ; then
dir=/usr/lib
LDFLAGS="$S_LDFLAGS -L$dir"
unset ac_cv_lib_iconv_iconv_open
echo "$as_me:$LINENO: checking for iconv_open in -liconv" >&5
echo $ECHO_N "checking for iconv_open in -liconv... $ECHO_C" >&6
if test "${ac_cv_lib_iconv_iconv_open+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2116,6 +2055,69 @@ if test $ac_cv_lib_iconv_iconv_open = yes; then
LIBICONV="-L$dir -liconv";INCICONV=-I/usr/include
fi
if test A"$LIBICONV" = A; then
dir=/usr/lib
LDFLAGS="$S_LDFLAGS -L$dir"
unset ac_cv_lib_iconv_iconv_open
echo "$as_me:$LINENO: checking for iconv_open in -lc" >&5
echo $ECHO_N "checking for iconv_open in -lc... $ECHO_C" >&6
if test "${ac_cv_lib_c_iconv_open+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lc $LIBS"
cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
#ifdef __cplusplus
extern "C"
#endif
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
char iconv_open ();
#ifdef F77_DUMMY_MAIN
# ifdef __cplusplus
extern "C"
# endif
int F77_DUMMY_MAIN() { return 1; }
#endif
int
main ()
{
iconv_open ();
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_c_iconv_open=yes
else
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
ac_cv_lib_c_iconv_open=no
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
echo "$as_me:$LINENO: result: $ac_cv_lib_c_iconv_open" >&5
echo "${ECHO_T}$ac_cv_lib_c_iconv_open" >&6
if test $ac_cv_lib_c_iconv_open = yes; then
LIBICONV=NONE;INCICONV=-I/usr/include
fi
fi
fi
LDFLAGS=$S_LDFLAGS