Mercurial > vim
comparison src/configure.in @ 7743:6069f43cea4e v7.4.1169
commit https://github.com/vim/vim/commit/e0874f8cbcddfcf9965a85ba35199964efb1d01a
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Jan 24 20:36:41 2016 +0100
patch 7.4.1169
Problem: The socket I/O is intertwined with the netbeans code.
Solution: Start refactoring the netbeans communication to split off the
socket I/O. Add the +channel feature.
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Sun, 24 Jan 2016 20:45:05 +0100 |
parents | 6157052a0e58 |
children | 3a1b60f5e89b |
comparison
equal
deleted
inserted
replaced
7742:5f6f35a3cb12 | 7743:6069f43cea4e |
---|---|
1936 AC_ARG_ENABLE(netbeans, | 1936 AC_ARG_ENABLE(netbeans, |
1937 [ --disable-netbeans Disable NetBeans integration support.], | 1937 [ --disable-netbeans Disable NetBeans integration support.], |
1938 , [enable_netbeans="yes"]) | 1938 , [enable_netbeans="yes"]) |
1939 if test "$enable_netbeans" = "yes"; then | 1939 if test "$enable_netbeans" = "yes"; then |
1940 AC_MSG_RESULT(no) | 1940 AC_MSG_RESULT(no) |
1941 else | |
1942 AC_MSG_RESULT(yes) | |
1943 fi | |
1944 | |
1945 AC_MSG_CHECKING(--disable-channel argument) | |
1946 AC_ARG_ENABLE(channel, | |
1947 [ --disable-channel Disable process communication support.], | |
1948 , [enable_channel="yes"]) | |
1949 if test "$enable_channel" = "yes"; then | |
1950 AC_MSG_RESULT(no) | |
1951 else | |
1952 if test "$enable_netbeans" = "yes"; then | |
1953 AC_MSG_RESULT(yes, netbeans also disabled) | |
1954 enable_netbeans="no" | |
1955 else | |
1956 AC_MSG_RESULT(yes) | |
1957 fi | |
1958 fi | |
1959 | |
1960 if "$enable_channel" = "yes"; then | |
1941 dnl On Solaris we need the socket and nsl library. | 1961 dnl On Solaris we need the socket and nsl library. |
1942 AC_CHECK_LIB(socket, socket) | 1962 AC_CHECK_LIB(socket, socket) |
1943 AC_CHECK_LIB(nsl, gethostbyname) | 1963 AC_CHECK_LIB(nsl, gethostbyname) |
1944 AC_MSG_CHECKING(whether compiling netbeans integration is possible) | 1964 AC_MSG_CHECKING(whether compiling with process communication is possible) |
1945 AC_TRY_LINK([ | 1965 AC_TRY_LINK([ |
1946 #include <stdio.h> | 1966 #include <stdio.h> |
1947 #include <stdlib.h> | 1967 #include <stdlib.h> |
1948 #include <stdarg.h> | 1968 #include <stdarg.h> |
1949 #include <fcntl.h> | 1969 #include <fcntl.h> |
1965 (void)gethostbyname("microsoft.com"); | 1985 (void)gethostbyname("microsoft.com"); |
1966 if (errno == ECONNREFUSED) | 1986 if (errno == ECONNREFUSED) |
1967 (void)connect(1, (struct sockaddr *)&server, sizeof(server)); | 1987 (void)connect(1, (struct sockaddr *)&server, sizeof(server)); |
1968 ], | 1988 ], |
1969 AC_MSG_RESULT(yes), | 1989 AC_MSG_RESULT(yes), |
1970 AC_MSG_RESULT(no); enable_netbeans="no") | 1990 AC_MSG_RESULT(no); enable_netbeans="no"; enable_channel="no") |
1971 else | |
1972 AC_MSG_RESULT(yes) | |
1973 fi | 1991 fi |
1974 if test "$enable_netbeans" = "yes"; then | 1992 if test "$enable_netbeans" = "yes"; then |
1975 AC_DEFINE(FEAT_NETBEANS_INTG) | 1993 AC_DEFINE(FEAT_NETBEANS_INTG) |
1976 NETBEANS_SRC="netbeans.c" | 1994 NETBEANS_SRC="netbeans.c" |
1977 AC_SUBST(NETBEANS_SRC) | 1995 AC_SUBST(NETBEANS_SRC) |
1978 NETBEANS_OBJ="objects/netbeans.o" | 1996 NETBEANS_OBJ="objects/netbeans.o" |
1979 AC_SUBST(NETBEANS_OBJ) | 1997 AC_SUBST(NETBEANS_OBJ) |
1998 fi | |
1999 if test "$enable_channel" = "yes"; then | |
2000 AC_DEFINE(FEAT_CHANNEL) | |
2001 CHANNEL_SRC="channel.c" | |
2002 AC_SUBST(CHANNEL_SRC) | |
2003 CHANNEL_OBJ="objects/channel.o" | |
2004 AC_SUBST(CHANNEL_OBJ) | |
1980 fi | 2005 fi |
1981 | 2006 |
1982 AC_MSG_CHECKING(--enable-sniff argument) | 2007 AC_MSG_CHECKING(--enable-sniff argument) |
1983 AC_ARG_ENABLE(sniff, | 2008 AC_ARG_ENABLE(sniff, |
1984 [ --enable-sniff Include Sniff interface.], , | 2009 [ --enable-sniff Include Sniff interface.], , |