Switch to unified view

a/src/configure.ac b/src/configure.ac
...
...
95
   AC_MSG_ERROR([$fileProg does not exist or is not executable])
95
   AC_MSG_ERROR([$fileProg does not exist or is not executable])
96
fi
96
fi
97
AC_DEFINE_UNQUOTED(FILE_PROG, "$fileProg", [Path to the file program])
97
AC_DEFINE_UNQUOTED(FILE_PROG, "$fileProg", [Path to the file program])
98
98
99
# Can't use Solaris standard 'file' command, it doesn't support -i
99
# Can't use Solaris standard 'file' command, it doesn't support -i
100
if test X$sys != XSunOS -o X$fileProg != X/usr/bin/file; then
100
AC_DEFINE(USE_SYSTEM_FILE_COMMAND, 1,
101
   AC_DEFINE(USE_SYSTEM_FILE_COMMAND, 1, [Enable using the system's 'file' command to id mime if we fail internally])
101
    [Enable using the system's 'file' command to id mime if we fail internally])
102
fi
103
104
102
105
# Use aspell to provide spelling expansions ?
103
# Use aspell to provide spelling expansions ?
106
# The default is yes. If we do find an aspell installation, we use it. Else
104
# The default is yes. If we do find an aspell installation, we use it. Else
107
# we do compile the aspell module using an internal copy of aspell.h
105
# we do compile the aspell module using an internal copy of aspell.h
108
# Only --with-aspell=no will completely disable aspell support
106
# Only --with-aspell=no will completely disable aspell support
...
...
239
if test X$camelcaseEnabled = Xyes ; then
237
if test X$camelcaseEnabled = Xyes ; then
240
  AC_DEFINE(RCL_SPLIT_CAMELCASE, 1, [Split camelCase words])
238
  AC_DEFINE(RCL_SPLIT_CAMELCASE, 1, [Split camelCase words])
241
fi
239
fi
242
240
243
# Disable building the python module.
241
# Disable building the python module.
244
if test X$sys != XDarwin ; then
245
  AC_ARG_ENABLE(python-module,
242
AC_ARG_ENABLE(python-module,
246
    AC_HELP_STRING([--disable-python-module],
243
    AC_HELP_STRING([--disable-python-module],
247
    [Do not build the Python module.]),
244
    [Do not build the Python module.]),
248
        pythonEnabled=$enableval, pythonEnabled=yes)
245
        pythonEnabled=$enableval, pythonEnabled=yes)
249
else
250
  pythonEnabled=no
251
fi
252
246
253
AM_CONDITIONAL(MAKEPYTHON, [test X$pythonEnabled = Xyes])
247
AM_CONDITIONAL(MAKEPYTHON, [test X$pythonEnabled = Xyes])
254
248
255
# Disable building the libchm python wrapper
249
# Disable building the libchm python wrapper
256
AC_ARG_ENABLE(python-chm, AC_HELP_STRING([--disable-python-chm],
250
AC_ARG_ENABLE(python-chm, AC_HELP_STRING([--disable-python-chm],
...
...
400
     AC_MSG_ERROR([Cannot find the qmake program. Maybe you need to install
394
     AC_MSG_ERROR([Cannot find the qmake program. Maybe you need to install
401
  qt development files and tools and/or set the QTDIR environment variable?])
395
  qt development files and tools and/or set the QTDIR environment variable?])
402
  fi
396
  fi
403
  QMAKE=$QMAKEPATH
397
  QMAKE=$QMAKEPATH
404
  
398
  
405
  # MAC OS X: we don't support this (the native search tool is more than
406
  # good enough), but we make things work just enough so that the program can
407
  # be compiled and roughly installed (not as a .app, but to /usr/local),
408
  # basically to enable using a Macbook for development
409
  if test X$sys = XDarwin ; then
410
     # The default is xcode
411
     QMAKE="${QMAKE} -spec macx-g++"
412
  fi
413
  
414
  # Check Qt version
399
  # Check Qt version
415
  qmakevers="`${QMAKE} --version 2>&1`"
400
  qmakevers="`${QMAKE} --version 2>&1`"
416
  #echo "qmake version: $qmakevers"
401
  #echo "qmake version: $qmakevers"
417
  v4=`expr "$qmakevers" : '.*Qt[ ][ ]*version[ ][ ]*4.*'`
402
  v4=`expr "$qmakevers" : '.*Qt[ ][ ]*version[ ][ ]*4.*'`
418
  v5=`expr "$qmakevers" : '.*Qt[ ][ ]*version[ ][ ]*5.*'`
403
  v5=`expr "$qmakevers" : '.*Qt[ ][ ]*version[ ][ ]*5.*'`