Fix typo in comment.

[bpt/emacs.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index f23a933..52cc165 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -86,7 +86,7 @@ AC_DEFUN([OPTION_DEFAULT_OFF], [dnl
 ])dnl
 
 dnl OPTION_DEFAULT_ON(NAME, HELP-STRING)
-dnl Create a new --with option that defaults to $enable_features.
+dnl Create a new --with option that defaults to $with_features.
 dnl NAME is the base name of the option.  The shell variable with_NAME
 dnl   will be set either to 'no' (for a plain --without-NAME) or to
 dnl   'yes' (if the option is not specified).  Note that the shell
@@ -216,7 +216,7 @@ this option's value should be `yes', `no', `gfile', `inotify' or `w32'.
    esac
    with_file_notification=$val
  ],
- [with_file_notification=yes])
+ [with_file_notification=$with_features])
 
 ## For the times when you want to build Emacs but don't have
 ## a suitable makeinfo, and can live without the manuals.
@@ -2317,7 +2317,9 @@ if test "${with_file_notification}" = "yes"; then
    if test "${opsys}" = "mingw32"; then
       with_file_notification=w32
    else
-      with_file_notification=gfile
+      if test "${with_ns}" != yes; then
+        with_file_notification=gfile
+      fi
    fi
 fi
 
@@ -3627,7 +3629,9 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM(
 AC_MSG_RESULT([$links_glib])
 if test "${links_glib}" = "yes"; then
   AC_DEFINE(HAVE_GLIB, 1, [Define to 1 if GLib is linked in.])
-  XGSELOBJ=xgselect.o
+  if test "$HAVE_NS" = no;then
+    XGSELOBJ=xgselect.o
+  fi
 fi
 AC_SUBST(XGSELOBJ)