diff --git a/INSTALL b/INSTALL index 8950c3de..43eb153c 100644 --- a/INSTALL +++ b/INSTALL @@ -16,13 +16,6 @@ configure has the following medit-specific options: Use this if you experience crashes on startup and you are using Suse 9. - --with-fam whether to use FAM (or gamin) for file monitoring - (default = NO) - FAM seems to work well, but gamin seems to be much less stable. This option - is not recommended if FAM is provided by gamin on your system. - Note that file monitoring will work even without FAM, so it's unlikely you - want to use this option. - --with-python whether to compile python support (default = YES) This option tells whether pygtk bindings should be built. If medit is built without python, then python plugins (builtin terminal and project support in diff --git a/configure.ac b/configure.ac index 91754f55..ac944a5b 100644 --- a/configure.ac +++ b/configure.ac @@ -78,7 +78,6 @@ echo " OS ...................................... $MOO_OS_NAME" echo " use python .............................. $use_python" echo " use xml ................................. $MOO_USE_XML" echo " build pcre library ...................... $MOO_BUILD_PCRE" -echo " use FAM ................................. $MOO_USE_FAM" echo echo " prefix .................................. $prefix" echo " editor lang files go to ................. $MOO_TEXT_LANG_FILES_DIR" diff --git a/m4/moo-fam.m4 b/m4/moo-fam.m4 deleted file mode 100644 index a20ade67..00000000 --- a/m4/moo-fam.m4 +++ /dev/null @@ -1,84 +0,0 @@ -############################################################################## -# _MOO_AC_CHECK_FAM(action-if-found,action-if-not-found) -# -AC_DEFUN_ONCE([_MOO_AC_CHECK_FAM],[ - moo_ac_save_CFLAGS="$CFLAGS" - moo_ac_save_LIBS="$LIBS" - - if test x$FAM_LIBS = x; then - FAM_LIBS=-lfam - fi - - CFLAGS="$CFLAGS $FAM_CFLAGS" - LIBS="$LIBS $FAM_LIBS" - - AC_CHECK_HEADERS(fam.h,[ - AC_CHECK_FUNCS([FAMMonitorDirectory FAMOpen],[fam_found=yes],[fam_found=no]) - ],[fam_found=no]) - - if test x$fam_found != xno; then - AC_SUBST(FAM_CFLAGS) - AC_SUBST(FAM_LIBS) - - AC_MSG_CHECKING(for FAM_CFLAGS) - if test -z $FAM_CFLAGS; then - AC_MSG_RESULT(None) - else - AC_MSG_RESULT($FAM_CFLAGS) - fi - - AC_MSG_CHECKING(for FAM_LIBS) - if test -z $FAM_LIBS; then - AC_MSG_RESULT(None) - else - AC_MSG_RESULT($FAM_LIBS) - fi - - AC_CHECK_DECL([FAMNoExists],[ - AC_DEFINE(HAVE_FAMNOEXISTS, 1, [fam.h has FAMNoExists defined]) - AC_DEFINE(MOO_USE_GAMIN, 1, [whether libfam is provided by gamin]) - ],[],[#include ]) - - MOO_FAM_CFLAGS="$FAM_CFLAGS" - MOO_FAM_LIBS="$FAM_LIBS" - ifelse([$1], , :, [$1]) - else - unset FAM_CFLAGS - unset FAM_LIBS - MOO_FAM_LIBS= - MOO_FAM_CFLAGS= - ifelse([$2], , [AC_MSG_ERROR(libfam not found)], [$2]) - fi - - AC_SUBST(MOO_FAM_CFLAGS) - AC_SUBST(MOO_FAM_LIBS) - CFLAGS="$moo_ac_save_CFLAGS" - LIBS="$moo_ac_save_LIBS" -]) - - -AC_DEFUN_ONCE([MOO_AC_FAM],[ - AC_REQUIRE([MOO_AC_CHECK_OS]) - - AC_ARG_WITH([fam], AC_HELP_STRING([--with-fam], [whether to use fam or gamin for monitoring files in the editor (default = NO)]), [ - if test x$with_fam = "xyes"; then - MOO_USE_FAM="yes" - else - MOO_USE_FAM="no" - fi - ],[ - MOO_USE_FAM="no" - ]) - - if test x$MOO_OS_UNIX = xyes -a x$MOO_USE_FAM = xyes; then - _MOO_AC_CHECK_FAM([moo_has_fam=yes],[moo_has_fam=no]) - if test x$moo_has_fam = xyes; then - MOO_USE_FAM="yes" - AC_DEFINE(MOO_USE_FAM, 1, [use libfam for monitoring files]) - else - AC_MSG_ERROR([FAM or gamin not found.]) - fi - fi - - AM_CONDITIONAL(MOO_USE_FAM, test x$MOO_USE_FAM = "xyes") -]) diff --git a/m4/moo-flags.m4 b/m4/moo-flags.m4 index bfba9016..a22a0a57 100644 --- a/m4/moo-flags.m4 +++ b/m4/moo-flags.m4 @@ -11,7 +11,6 @@ AC_DEFUN_ONCE([MOO_AC_PRIV_FLAGS],[ MOO_AC_FLAGS MOO_AC_FUNCS - MOO_AC_FAM MOO_AC_XML MOO_AC_PCRE MOO_AC_PYTHON @@ -41,12 +40,6 @@ AC_DEFUN_ONCE([MOO_AC_PRIV_FLAGS],[ fi MOO_CFLAGS="-I`cd "$srcdir/doc" && pwd` $MOO_CFLAGS" - - if test x$MOO_USE_FAM = xyes; then - MOO_CFLAGS="$MOO_CFLAGS $MOO_FAM_CFLAGS" - MOO_LIBS="$MOO_LIBS $MOO_FAM_LIBS" - fi - MOO_CXXFLAGS="$MOO_CFLAGS" if $MOO_GCC; then diff --git a/m4/ugly-stamp.m4 b/m4/ugly-stamp.m4 index fb0c522c..cb3550d3 100644 --- a/m4/ugly-stamp.m4 +++ b/m4/ugly-stamp.m4 @@ -7,8 +7,7 @@ bf3d04c32399bca1bbe75282947e1041 moo-version.m4 7e6e4832fed0fed1850ee168e65d9d4f moo-comps.m4 ab00dc3cc5a6899ecd789fa5d5070abd moo-debug.m4 d86d9c0fc3a7e74d0cad083d0b7fee15 moo-dirs.m4 -b565f96116bc6c9837db6eb489c0c172 moo-fam.m4 -3b5f9fe9a72732d13f2483bbcd6c855d moo-flags.m4 +b94f8246a99633b4902a33a33bde0aa3 moo-flags.m4 aae979a52da05cfabfe337509c845a91 moo-funcs.m4 cf9fe469f85df08f35c8fed330680b3e moo-gtk.m4 66b338bc4f134fc00cc0c9dd422fb6b0 moo-i18n.m4 @@ -19,7 +18,7 @@ d5aeeaa47fa88297cc36e17fbbc47102 moo-lib.m4 87cb0e8cdecb72d87d7404eb20546f26 moo-python-cross-mingw.m4 bda375dcb0e9befabf652b123ce042ad moo-python.m4 9b1a1ecc886394e26ba9ff62a057d687 moo-xml.m4 -65286b801f4b3fbf3a078f4fd9857436 configure.ac +9a6c92ed0fba7a76b866a4b8bf16f4df configure.ac ]) AC_DEFUN([UGLY_STAMP],[]) diff --git a/moo.mprj b/moo.mprj index c8a0a628..8b398072 100644 --- a/moo.mprj +++ b/moo.mprj @@ -1,6 +1,6 @@ - mingw + debug build/debug diff --git a/moo/mooapp/mooappabout.c b/moo/mooapp/mooappabout.c index af22c980..60634621 100644 --- a/moo/mooapp/mooappabout.c +++ b/moo/mooapp/mooappabout.c @@ -266,14 +266,6 @@ moo_app_get_system_info (MooApp *app) g_string_append_printf (text, "libxml2: %s\n", LIBXML_DOTTED_VERSION); #endif -#ifdef MOO_USE_FAM -#ifdef MOO_USE_GAMIN - g_string_append_printf (text, "FAM support: gamin\n"); -#else - g_string_append_printf (text, "FAM support: yes\n"); -#endif -#endif - g_string_append (text, "Data dirs: "); dirs = moo_get_data_dirs (MOO_DATA_SHARE, NULL); for (p = dirs; p && *p; ++p) diff --git a/moo/mooutils/moofilewatch.h b/moo/mooutils/moofilewatch.h index 7cac6a50..2b69146d 100644 --- a/moo/mooutils/moofilewatch.h +++ b/moo/mooutils/moofilewatch.h @@ -1,7 +1,7 @@ /* * moofilewatch.h * - * Copyright (C) 2004-2008 by Yevgen Muntyan + * Copyright (C) 2004-2009 by Yevgen Muntyan * * This file is part of medit. medit is free software; you can * redistribute it and/or modify it under the terms of the @@ -13,7 +13,7 @@ * License along with medit. If not, see . */ -/* Files and directory monitor. Uses FAM if present, or stat() otherwise. +/* Files and directory monitor. Uses stat(). On win32 does FindFirstChangeNotification and ReadDirectoryChangesW. */ #ifndef MOO_FILE_WATCH_H