Switch to unified view

a/src/configure.ac b/src/configure.ac
...
...
61
   [Use File Alteration Monitor for almost real time indexing of modified files. Give the fam/gamin library as argument (ie: /usr/lib/libfam.so) if configure does not find the right one.]),
61
   [Use File Alteration Monitor for almost real time indexing of modified files. Give the fam/gamin library as argument (ie: /usr/lib/libfam.so) if configure does not find the right one.]),
62
        withFam=$withval, withFam=no)
62
        withFam=$withval, withFam=no)
63
case $withFam in
63
case $withFam in
64
     no);;
64
     no);;
65
     yes)
65
     yes)
66
    for dir in /usr/local/lib /usr/lib;do 
66
    for dir in /usr/local/lib ${libdir};do 
67
     if test -f $dir/libfam.so ; then famLib=$dir/libfam.so;break;fi
67
     if test -f $dir/libfam.so ; then famLib=$dir/libfam.so;break;fi
68
    done
68
    done
69
     ;;
69
     ;;
70
     *) # The argument should be the path to the fam library
70
     *) # The argument should be the path to the fam library
71
     famLib=$withFam
71
     famLib=$withFam
...
...
119
dir=/usr/local/lib
119
dir=/usr/local/lib
120
LDFLAGS="$S_LDFLAGS -L$dir"
120
LDFLAGS="$S_LDFLAGS -L$dir"
121
unset ac_cv_lib_iconv_iconv_open
121
unset ac_cv_lib_iconv_iconv_open
122
AC_CHECK_LIB(iconv, iconv_open, LIBICONV="-L$dir -liconv";INCICONV=-I/usr/local/include)
122
AC_CHECK_LIB(iconv, iconv_open, LIBICONV="-L$dir -liconv";INCICONV=-I/usr/local/include)
123
if test A"$LIBICONV" = A ; then
123
if test A"$LIBICONV" = A ; then
124
  dir=/usr/lib
124
  dir=${libdir}
125
  LDFLAGS="$S_LDFLAGS -L$dir"
125
  LDFLAGS="$S_LDFLAGS -L$dir"
126
  unset ac_cv_lib_iconv_iconv_open
126
  unset ac_cv_lib_iconv_iconv_open
127
  AC_CHECK_LIB(iconv, iconv_open, LIBICONV="-L$dir -liconv";INCICONV=-I/usr/include)
127
  AC_CHECK_LIB(iconv, iconv_open, LIBICONV="-L$dir -liconv";INCICONV=-I/usr/include)
128
  if test A"$LIBICONV" = A; then
128
  if test A"$LIBICONV" = A; then
129
    dir=/usr/lib
129
    dir=${libdir}
130
    LDFLAGS="$S_LDFLAGS -L$dir"
130
    LDFLAGS="$S_LDFLAGS -L$dir"
131
    unset ac_cv_lib_iconv_iconv_open
131
    unset ac_cv_lib_iconv_iconv_open
132
    AC_CHECK_LIB(c, iconv_open, LIBICONV=NONE;INCICONV=-I/usr/include)
132
    AC_CHECK_LIB(c, iconv_open, LIBICONV=NONE;INCICONV=-I/usr/include)
133
  fi
133
  fi
134
fi
134
fi