Switch to unified view

a/src/configure.ac b/src/configure.ac
1
AC_INIT([Recoll], m4_esyscmd_s(cat VERSION))
1
AC_INIT([Recoll], m4_esyscmd_s(cat VERSION))
2
AC_CONFIG_HEADERS([common/autoconfig.h])
2
AC_CONFIG_HEADERS([common/autoconfig.h])
3
AC_PREREQ(2.53)
3
AC_PREREQ(2.53)
4
AC_CONFIG_SRCDIR(index/recollindex.cpp)
4
AC_CONFIG_SRCDIR(index/recollindex.cpp)
5
5
6
AM_INIT_AUTOMAKE([1.10 no-define subdir-objects foreign])
7
AC_DISABLE_STATIC
8
LT_INIT
9
AC_CONFIG_MACRO_DIR([m4])
10
6
AC_PROG_CXX
11
AC_PROG_CXX
7
if test C$CXX = C ; then
12
if test C$CXX = C ; then
8
   AC_MSG_ERROR([C++ compiler needed. Please install one (ie: gnu g++)])
13
   AC_MSG_ERROR([C++ compiler needed. Please install one (ie: gnu g++)])
9
fi
14
fi
10
15
16
AC_PROG_YACC
17
18
AC_PROG_LIBTOOL
11
AC_C_BIGENDIAN
19
AC_C_BIGENDIAN
12
13
sys=`uname | tr / _ | awk -F_ '{print $1}'`
14
15
if test ! -f mk/$sys ; then
16
   AC_MSG_NOTICE([
17
    No system configuration file found in mk/ for uname = '$sys'. 
18
    Trying with Default file. 
19
    If the build fails, you'll need to write a configuration file, starting 
20
    from one of the existing ones.])
21
22
    sys=Default   
23
fi
24
(cd mk; rm -f sysconf; ln -s $sys sysconf)
25
26
# There a few Recoll users on Mac OS X and a few things are just not worth
27
# supporting
28
if test X$sys = XDarwin ; then
29
   NODYNLIB=#
30
fi
31
20
32
AC_SYS_LARGEFILE
21
AC_SYS_LARGEFILE
33
22
34
# OpenBSD needs sys/param.h for mount.h to compile
23
# OpenBSD needs sys/param.h for mount.h to compile
35
AC_CHECK_HEADERS([sys/param.h, spawn.h])
24
AC_CHECK_HEADERS([sys/param.h, spawn.h])
...
...
197
# resources used).
186
# resources used).
198
AC_ARG_ENABLE(idxthreads,
187
AC_ARG_ENABLE(idxthreads,
199
    AC_HELP_STRING([--disable-idxthreads],
188
    AC_HELP_STRING([--disable-idxthreads],
200
   [Disable multithread indexing.]),
189
   [Disable multithread indexing.]),
201
        idxthreadsEnabled=$enableval, idxthreadsEnabled=yes)
190
        idxthreadsEnabled=$enableval, idxthreadsEnabled=yes)
202
191
AM_CONDITIONAL(NOTHREADS, [test X$idxthreadsEnabled = Xno])
203
if test X$idxthreadsEnabled = Xyes ; then
192
if test X$idxthreadsEnabled = Xyes ; then
204
  AC_DEFINE(IDX_THREADS, 1, [Use multiple threads for indexing])
193
  AC_DEFINE(IDX_THREADS, 1, [Use multiple threads for indexing])
205
  NOTHREADS=""
206
else
207
  NOTHREADS="#"
208
fi
194
fi
209
195
210
# Enable CamelCase word splitting. This is optional because it causes 
196
# Enable CamelCase word splitting. This is optional because it causes 
211
# problems with phrases: with camelcase enabled, "MySQL manual"
197
# problems with phrases: with camelcase enabled, "MySQL manual"
212
# will be matched by "MySQL manual" and "my sql manual" but not 
198
# will be matched by "MySQL manual" and "my sql manual" but not 
...
...
219
   case in the phrase query to get a match. Ie querying for 
205
   case in the phrase query to get a match. Ie querying for 
220
   "MySQL manual" and "my sql manual" are the same, but not the same as
206
   "MySQL manual" and "my sql manual" are the same, but not the same as
221
   "mysql manual" (in phrases only and you could raise the phrase slack to
207
   "mysql manual" (in phrases only and you could raise the phrase slack to
222
   get a match).]),
208
   get a match).]),
223
        camelcaseEnabled=$enableval, camelcaseEnabled=no)
209
        camelcaseEnabled=$enableval, camelcaseEnabled=no)
224
225
if test X$camelcaseEnabled = Xyes ; then
210
if test X$camelcaseEnabled = Xyes ; then
226
  AC_DEFINE(RCL_SPLIT_CAMELCASE, 1, [Split camelCase words])
211
  AC_DEFINE(RCL_SPLIT_CAMELCASE, 1, [Split camelCase words])
227
fi
212
fi
228
213
229
# Disable building the python module. This is built by default, because
214
# Disable building the python module. This is built by default, because
...
...
246
fi
231
fi
247
else
232
else
248
  NOPYTHON="#"
233
  NOPYTHON="#"
249
fi
234
fi
250
235
251
# Build PIC objects for the library ?
252
AC_ARG_ENABLE(pic,
253
    AC_HELP_STRING([--disable-pic],
254
   [Do not compile library objects as position independant code. 
255
    This is incompatible with the php or python extensions.]),
256
        picEnabled=$enableval, picEnabled=forpython)
257
case $picEnabled in
258
forpython) picEnabled=$pythonEnabled; NOPIC=$NOPYTHON;;
259
yes) NOPIC="";;
260
*) NOPIC="#";;
261
esac
262
263
if test X$pythonEnabled = Xyes -a X$picEnabled != Xyes; then
264
   AC_MSG_ERROR([Python build needs PIC library])
265
fi
266
267
if test X$NOPIC != X; then
268
    NODYNLIB=#
269
fi
270
271
AC_CHECK_FUNCS(mkdtemp)
236
AC_CHECK_FUNCS(mkdtemp)
237
AC_CHECK_LIB([pthread], [pthread_create], [], [])
238
AC_CHECK_LIB([dl], [dlopen], [], [])
272
239
273
##### Look for iconv. This can exist in either libc (ie: Linux, solaris) or
240
##### Look for iconv. This can exist in either libc (ie: Linux, solaris) or
274
##### libiconv. We'd need a --with-libiconv= option
241
##### libiconv. We'd need a --with-libiconv= option
275
AC_LANG(C++)
242
AC_LANG(C++)
276
LIBICONV=""
243
LIBICONV=""
...
...
500
   QMAKE_DISABLE_WEBKIT="#"
467
   QMAKE_DISABLE_WEBKIT="#"
501
  else
468
  else
502
   QMAKE_ENABLE_WEBKIT="#"
469
   QMAKE_ENABLE_WEBKIT="#"
503
   QMAKE_DISABLE_WEBKIT=""
470
   QMAKE_DISABLE_WEBKIT=""
504
  fi
471
  fi
505
506
507
472
508
 ##### Using QZeitGeist lib ? Default no for now
473
 ##### Using QZeitGeist lib ? Default no for now
509
  AC_ARG_WITH(qzeitgeist,
474
  AC_ARG_WITH(qzeitgeist,
510
    AC_HELP_STRING([--with-qzeitgeist],
475
    AC_HELP_STRING([--with-qzeitgeist],
511
      [Enable the use of the qzeitgeist library to send zeitgeist events.]),
476
      [Enable the use of the qzeitgeist library to send zeitgeist events.]),
...
...
596
561
597
# All object files depend on localdefs which has the cc flags. Avoid
562
# All object files depend on localdefs which has the cc flags. Avoid
598
# changing it unless necessary
563
# changing it unless necessary
599
AC_CONFIG_FILES(Makefile)
564
AC_CONFIG_FILES(Makefile)
600
AC_CONFIG_FILES(common/rclversion.h)
565
AC_CONFIG_FILES(common/rclversion.h)
601
AC_CONFIG_FILES(lib/mkMake)
602
AC_CONFIG_FILES(mk/localdefs.new:mk/localdefs.in)
603
AC_CONFIG_FILES(python/recoll/setup.py)
566
AC_CONFIG_FILES(python/recoll/setup.py)
604
AC_CONFIG_FILES(recollinstall)
567
AC_CONFIG_FILES(recollinstall)
605
AC_CONFIG_FILES(sampleconf/recoll.conf)
568
AC_CONFIG_FILES(sampleconf/recoll.conf)
606
569
607
for d in bincimapmime index lib query
608
do 
609
    rm -f $d/alldeps.stamp
610
    cp -f /dev/null $d/alldeps
611
done
612
613
AC_OUTPUT
570
AC_OUTPUT
614
615
if cmp -s mk/localdefs mk/localdefs.new ; then
616
  rm -f mk/localdefs.new
617
else
618
  mv -f mk/localdefs.new mk/localdefs
619
fi
620