Changeset 15732 for trunk/base/configure


Ignore:
Timestamp:
Jan 7, 2006, 11:12:00 PM (15 years ago)
Author:
jberry
Message:

Merge configuration changes from jberry-preview-13

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/base/configure

    r14474 r15732  
    43844384
    43854385
    4386 for ac_header in limits.h paths.h sys/file.h crt_externs.h fcntl.h sys/fcntl.h sys/cdefs.h err.h libgen.h sys/socket.h
     4386
     4387
     4388for ac_header in limits.h paths.h sys/file.h crt_externs.h fcntl.h sys/fcntl.h sys/cdefs.h err.h libgen.h sys/socket.h \
     4389        readline/readline.h readline/history.h
    43874390do
    43884391as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
     
    76037606                        ;;
    76047607        esac
     7608
     7609
     7610
     7611# Check for readline
     7612
     7613echo "$as_me:$LINENO: checking for readline in -lreadline" >&5
     7614echo $ECHO_N "checking for readline in -lreadline... $ECHO_C" >&6
     7615if test "${ac_cv_lib_readline_readline+set}" = set; then
     7616  echo $ECHO_N "(cached) $ECHO_C" >&6
     7617else
     7618  ac_check_lib_save_LIBS=$LIBS
     7619LIBS="-lreadline  $LIBS"
     7620cat >conftest.$ac_ext <<_ACEOF
     7621/* confdefs.h.  */
     7622_ACEOF
     7623cat confdefs.h >>conftest.$ac_ext
     7624cat >>conftest.$ac_ext <<_ACEOF
     7625/* end confdefs.h.  */
     7626
     7627/* Override any gcc2 internal prototype to avoid an error.  */
     7628#ifdef __cplusplus
     7629extern "C"
     7630#endif
     7631/* We use char because int might match the return type of a gcc2
     7632   builtin and then its argument prototype would still apply.  */
     7633char readline ();
     7634int
     7635main ()
     7636{
     7637readline ();
     7638  ;
     7639  return 0;
     7640}
     7641_ACEOF
     7642rm -f conftest.$ac_objext conftest$ac_exeext
     7643if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
     7644  (eval $ac_link) 2>conftest.er1
     7645  ac_status=$?
     7646  grep -v '^ *+' conftest.er1 >conftest.err
     7647  rm -f conftest.er1
     7648  cat conftest.err >&5
     7649  echo "$as_me:$LINENO: \$? = $ac_status" >&5
     7650  (exit $ac_status); } &&
     7651         { ac_try='test -z "$ac_c_werror_flag"
     7652                         || test ! -s conftest.err'
     7653  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
     7654  (eval $ac_try) 2>&5
     7655  ac_status=$?
     7656  echo "$as_me:$LINENO: \$? = $ac_status" >&5
     7657  (exit $ac_status); }; } &&
     7658         { ac_try='test -s conftest$ac_exeext'
     7659  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
     7660  (eval $ac_try) 2>&5
     7661  ac_status=$?
     7662  echo "$as_me:$LINENO: \$? = $ac_status" >&5
     7663  (exit $ac_status); }; }; then
     7664  ac_cv_lib_readline_readline=yes
     7665else
     7666  echo "$as_me: failed program was:" >&5
     7667sed 's/^/| /' conftest.$ac_ext >&5
     7668
     7669ac_cv_lib_readline_readline=no
     7670fi
     7671rm -f conftest.err conftest.$ac_objext \
     7672      conftest$ac_exeext conftest.$ac_ext
     7673LIBS=$ac_check_lib_save_LIBS
     7674fi
     7675echo "$as_me:$LINENO: result: $ac_cv_lib_readline_readline" >&5
     7676echo "${ECHO_T}$ac_cv_lib_readline_readline" >&6
     7677if test $ac_cv_lib_readline_readline = yes; then
     7678  cat >>confdefs.h <<_ACEOF
     7679#define HAVE_LIBREADLINE 1
     7680_ACEOF
     7681
     7682  LIBS="-lreadline $LIBS"
     7683
     7684fi
     7685
     7686echo "$as_me:$LINENO: checking whether rl_username_completion_function is declared" >&5
     7687echo $ECHO_N "checking whether rl_username_completion_function is declared... $ECHO_C" >&6
     7688if test "${ac_cv_have_decl_rl_username_completion_function+set}" = set; then
     7689  echo $ECHO_N "(cached) $ECHO_C" >&6
     7690else
     7691  cat >conftest.$ac_ext <<_ACEOF
     7692/* confdefs.h.  */
     7693_ACEOF
     7694cat confdefs.h >>conftest.$ac_ext
     7695cat >>conftest.$ac_ext <<_ACEOF
     7696/* end confdefs.h.  */
     7697
     7698#include <stdio.h>
     7699#if HAVE_READLINE_READLINE_H
     7700# include <readline/readline.h>
     7701#endif
     7702
     7703
     7704int
     7705main ()
     7706{
     7707#ifndef rl_username_completion_function
     7708  char *p = (char *) rl_username_completion_function;
     7709#endif
     7710
     7711  ;
     7712  return 0;
     7713}
     7714_ACEOF
     7715rm -f conftest.$ac_objext
     7716if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
     7717  (eval $ac_compile) 2>conftest.er1
     7718  ac_status=$?
     7719  grep -v '^ *+' conftest.er1 >conftest.err
     7720  rm -f conftest.er1
     7721  cat conftest.err >&5
     7722  echo "$as_me:$LINENO: \$? = $ac_status" >&5
     7723  (exit $ac_status); } &&
     7724         { ac_try='test -z "$ac_c_werror_flag"
     7725                         || test ! -s conftest.err'
     7726  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
     7727  (eval $ac_try) 2>&5
     7728  ac_status=$?
     7729  echo "$as_me:$LINENO: \$? = $ac_status" >&5
     7730  (exit $ac_status); }; } &&
     7731         { ac_try='test -s conftest.$ac_objext'
     7732  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
     7733  (eval $ac_try) 2>&5
     7734  ac_status=$?
     7735  echo "$as_me:$LINENO: \$? = $ac_status" >&5
     7736  (exit $ac_status); }; }; then
     7737  ac_cv_have_decl_rl_username_completion_function=yes
     7738else
     7739  echo "$as_me: failed program was:" >&5
     7740sed 's/^/| /' conftest.$ac_ext >&5
     7741
     7742ac_cv_have_decl_rl_username_completion_function=no
     7743fi
     7744rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
     7745fi
     7746echo "$as_me:$LINENO: result: $ac_cv_have_decl_rl_username_completion_function" >&5
     7747echo "${ECHO_T}$ac_cv_have_decl_rl_username_completion_function" >&6
     7748if test $ac_cv_have_decl_rl_username_completion_function = yes; then
     7749
     7750cat >>confdefs.h <<_ACEOF
     7751#define HAVE_DECL_RL_USERNAME_COMPLETION_FUNCTION 1
     7752_ACEOF
     7753
     7754
     7755else
     7756  cat >>confdefs.h <<_ACEOF
     7757#define HAVE_DECL_RL_USERNAME_COMPLETION_FUNCTION 0
     7758_ACEOF
     7759
     7760
     7761fi
     7762echo "$as_me:$LINENO: checking whether rl_filename_completion_function is declared" >&5
     7763echo $ECHO_N "checking whether rl_filename_completion_function is declared... $ECHO_C" >&6
     7764if test "${ac_cv_have_decl_rl_filename_completion_function+set}" = set; then
     7765  echo $ECHO_N "(cached) $ECHO_C" >&6
     7766else
     7767  cat >conftest.$ac_ext <<_ACEOF
     7768/* confdefs.h.  */
     7769_ACEOF
     7770cat confdefs.h >>conftest.$ac_ext
     7771cat >>conftest.$ac_ext <<_ACEOF
     7772/* end confdefs.h.  */
     7773
     7774#include <stdio.h>
     7775#if HAVE_READLINE_READLINE_H
     7776# include <readline/readline.h>
     7777#endif
     7778
     7779
     7780int
     7781main ()
     7782{
     7783#ifndef rl_filename_completion_function
     7784  char *p = (char *) rl_filename_completion_function;
     7785#endif
     7786
     7787  ;
     7788  return 0;
     7789}
     7790_ACEOF
     7791rm -f conftest.$ac_objext
     7792if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
     7793  (eval $ac_compile) 2>conftest.er1
     7794  ac_status=$?
     7795  grep -v '^ *+' conftest.er1 >conftest.err
     7796  rm -f conftest.er1
     7797  cat conftest.err >&5
     7798  echo "$as_me:$LINENO: \$? = $ac_status" >&5
     7799  (exit $ac_status); } &&
     7800         { ac_try='test -z "$ac_c_werror_flag"
     7801                         || test ! -s conftest.err'
     7802  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
     7803  (eval $ac_try) 2>&5
     7804  ac_status=$?
     7805  echo "$as_me:$LINENO: \$? = $ac_status" >&5
     7806  (exit $ac_status); }; } &&
     7807         { ac_try='test -s conftest.$ac_objext'
     7808  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
     7809  (eval $ac_try) 2>&5
     7810  ac_status=$?
     7811  echo "$as_me:$LINENO: \$? = $ac_status" >&5
     7812  (exit $ac_status); }; }; then
     7813  ac_cv_have_decl_rl_filename_completion_function=yes
     7814else
     7815  echo "$as_me: failed program was:" >&5
     7816sed 's/^/| /' conftest.$ac_ext >&5
     7817
     7818ac_cv_have_decl_rl_filename_completion_function=no
     7819fi
     7820rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
     7821fi
     7822echo "$as_me:$LINENO: result: $ac_cv_have_decl_rl_filename_completion_function" >&5
     7823echo "${ECHO_T}$ac_cv_have_decl_rl_filename_completion_function" >&6
     7824if test $ac_cv_have_decl_rl_filename_completion_function = yes; then
     7825
     7826cat >>confdefs.h <<_ACEOF
     7827#define HAVE_DECL_RL_FILENAME_COMPLETION_FUNCTION 1
     7828_ACEOF
     7829
     7830
     7831else
     7832  cat >>confdefs.h <<_ACEOF
     7833#define HAVE_DECL_RL_FILENAME_COMPLETION_FUNCTION 0
     7834_ACEOF
     7835
     7836
     7837fi
     7838echo "$as_me:$LINENO: checking whether rl_completion_matches is declared" >&5
     7839echo $ECHO_N "checking whether rl_completion_matches is declared... $ECHO_C" >&6
     7840if test "${ac_cv_have_decl_rl_completion_matches+set}" = set; then
     7841  echo $ECHO_N "(cached) $ECHO_C" >&6
     7842else
     7843  cat >conftest.$ac_ext <<_ACEOF
     7844/* confdefs.h.  */
     7845_ACEOF
     7846cat confdefs.h >>conftest.$ac_ext
     7847cat >>conftest.$ac_ext <<_ACEOF
     7848/* end confdefs.h.  */
     7849
     7850#include <stdio.h>
     7851#if HAVE_READLINE_READLINE_H
     7852# include <readline/readline.h>
     7853#endif
     7854
     7855
     7856int
     7857main ()
     7858{
     7859#ifndef rl_completion_matches
     7860  char *p = (char *) rl_completion_matches;
     7861#endif
     7862
     7863  ;
     7864  return 0;
     7865}
     7866_ACEOF
     7867rm -f conftest.$ac_objext
     7868if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
     7869  (eval $ac_compile) 2>conftest.er1
     7870  ac_status=$?
     7871  grep -v '^ *+' conftest.er1 >conftest.err
     7872  rm -f conftest.er1
     7873  cat conftest.err >&5
     7874  echo "$as_me:$LINENO: \$? = $ac_status" >&5
     7875  (exit $ac_status); } &&
     7876         { ac_try='test -z "$ac_c_werror_flag"
     7877                         || test ! -s conftest.err'
     7878  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
     7879  (eval $ac_try) 2>&5
     7880  ac_status=$?
     7881  echo "$as_me:$LINENO: \$? = $ac_status" >&5
     7882  (exit $ac_status); }; } &&
     7883         { ac_try='test -s conftest.$ac_objext'
     7884  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
     7885  (eval $ac_try) 2>&5
     7886  ac_status=$?
     7887  echo "$as_me:$LINENO: \$? = $ac_status" >&5
     7888  (exit $ac_status); }; }; then
     7889  ac_cv_have_decl_rl_completion_matches=yes
     7890else
     7891  echo "$as_me: failed program was:" >&5
     7892sed 's/^/| /' conftest.$ac_ext >&5
     7893
     7894ac_cv_have_decl_rl_completion_matches=no
     7895fi
     7896rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
     7897fi
     7898echo "$as_me:$LINENO: result: $ac_cv_have_decl_rl_completion_matches" >&5
     7899echo "${ECHO_T}$ac_cv_have_decl_rl_completion_matches" >&6
     7900if test $ac_cv_have_decl_rl_completion_matches = yes; then
     7901
     7902cat >>confdefs.h <<_ACEOF
     7903#define HAVE_DECL_RL_COMPLETION_MATCHES 1
     7904_ACEOF
     7905
     7906
     7907else
     7908  cat >>confdefs.h <<_ACEOF
     7909#define HAVE_DECL_RL_COMPLETION_MATCHES 0
     7910_ACEOF
     7911
     7912
     7913fi
     7914echo "$as_me:$LINENO: checking whether username_completion_function is declared" >&5
     7915echo $ECHO_N "checking whether username_completion_function is declared... $ECHO_C" >&6
     7916if test "${ac_cv_have_decl_username_completion_function+set}" = set; then
     7917  echo $ECHO_N "(cached) $ECHO_C" >&6
     7918else
     7919  cat >conftest.$ac_ext <<_ACEOF
     7920/* confdefs.h.  */
     7921_ACEOF
     7922cat confdefs.h >>conftest.$ac_ext
     7923cat >>conftest.$ac_ext <<_ACEOF
     7924/* end confdefs.h.  */
     7925
     7926#include <stdio.h>
     7927#if HAVE_READLINE_READLINE_H
     7928# include <readline/readline.h>
     7929#endif
     7930
     7931
     7932int
     7933main ()
     7934{
     7935#ifndef username_completion_function
     7936  char *p = (char *) username_completion_function;
     7937#endif
     7938
     7939  ;
     7940  return 0;
     7941}
     7942_ACEOF
     7943rm -f conftest.$ac_objext
     7944if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
     7945  (eval $ac_compile) 2>conftest.er1
     7946  ac_status=$?
     7947  grep -v '^ *+' conftest.er1 >conftest.err
     7948  rm -f conftest.er1
     7949  cat conftest.err >&5
     7950  echo "$as_me:$LINENO: \$? = $ac_status" >&5
     7951  (exit $ac_status); } &&
     7952         { ac_try='test -z "$ac_c_werror_flag"
     7953                         || test ! -s conftest.err'
     7954  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
     7955  (eval $ac_try) 2>&5
     7956  ac_status=$?
     7957  echo "$as_me:$LINENO: \$? = $ac_status" >&5
     7958  (exit $ac_status); }; } &&
     7959         { ac_try='test -s conftest.$ac_objext'
     7960  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
     7961  (eval $ac_try) 2>&5
     7962  ac_status=$?
     7963  echo "$as_me:$LINENO: \$? = $ac_status" >&5
     7964  (exit $ac_status); }; }; then
     7965  ac_cv_have_decl_username_completion_function=yes
     7966else
     7967  echo "$as_me: failed program was:" >&5
     7968sed 's/^/| /' conftest.$ac_ext >&5
     7969
     7970ac_cv_have_decl_username_completion_function=no
     7971fi
     7972rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
     7973fi
     7974echo "$as_me:$LINENO: result: $ac_cv_have_decl_username_completion_function" >&5
     7975echo "${ECHO_T}$ac_cv_have_decl_username_completion_function" >&6
     7976if test $ac_cv_have_decl_username_completion_function = yes; then
     7977
     7978cat >>confdefs.h <<_ACEOF
     7979#define HAVE_DECL_USERNAME_COMPLETION_FUNCTION 1
     7980_ACEOF
     7981
     7982
     7983else
     7984  cat >>confdefs.h <<_ACEOF
     7985#define HAVE_DECL_USERNAME_COMPLETION_FUNCTION 0
     7986_ACEOF
     7987
     7988
     7989fi
     7990echo "$as_me:$LINENO: checking whether filename_completion_function is declared" >&5
     7991echo $ECHO_N "checking whether filename_completion_function is declared... $ECHO_C" >&6
     7992if test "${ac_cv_have_decl_filename_completion_function+set}" = set; then
     7993  echo $ECHO_N "(cached) $ECHO_C" >&6
     7994else
     7995  cat >conftest.$ac_ext <<_ACEOF
     7996/* confdefs.h.  */
     7997_ACEOF
     7998cat confdefs.h >>conftest.$ac_ext
     7999cat >>conftest.$ac_ext <<_ACEOF
     8000/* end confdefs.h.  */
     8001
     8002#include <stdio.h>
     8003#if HAVE_READLINE_READLINE_H
     8004# include <readline/readline.h>
     8005#endif
     8006
     8007
     8008int
     8009main ()
     8010{
     8011#ifndef filename_completion_function
     8012  char *p = (char *) filename_completion_function;
     8013#endif
     8014
     8015  ;
     8016  return 0;
     8017}
     8018_ACEOF
     8019rm -f conftest.$ac_objext
     8020if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
     8021  (eval $ac_compile) 2>conftest.er1
     8022  ac_status=$?
     8023  grep -v '^ *+' conftest.er1 >conftest.err
     8024  rm -f conftest.er1
     8025  cat conftest.err >&5
     8026  echo "$as_me:$LINENO: \$? = $ac_status" >&5
     8027  (exit $ac_status); } &&
     8028         { ac_try='test -z "$ac_c_werror_flag"
     8029                         || test ! -s conftest.err'
     8030  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
     8031  (eval $ac_try) 2>&5
     8032  ac_status=$?
     8033  echo "$as_me:$LINENO: \$? = $ac_status" >&5
     8034  (exit $ac_status); }; } &&
     8035         { ac_try='test -s conftest.$ac_objext'
     8036  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
     8037  (eval $ac_try) 2>&5
     8038  ac_status=$?
     8039  echo "$as_me:$LINENO: \$? = $ac_status" >&5
     8040  (exit $ac_status); }; }; then
     8041  ac_cv_have_decl_filename_completion_function=yes
     8042else
     8043  echo "$as_me: failed program was:" >&5
     8044sed 's/^/| /' conftest.$ac_ext >&5
     8045
     8046ac_cv_have_decl_filename_completion_function=no
     8047fi
     8048rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
     8049fi
     8050echo "$as_me:$LINENO: result: $ac_cv_have_decl_filename_completion_function" >&5
     8051echo "${ECHO_T}$ac_cv_have_decl_filename_completion_function" >&6
     8052if test $ac_cv_have_decl_filename_completion_function = yes; then
     8053
     8054cat >>confdefs.h <<_ACEOF
     8055#define HAVE_DECL_FILENAME_COMPLETION_FUNCTION 1
     8056_ACEOF
     8057
     8058
     8059else
     8060  cat >>confdefs.h <<_ACEOF
     8061#define HAVE_DECL_FILENAME_COMPLETION_FUNCTION 0
     8062_ACEOF
     8063
     8064
     8065fi
     8066echo "$as_me:$LINENO: checking whether completion_matches is declared" >&5
     8067echo $ECHO_N "checking whether completion_matches is declared... $ECHO_C" >&6
     8068if test "${ac_cv_have_decl_completion_matches+set}" = set; then
     8069  echo $ECHO_N "(cached) $ECHO_C" >&6
     8070else
     8071  cat >conftest.$ac_ext <<_ACEOF
     8072/* confdefs.h.  */
     8073_ACEOF
     8074cat confdefs.h >>conftest.$ac_ext
     8075cat >>conftest.$ac_ext <<_ACEOF
     8076/* end confdefs.h.  */
     8077
     8078#include <stdio.h>
     8079#if HAVE_READLINE_READLINE_H
     8080# include <readline/readline.h>
     8081#endif
     8082
     8083
     8084int
     8085main ()
     8086{
     8087#ifndef completion_matches
     8088  char *p = (char *) completion_matches;
     8089#endif
     8090
     8091  ;
     8092  return 0;
     8093}
     8094_ACEOF
     8095rm -f conftest.$ac_objext
     8096if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
     8097  (eval $ac_compile) 2>conftest.er1
     8098  ac_status=$?
     8099  grep -v '^ *+' conftest.er1 >conftest.err
     8100  rm -f conftest.er1
     8101  cat conftest.err >&5
     8102  echo "$as_me:$LINENO: \$? = $ac_status" >&5
     8103  (exit $ac_status); } &&
     8104         { ac_try='test -z "$ac_c_werror_flag"
     8105                         || test ! -s conftest.err'
     8106  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
     8107  (eval $ac_try) 2>&5
     8108  ac_status=$?
     8109  echo "$as_me:$LINENO: \$? = $ac_status" >&5
     8110  (exit $ac_status); }; } &&
     8111         { ac_try='test -s conftest.$ac_objext'
     8112  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
     8113  (eval $ac_try) 2>&5
     8114  ac_status=$?
     8115  echo "$as_me:$LINENO: \$? = $ac_status" >&5
     8116  (exit $ac_status); }; }; then
     8117  ac_cv_have_decl_completion_matches=yes
     8118else
     8119  echo "$as_me: failed program was:" >&5
     8120sed 's/^/| /' conftest.$ac_ext >&5
     8121
     8122ac_cv_have_decl_completion_matches=no
     8123fi
     8124rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
     8125fi
     8126echo "$as_me:$LINENO: result: $ac_cv_have_decl_completion_matches" >&5
     8127echo "${ECHO_T}$ac_cv_have_decl_completion_matches" >&6
     8128if test $ac_cv_have_decl_completion_matches = yes; then
     8129
     8130cat >>confdefs.h <<_ACEOF
     8131#define HAVE_DECL_COMPLETION_MATCHES 1
     8132_ACEOF
     8133
     8134
     8135else
     8136  cat >>confdefs.h <<_ACEOF
     8137#define HAVE_DECL_COMPLETION_MATCHES 0
     8138_ACEOF
     8139
     8140
     8141fi
    76058142
    76068143
Note: See TracChangeset for help on using the changeset viewer.