- AC_PATH_PROG([WIX_CANDLE], [candle], ,
- [/c/Program\ Files/Windows\ Installer\ XML\ v3.5/bin$PATH_SEPARATOR$PATH])
- AC_PATH_PROG([WIX_LIGHT], [light], ,
- [/c/Program\ Files/Windows\ Installer\ XML\ v3.5/bin$PATH_SEPARATOR$PATH])
+ AC_PATH_PROG([WIX_CANDLE], [candle], no,
+ [/c/Program\ Files/Windows\ Installer\ XML\ v3.5/bin$PATH_SEPARATOR/c/Program\ Files\ \(x86\)/Windows\ Installer\ XML\ v3.5/bin$PATH_SEPARATOR$PATH])
+ AC_PATH_PROG([WIX_LIGHT], [light], no,
+ [/c/Program\ Files/Windows\ Installer\ XML\ v3.5/bin$PATH_SEPARATOR/c/Program\ Files\ \(x86\)/Windows\ Installer\ XML\ v3.5/bin$PATH_SEPARATOR$PATH])
+
+ if test "$WIX_CANDLE" = "no" || test "$WIX_LIGHT" = "no"; then
+ AC_MSG_WARN([
+*** Could not find the Windows Installer XML tools. These are required
+*** for the 'make installer' target. Use the WIX_CANDLE and WIX_LIGHT
+*** environment variables to pass their locations if they are outside
+*** the PATH.])
+ fi
+fi
+
+if test "$linux" = "yes"; then
+ AC_PATH_PROG([UPDATE_MIME_DATABASE], [update-mime-database], [no])
+ if test "$UPDATE_MIME_DATABASE" = "no"; then
+ AC_MSG_ERROR([
+*** Could not find the Freedesktop.org mime database update tool.
+*** Web provisioning files could not be automatically installed.])
+ fi
+ AC_PATH_PROG([UPDATE_DESKTOP_DATABASE], [update-desktop-database], [no])
+ if test "$UPDATE_DESKTOP_DATABASE" = "no"; then
+ AC_MSG_ERROR([
+*** Could not find the Freedesktop.org desktop entry database update
+*** tool. Web provisioning files could not be automatically installed.])
+ fi