Switch to unified view

a/src/configure.ac b/src/configure.ac
...
...
19
LIBICONV=""
19
LIBICONV=""
20
S_LDFLAGS=$LDFLAGS
20
S_LDFLAGS=$LDFLAGS
21
dir=/usr/lib
21
dir=/usr/lib
22
LDFLAGS="$S_LDFLAGS -L$dir"
22
LDFLAGS="$S_LDFLAGS -L$dir"
23
AC_CHECK_LIB(c, iconv_open, LIBICONV=NONE;INCICONV=-I/usr/include)
23
AC_CHECK_LIB(c, iconv_open, LIBICONV=NONE;INCICONV=-I/usr/include)
24
if test A$LIBICONV = A ; then
24
if test A"$LIBICONV" = A ; then
25
  dir=/usr/local/lib
25
  dir=/usr/local/lib
26
  LDFLAGS="$S_LDFLAGS -L$dir"
26
  LDFLAGS="$S_LDFLAGS -L$dir"
27
  unset ac_cv_lib_iconv_iconv_open
27
  unset ac_cv_lib_iconv_iconv_open
28
  AC_CHECK_LIB(iconv, iconv_open, 
28
  AC_CHECK_LIB(iconv, iconv_open, 
29
              LIBICONV="-L$dir -liconv";INCICONV=-I/usr/local/include)
29
              LIBICONV="-L$dir -liconv";INCICONV=-I/usr/local/include)
30
  if test A$LIBICONV = A; then
30
  if test A"$LIBICONV" = A; then
31
    dir=/usr/local/lib
31
    dir=/usr/local/lib
32
    LDFLAGS="$S_LDFLAGS -L$dir"
32
    LDFLAGS="$S_LDFLAGS -L$dir"
33
    unset ac_cv_lib_iconv_iconv_open
33
    unset ac_cv_lib_iconv_iconv_open
34
    AC_CHECK_LIB(iconv, iconv_open, LIBICONV="-L$dir -liconv";INCICONV=-I/usr/include)
34
    AC_CHECK_LIB(iconv, iconv_open, LIBICONV="-L$dir -liconv";INCICONV=-I/usr/include)
35
  fi
35
  fi
36
fi
36
fi
37
LDFLAGS=$S_LDFLAGS
37
LDFLAGS=$S_LDFLAGS
38
if test A$LIBICONV = A ; then
38
if test A"$LIBICONV" = A ; then
39
   AC_MSG_ERROR([Cannot find iconv_open anywhere. Please install iconv])
39
   AC_MSG_ERROR([Cannot find iconv_open anywhere. Please install iconv])
40
   exit 1
40
   exit 1
41
fi
41
fi
42
if test A$LIBICONV = ANONE ; then
42
if test A"$LIBICONV" = ANONE ; then
43
   LIBICONV=""
43
   LIBICONV=""
44
fi
44
fi
45
echo LIBICONV $LIBICONV
45
#echo LIBICONV $LIBICONV
46
echo INCICONV $INCICONV
46
#echo INCICONV $INCICONV
47
47
48
#### Look for Xapian
48
#### Look for Xapian
49
AC_PATH_PROG(XAPIAN_CONFIG, xapian-config, no)
49
AC_PATH_PROG(XAPIAN_CONFIG, xapian-config, no)
50
if test "$XAPIAN_CONFIG" = "no" ; then
50
if test "$XAPIAN_CONFIG" = "no" ; then
51
   AC_MSG_ERROR([Cannot find xapian-config command in $PATH. Is
51
   AC_MSG_ERROR([Cannot find xapian-config command in $PATH. Is
...
...
64
AC_SUBST(LIBICONV)
64
AC_SUBST(LIBICONV)
65
AC_SUBST(INCICONV)
65
AC_SUBST(INCICONV)
66
66
67
AC_CONFIG_FILES(mk/localdefs)
67
AC_CONFIG_FILES(mk/localdefs)
68
68
69
for d in bincimapmime index lib query
70
do 
71
    rm -f $d/alldeps.stamp
72
    cp -f /dev/null $d/alldeps
73
done
74
69
AC_OUTPUT
75
AC_OUTPUT