Switch to unified view

a/src/configure.ac b/src/configure.ac
1
AC_INIT(Recoll, 1.0)
1
AC_INIT(Recoll, 1.6)
2
AC_CONFIG_HEADERS([common/autoconfig.h])
2
AC_PREREQ(2.53)
3
AC_PREREQ(2.53)
3
AC_CONFIG_SRCDIR(index/recollindex.cpp)
4
AC_CONFIG_SRCDIR(index/recollindex.cpp)
4
5
5
sys=`uname`
6
sys=`uname`
6
if test -f mk/$sys ; then
7
if test -f mk/$sys ; then
...
...
11
    could try to write one, starting from one of the existing files, they
12
    could try to write one, starting from one of the existing files, they
12
    are really simple.
13
    are really simple.
13
EOF
14
EOF
14
   exit 1
15
   exit 1
15
fi
16
fi
17
18
# Use aspell to provide spelling expansions ?
19
# The default is yes. If we do find an aspell installation, we use it. Else
20
# we do compile the aspell module using an internal copy of aspell.h
21
# Only --with-aspell=no will completely disable aspell support
22
AC_ARG_WITH(aspell, 
23
    AC_HELP_STRING([--with-aspell],
24
   [Use aspell spelling package to provide term expansion to other spellings]),
25
        withAspell=$withval, withAspell=yes)
26
case $withAspell in
27
     no);;
28
     yes)
29
     AC_PATH_PROG(aspellProg, aspell)
30
     ;;
31
     *) # The argument should be the path to the aspell program
32
     aspellProg=$withAspell
33
     ;;
34
esac
35
# if 
36
if test X$withAspell != Xno ; then
37
   AC_DEFINE(RCL_USE_ASPELL, 1, [Compile the aspell interface])
38
   if test X$aspellProg != X ; then
39
      aspellBase=`dirname $aspellProg`
40
      aspellBase=`dirname $aspellBase`
41
      if test ! -f $aspellBase/include/aspell.h ; then
42
   AC_MSG_ERROR([aspell.h not found in $aspellBase/include. Specify --with-aspell=no to disable aspell support])
43
      fi
44
      AC_DEFINE_UNQUOTED(ASPELL_PROG, "$aspellProg",
45
  [Path to the aspell program])
46
      AC_DEFINE_UNQUOTED(ASPELL_INCLUDE, "$aspellBase/include/aspell.h",
47
  [Path to the aspell api include file])
48
   else
49
     # aspell support enabled but no aspell install yet
50
  AC_MSG_NOTICE([aspell support enabled but aspell package not found. Compiling with internal aspell interface file])
51
  AC_DEFINE(ASPELL_INCLUDE, ["aspell-local.h"])
52
   fi
53
fi
54
16
55
17
##### Look for iconv. We first look for libiconv in /usr/local/lib:/usr/lib
56
##### Look for iconv. We first look for libiconv in /usr/local/lib:/usr/lib
18
##    then in libc (Linux, solaris)
57
##    then in libc (Linux, solaris)
19
AC_LANG(C)
58
AC_LANG(C)
20
LIBICONV=""
59
LIBICONV=""