Switch to unified view

a/src/configure.ac b/src/configure.ac
...
...
458
    else
458
    else
459
       AC_MSG_NOTICE([using qt version 5 user interface])
459
       AC_MSG_NOTICE([using qt version 5 user interface])
460
    fi
460
    fi
461
    QTGUI=qtgui
461
    QTGUI=qtgui
462
  fi
462
  fi
463
  
464
  cd $QTGUI
465
  # We just want a .pro file: no problem with unsubstituted variables at 
466
  # this point.
467
  test -f recoll.pro && chmod +w recoll.pro
468
  cp recoll.pro.in recoll.pro
469
  #echo QMAKE ${QMAKE}
470
  ${QMAKE} PREFIX=${prefix} recoll.pro
471
  if test $? != 0 ; then
472
     AC_MSG_ERROR([Cannot use qmake to generate a Makefile. Maybe you need to
473
  check the QTDIR and QMAKESPEC environment variables?])
474
  fi
475
  # is QTDIR set and do we actually need it ?
476
  if test X$QTDIR = X ; then
477
     QTDIRNEEDED=`grep INCPATH Makefile | grep = | grep QTDIR`
478
     if test "X$QTDIRNEEDED" != "X" ; then
479
         AC_MSG_ERROR([You need to set the QTDIR variable to point to the QT
480
  installation. If there is no default mkspecs, you should also set QMAKESPEC])
481
     fi
482
  fi
483
  rm -f Makefile recoll.pro
484
  cd ..
485
463
486
464
487
 ##### Using Qt webkit for reslist display? Else Qt textbrowser
465
 ##### Using Qt webkit for reslist display? Else Qt textbrowser
488
  AC_ARG_ENABLE(webkit,
466
  AC_ARG_ENABLE(webkit,
489
    AC_HELP_STRING([--disable-webkit],
467
    AC_HELP_STRING([--disable-webkit],
...
...
584
# 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
585
# changing it unless necessary
563
# changing it unless necessary
586
AC_CONFIG_FILES(Makefile)
564
AC_CONFIG_FILES(Makefile)
587
AC_CONFIG_FILES(common/rclversion.h)
565
AC_CONFIG_FILES(common/rclversion.h)
588
AC_CONFIG_FILES(python/recoll/setup.py)
566
AC_CONFIG_FILES(python/recoll/setup.py)
567
AC_CONFIG_FILES(python/recoll/Makefile)
589
568
590
AC_OUTPUT
569
AC_OUTPUT