Moved mimedir definition into AM_MIME_MK

This commit is contained in:
Yevgen Muntyan 2008-05-23 16:39:49 -05:00
parent 9a31004742
commit 7085338d7c
2 changed files with 4 additions and 3 deletions

View File

@ -15,9 +15,6 @@ AC_DEFUN_ONCE([MOO_AC_SET_DIRS],[
MOO_LIB_DIR="${libdir}/$MOO_PACKAGE_NAME" MOO_LIB_DIR="${libdir}/$MOO_PACKAGE_NAME"
AC_SUBST(MOO_LIB_DIR) AC_SUBST(MOO_LIB_DIR)
mimedir="${datadir}/mime"
AC_SUBST(mimedir)
MOO_PLUGINS_DIR="${MOO_LIB_DIR}/plugins" MOO_PLUGINS_DIR="${MOO_LIB_DIR}/plugins"
AC_SUBST(MOO_PLUGINS_DIR) AC_SUBST(MOO_PLUGINS_DIR)

View File

@ -1,11 +1,15 @@
AC_DEFUN_ONCE([MOO_AM_MIME_MK],[ AC_DEFUN_ONCE([MOO_AM_MIME_MK],[
MOO_ENABLE_GENERATED_FILES="yes" MOO_ENABLE_GENERATED_FILES="yes"
AC_ARG_ENABLE(generated-files, AC_ARG_ENABLE(generated-files,
AC_HELP_STRING([--enable-generated-files],[run update-mime-database and gtk-update-icon-cache on install (default = YES)]),[ AC_HELP_STRING([--enable-generated-files],[run update-mime-database and gtk-update-icon-cache on install (default = YES)]),[
if test "x$enable_generated_files" = "xno"; then if test "x$enable_generated_files" = "xno"; then
MOO_ENABLE_GENERATED_FILES="no" MOO_ENABLE_GENERATED_FILES="no"
fi ]) fi ])
AM_CONDITIONAL(MOO_ENABLE_GENERATED_FILES, test x$MOO_ENABLE_GENERATED_FILES = "xyes") AM_CONDITIONAL(MOO_ENABLE_GENERATED_FILES, test x$MOO_ENABLE_GENERATED_FILES = "xyes")
mimedir="${datadir}/mime"
AC_SUBST(mimedir)
]) ])
AC_DEFUN_ONCE([MOO_AM_RC_MK],[ AC_DEFUN_ONCE([MOO_AM_RC_MK],[