Switch to unified view

a/src/configure.ac b/src/configure.ac
...
...
18
    from one of the existing ones.])
18
    from one of the existing ones.])
19
19
20
    sys=Default   
20
    sys=Default   
21
fi
21
fi
22
(cd mk; rm -f sysconf; ln -s $sys sysconf)
22
(cd mk; rm -f sysconf; ln -s $sys sysconf)
23
24
# There a few Recoll users on Mac OS X and a few things are just not worth
25
# supporting
26
if test X$sys = XDarwin ; then
27
   NODYNLIB=#
28
fi
23
29
24
AC_SYS_LARGEFILE
30
AC_SYS_LARGEFILE
25
31
26
# OpenBSD needs sys/param.h for mount.h to compile
32
# OpenBSD needs sys/param.h for mount.h to compile
27
AC_CHECK_HEADERS([sys/param.h])
33
AC_CHECK_HEADERS([sys/param.h])
...
...
217
# just not worth building the lib twice
223
# just not worth building the lib twice
218
# You can still have a non-pic recoll with:
224
# You can still have a non-pic recoll with:
219
#   configure --disable-python-module; make; make install;make clean
225
#   configure --disable-python-module; make; make install;make clean
220
#   configure; make; cd python/recoll; make install
226
#   configure; make; cd python/recoll; make install
221
#
227
#
228
if test X$sys != XDarwin ; then
222
AC_ARG_ENABLE(python-module,
229
AC_ARG_ENABLE(python-module,
223
    AC_HELP_STRING([--disable-python-module],
230
    AC_HELP_STRING([--disable-python-module],
224
   [Do not build the Python module.]),
231
   [Do not build the Python module.]),
225
        pythonEnabled=$enableval, pythonEnabled=yes)
232
        pythonEnabled=$enableval, pythonEnabled=yes)
226
if test X$pythonEnabled = Xyes ; then
233
if test X$pythonEnabled = Xyes ; then
227
  NOPYTHON=""
234
  NOPYTHON=""
235
else
236
  NOPYTHON="#"
237
fi
228
else
238
else
229
  NOPYTHON="#"
239
  NOPYTHON="#"
230
fi
240
fi
231
241
232
# Build PIC objects for the library ?
242
# Build PIC objects for the library ?
...
...
560
AC_SUBST(QMAKE_DISABLE_ZEITGEIST)
570
AC_SUBST(QMAKE_DISABLE_ZEITGEIST)
561
AC_SUBST(LIBQZEITGEIST)
571
AC_SUBST(LIBQZEITGEIST)
562
AC_SUBST(NOPIC)
572
AC_SUBST(NOPIC)
563
AC_SUBST(NOTHREADS)
573
AC_SUBST(NOTHREADS)
564
AC_SUBST(NOPYTHON)
574
AC_SUBST(NOPYTHON)
575
AC_SUBST(NODYNLIB)
565
AC_SUBST(RCLVERSION)
576
AC_SUBST(RCLVERSION)
566
AC_SUBST(RCLLIBVERSION)
577
AC_SUBST(RCLLIBVERSION)
567
578
568
# All object files depend on localdefs which has the cc flags. Avoid
579
# All object files depend on localdefs which has the cc flags. Avoid
569
# changing it unless necessary
580
# changing it unless necessary