To: vim-dev@vim.org Subject: Patch 6.2f.021 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.2f.021 Problem: Running configure with "--enable-netbeans" disables Netbeans. (Gordon Prieur) Solution: Fix the tests in configure.in where the default is to enable a feature. Fix that "--enable-acl" reported "yes" confusingly. Files: src/auto/configure, src/configure.in, src/mysign *** ../vim-6.2f.020/src/auto/configure Tue May 27 19:34:54 2003 --- src/auto/configure Thu May 29 15:57:57 2003 *************** *** 1395,1429 **** # Check whether --enable-xsmp or --disable-xsmp was given. if test "${enable_xsmp+set}" = set; then enableval="$enable_xsmp" ! disable_xsmp="yes" else ! disable_xsmp="no" fi - echo "$ac_t""$disable_xsmp" 1>&6 ! if test "x$disable_xsmp" = "xno"; then echo $ac_n "checking --disable-xsmp-interact argument""... $ac_c" 1>&6 echo "configure:1408: checking --disable-xsmp-interact argument" >&5 # Check whether --enable-xsmp-interact or --disable-xsmp-interact was given. if test "${enable_xsmp_interact+set}" = set; then enableval="$enable_xsmp_interact" ! disable_xsmp_interact="yes" else ! disable_xsmp_interact="no" fi ! echo "$ac_t""$disable_xsmp_interact" 1>&6 ! if test "$disable_xsmp_interact" = "no"; then cat >> confdefs.h <<\EOF #define USE_XSMP_INTERACT 1 EOF fi fi echo $ac_n "checking --enable-perlinterp argument""... $ac_c" 1>&6 ! echo "configure:1427: checking --enable-perlinterp argument" >&5 # Check whether --enable-perlinterp or --disable-perlinterp was given. if test "${enable_perlinterp+set}" = set; then enableval="$enable_perlinterp" --- 1395,1433 ---- # Check whether --enable-xsmp or --disable-xsmp was given. if test "${enable_xsmp+set}" = set; then enableval="$enable_xsmp" ! : else ! enable_xsmp="yes" fi ! if test "$enable_xsmp" = "yes"; then ! echo "$ac_t""no" 1>&6 echo $ac_n "checking --disable-xsmp-interact argument""... $ac_c" 1>&6 echo "configure:1408: checking --disable-xsmp-interact argument" >&5 # Check whether --enable-xsmp-interact or --disable-xsmp-interact was given. if test "${enable_xsmp_interact+set}" = set; then enableval="$enable_xsmp_interact" ! : else ! enable_xsmp_interact="yes" fi ! if test "$enable_xsmp_interact" = "yes"; then ! echo "$ac_t""no" 1>&6 cat >> confdefs.h <<\EOF #define USE_XSMP_INTERACT 1 EOF + else + echo "$ac_t""yes" 1>&6 fi + else + echo "$ac_t""yes" 1>&6 fi echo $ac_n "checking --enable-perlinterp argument""... $ac_c" 1>&6 ! echo "configure:1431: checking --enable-perlinterp argument" >&5 # Check whether --enable-perlinterp or --disable-perlinterp was given. if test "${enable_perlinterp+set}" = set; then enableval="$enable_perlinterp" *************** *** 2103,2123 **** fi echo $ac_n "checking --disable-netbeans argument""... $ac_c" 1>&6 ! echo "configure:2107: checking --disable-netbeans argument" >&5 # Check whether --enable-netbeans or --disable-netbeans was given. if test "${enable_netbeans+set}" = set; then enableval="$enable_netbeans" ! disable_netbeans="yes" else ! disable_netbeans="no" fi ! echo "$ac_t""$disable_netbeans" 1>&6 ! if test "$disable_netbeans" = "no"; then echo $ac_n "checking whether compiling netbeans integration is possible""... $ac_c" 1>&6 ! echo "configure:2119: checking whether compiling netbeans integration is possible" >&5 cat > conftest.$ac_ext < --- 2107,2127 ---- fi echo $ac_n "checking --disable-netbeans argument""... $ac_c" 1>&6 ! echo "configure:2111: checking --disable-netbeans argument" >&5 # Check whether --enable-netbeans or --disable-netbeans was given. if test "${enable_netbeans+set}" = set; then enableval="$enable_netbeans" ! : else ! enable_netbeans="yes" fi ! if test "$enable_netbeans" = "yes"; then ! echo "$ac_t""no" 1>&6 echo $ac_n "checking whether compiling netbeans integration is possible""... $ac_c" 1>&6 ! echo "configure:2123: checking whether compiling netbeans integration is possible" >&5 cat > conftest.$ac_ext < *************** *** 2156,2173 **** ; return 0; } EOF ! if { (eval echo configure:2160: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* ! echo "$ac_t""no" 1>&6; disable_netbeans="yes" fi rm -f conftest* fi ! if test "$disable_netbeans" = "no"; then cat >> confdefs.h <<\EOF #define FEAT_NETBEANS_INTG 1 EOF --- 2160,2179 ---- ; return 0; } EOF ! if { (eval echo configure:2164: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* ! echo "$ac_t""no" 1>&6; enable_netbeans="no" fi rm -f conftest* + else + echo "$ac_t""yes" 1>&6 fi ! if test "$enable_netbeans" = "yes"; then cat >> confdefs.h <<\EOF #define FEAT_NETBEANS_INTG 1 EOF *************** *** 4494,4517 **** fi ! if test "x$disable_xsmp" = "xno"; then cppflags_save=$CPPFLAGS CPPFLAGS="$CPPFLAGS $X_CFLAGS" for ac_hdr in X11/SM/SMlib.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 ! echo "configure:4505: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ! { (eval echo configure:4515: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* --- 4500,4523 ---- fi ! if test "$enable_xsmp" = "yes"; then cppflags_save=$CPPFLAGS CPPFLAGS="$CPPFLAGS $X_CFLAGS" for ac_hdr in X11/SM/SMlib.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 ! echo "configure:4511: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ! { (eval echo configure:4521: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* *************** *** 6595,6613 **** rm -f conftest* echo $ac_n "checking --disable-acl argument""... $ac_c" 1>&6 ! echo "configure:6599: checking --disable-acl argument" >&5 # Check whether --enable-acl or --disable-acl was given. if test "${enable_acl+set}" = set; then enableval="$enable_acl" ! echo "$ac_t""yes" 1>&6 else ! enable_acl="yes"; echo "$ac_t""no" 1>&6 fi if test "$enable_acl" = "yes"; then ! echo $ac_n "checking for acl_get_file in -lposix1e""... $ac_c" 1>&6 ! echo "configure:6611: checking for acl_get_file in -lposix1e" >&5 ac_lib_var=`echo posix1e'_'acl_get_file | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 --- 6601,6619 ---- rm -f conftest* echo $ac_n "checking --disable-acl argument""... $ac_c" 1>&6 ! echo "configure:6605: checking --disable-acl argument" >&5 # Check whether --enable-acl or --disable-acl was given. if test "${enable_acl+set}" = set; then enableval="$enable_acl" ! : else ! enable_acl="yes" fi if test "$enable_acl" = "yes"; then ! echo "$ac_t""no" 1>&6 echo $ac_n "checking for acl_get_file in -lposix1e""... $ac_c" 1>&6 ! echo "configure:6617: checking for acl_get_file in -lposix1e" >&5 ac_lib_var=`echo posix1e'_'acl_get_file | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 *************** *** 6824,6833 **** echo "$ac_t""no" 1>&6 fi rm -f conftest* fi echo $ac_n "checking --disable-gpm argument""... $ac_c" 1>&6 ! echo "configure:6831: checking --disable-gpm argument" >&5 # Check whether --enable-gpm or --disable-gpm was given. if test "${enable_gpm+set}" = set; then enableval="$enable_gpm" --- 6830,6841 ---- echo "$ac_t""no" 1>&6 fi rm -f conftest* + else + echo "$ac_t""yes" 1>&6 fi echo $ac_n "checking --disable-gpm argument""... $ac_c" 1>&6 ! echo "configure:6839: checking --disable-gpm argument" >&5 # Check whether --enable-gpm or --disable-gpm was given. if test "${enable_gpm+set}" = set; then enableval="$enable_gpm" *** ../vim-6.2f.020/src/configure.in Wed May 28 20:13:11 2003 --- src/configure.in Thu May 29 15:53:41 2003 *************** *** 1,7 **** dnl configure.in: autoconf script for Vim dnl Process this file with autoconf 2.12 or 2.13 to produce "configure". ! dnl Might also work with autoconf 2.57 or later. AC_INIT(vim.h) AC_CONFIG_HEADER(auto/config.h:config.h.in) --- 1,7 ---- dnl configure.in: autoconf script for Vim dnl Process this file with autoconf 2.12 or 2.13 to produce "configure". ! dnl Should also work with autoconf 2.54 and later. AC_INIT(vim.h) AC_CONFIG_HEADER(auto/config.h:config.h.in) *************** *** 228,245 **** AC_MSG_CHECKING(--disable-xsmp argument) AC_ARG_ENABLE(xsmp, [ --disable-xsmp Disable XSMP session management], ! disable_xsmp="yes", disable_xsmp="no") ! AC_MSG_RESULT($disable_xsmp) ! if test "x$disable_xsmp" = "xno"; then AC_MSG_CHECKING(--disable-xsmp-interact argument) AC_ARG_ENABLE(xsmp-interact, [ --disable-xsmp-interact Disable XSMP interaction], ! disable_xsmp_interact="yes", disable_xsmp_interact="no") ! AC_MSG_RESULT($disable_xsmp_interact) ! if test "$disable_xsmp_interact" = "no"; then AC_DEFINE(USE_XSMP_INTERACT) fi fi AC_MSG_CHECKING(--enable-perlinterp argument) --- 228,249 ---- AC_MSG_CHECKING(--disable-xsmp argument) AC_ARG_ENABLE(xsmp, [ --disable-xsmp Disable XSMP session management], ! , enable_xsmp="yes") ! if test "$enable_xsmp" = "yes"; then ! AC_MSG_RESULT(no) AC_MSG_CHECKING(--disable-xsmp-interact argument) AC_ARG_ENABLE(xsmp-interact, [ --disable-xsmp-interact Disable XSMP interaction], ! , enable_xsmp_interact="yes") ! if test "$enable_xsmp_interact" = "yes"; then ! AC_MSG_RESULT(no) AC_DEFINE(USE_XSMP_INTERACT) + else + AC_MSG_RESULT(yes) fi + else + AC_MSG_RESULT(yes) fi AC_MSG_CHECKING(--enable-perlinterp argument) *************** *** 623,631 **** AC_MSG_CHECKING(--disable-netbeans argument) AC_ARG_ENABLE(netbeans, [ --disable-netbeans Disable NetBeans integration support.], ! [disable_netbeans="yes"], [disable_netbeans="no"]) ! AC_MSG_RESULT($disable_netbeans) ! if test "$disable_netbeans" = "no"; then AC_MSG_CHECKING(whether compiling netbeans integration is possible) AC_TRY_LINK([ #include --- 627,635 ---- AC_MSG_CHECKING(--disable-netbeans argument) AC_ARG_ENABLE(netbeans, [ --disable-netbeans Disable NetBeans integration support.], ! , [enable_netbeans="yes"]) ! if test "$enable_netbeans" = "yes"; then ! AC_MSG_RESULT(no) AC_MSG_CHECKING(whether compiling netbeans integration is possible) AC_TRY_LINK([ #include *************** *** 661,669 **** (void)connect(1, (struct sockaddr *)&server, sizeof(server)); ], AC_MSG_RESULT(yes), ! AC_MSG_RESULT(no); disable_netbeans="yes") fi ! if test "$disable_netbeans" = "no"; then AC_DEFINE(FEAT_NETBEANS_INTG) NETBEANS_SRC="netbeans.c" AC_SUBST(NETBEANS_SRC) --- 665,675 ---- (void)connect(1, (struct sockaddr *)&server, sizeof(server)); ], AC_MSG_RESULT(yes), ! AC_MSG_RESULT(no); enable_netbeans="no") ! else ! AC_MSG_RESULT(yes) fi ! if test "$enable_netbeans" = "yes"; then AC_DEFINE(FEAT_NETBEANS_INTG) NETBEANS_SRC="netbeans.c" AC_SUBST(NETBEANS_SRC) *************** *** 1481,1487 **** dnl Look for XSMP support - but don't necessarily restrict it to X11 GUIs dnl use the X11 include path ! if test "x$disable_xsmp" = "xno"; then cppflags_save=$CPPFLAGS CPPFLAGS="$CPPFLAGS $X_CFLAGS" AC_CHECK_HEADERS(X11/SM/SMlib.h) --- 1487,1493 ---- dnl Look for XSMP support - but don't necessarily restrict it to X11 GUIs dnl use the X11 include path ! if test "$enable_xsmp" = "yes"; then cppflags_save=$CPPFLAGS CPPFLAGS="$CPPFLAGS $X_CFLAGS" AC_CHECK_HEADERS(X11/SM/SMlib.h) *************** *** 2049,2058 **** AC_MSG_CHECKING(--disable-acl argument) AC_ARG_ENABLE(acl, [ --disable-acl Don't check for ACL support.], ! AC_MSG_RESULT(yes), ! [enable_acl="yes"; AC_MSG_RESULT(no)]) if test "$enable_acl" = "yes"; then ! AC_CHECK_LIB(posix1e, acl_get_file, [LIBS="$LIBS -lposix1e"], AC_CHECK_LIB(acl, acl_get_file, [LIBS="$LIBS -lacl" AC_CHECK_LIB(attr, fgetxattr, LIBS="$LIBS -lattr",,)],,),) --- 2055,2063 ---- AC_MSG_CHECKING(--disable-acl argument) AC_ARG_ENABLE(acl, [ --disable-acl Don't check for ACL support.], ! , [enable_acl="yes"]) if test "$enable_acl" = "yes"; then ! AC_MSG_RESULT(no) AC_CHECK_LIB(posix1e, acl_get_file, [LIBS="$LIBS -lposix1e"], AC_CHECK_LIB(acl, acl_get_file, [LIBS="$LIBS -lacl" AC_CHECK_LIB(attr, fgetxattr, LIBS="$LIBS -lattr",,)],,),) *************** *** 2097,2102 **** --- 2102,2109 ---- ], AC_MSG_RESULT(yes); AC_DEFINE(HAVE_AIX_ACL), AC_MSG_RESULT(no)) + else + AC_MSG_RESULT(yes) fi AC_MSG_CHECKING(--disable-gpm argument) *** ../vim-6.2f.020/src/mysign Tue May 27 21:19:25 2003 --- src/mysign Thu May 29 15:58:29 2003 *************** *** 1 **** ! =auto/configure-lastupdate=1054056925.22=configure.in@md5=dda1fe31560c2b4300654fe6e96af738-@buildcheck=c7bb07412506d84ecec6b8e4c397d406 --- 1 ---- ! =auto/configure-lastupdate=1054216677.89=configure.in@md5=1b4f4c3e67450afa57e5ae9656900954-@buildcheck=c7bb07412506d84ecec6b8e4c397d406 *** ../vim-6.2f.020/src/version.c Thu May 29 14:09:53 2003 --- src/version.c Thu May 29 15:36:41 2003 *************** *** 632,633 **** --- 632,635 ---- { /* Add new patch number below this line */ + /**/ + 21, /**/ -- hundred-and-one symptoms of being an internet addict: 27. You refer to your age as 3.x. /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// Creator of Vim - Vi IMproved -- http://www.Vim.org \\\ \\\ Project leader for A-A-P -- http://www.A-A-P.org /// \\\ Help AIDS victims, buy at Amazon -- http://ICCF.nl/click1.html ///