Switch to unified view

a/src/configure.ac b/src/configure.ac
...
...
91
   AC_MSG_ERROR([Cannot find the qmake program. Maybe you need to install
91
   AC_MSG_ERROR([Cannot find the qmake program. Maybe you need to install
92
it and/or set the QTDIR environment variable?])
92
it and/or set the QTDIR environment variable?])
93
fi
93
fi
94
94
95
cd qtgui
95
cd qtgui
96
# We just want a .pro file: no problem with unsubstituted variables
97
cp recoll.pro.in recoll.pro
96
${QMAKE} recoll.pro
98
${QMAKE} recoll.pro
97
if test $? != 0 ; then
99
if test $? != 0 ; then
98
   AC_MSG_ERROR([Cannot use qmake to generate a Makefile. Maybe you need to
100
   AC_MSG_ERROR([Cannot use qmake to generate a Makefile. Maybe you need to
99
check the QTDIR and QMAKESPEC environment variables?])
101
check the QTDIR and QMAKESPEC environment variables?])
100
fi
102
fi
...
...
106
installation. If there is no default mkspecs, you should also set QMAKESPEC])
108
installation. If there is no default mkspecs, you should also set QMAKESPEC])
107
   fi
109
   fi
108
fi
110
fi
109
cd ..
111
cd ..
110
112
113
##################### End QT detection
114
115
# We have to expand prefix in here, couldn't find a way to do it inside 
116
# the qt gui .pro file or Makefile. This just means that you can't change
117
# prefix at build time. It works at install time because we dont' use the
118
# qtgui Makefile
119
m_prefix=$prefix
120
test "X$m_prefix" = "XNONE" && m_prefix=/usr/local
121
m_datadir=${m_prefix}/share
122
QTRECOLL_DATADIR=${m_datadir}
123
111
AC_SUBST(LIBXAPIAN)
124
AC_SUBST(LIBXAPIAN)
112
AC_SUBST(XAPIANCXXFLAGS)
125
AC_SUBST(XAPIANCXXFLAGS)
113
AC_SUBST(LIBICONV)
126
AC_SUBST(LIBICONV)
114
AC_SUBST(INCICONV)
127
AC_SUBST(INCICONV)
128
AC_SUBST(QTRECOLL_DATADIR)
115
129
116
AC_CONFIG_FILES(mk/localdefs)
130
AC_CONFIG_FILES(mk/localdefs)
117
AC_CONFIG_FILES(recollinstall)
131
AC_CONFIG_FILES(recollinstall)
118
AC_CONFIG_FILES(sampleconf/recoll.conf)
132
AC_CONFIG_FILES(sampleconf/recoll.conf)
119
AC_CONFIG_FILES(Makefile)
133
AC_CONFIG_FILES(Makefile)
134
AC_CONFIG_FILES(qtgui/recoll.pro)
120
135
121
for d in bincimapmime index lib query
136
for d in bincimapmime index lib query
122
do 
137
do 
123
    rm -f $d/alldeps.stamp
138
    rm -f $d/alldeps.stamp
124
    cp -f /dev/null $d/alldeps
139
    cp -f /dev/null $d/alldeps