Ticket #27253: newt-0.52.12-macosx.patch

File newt-0.52.12-macosx.patch, 61.6 KB (added by tlesher@…, 13 years ago)

newt-0.52.12-macosx.patch

  • Makefile.in 

    diff -urN newt-0.52.12/Makefile.in newt-0.52.12-macosx/Makefile.in
    old new  
    1 LIBS = -lslang
    2 LIBTCL = -ltcl8.4
     1LIBS = -lslang @LIBS@
     2LIBTCL = @TCL_LIB_FLAG@
    33
    44CC = @CC@
    55CPP = @CPP@
    66CFLAGS = @CFLAGS@
     7LDFLAGS = @LDFLAGS@
    78CPPFLAGS = -D_GNU_SOURCE -I/usr/include/slang @CPPFLAGS@
     9GNU_LD = @GNU_LD@
    810
    9 SHLIBFLAGS= -Wl,--version-script,newt.0.52.ver
    1011VERSION = @VERSION@
    1112TAG = r$(subst .,-,$(VERSION))
    1213SONAME = @SONAME@
    … …  
    2526          scrollbar.o textbox.o scale.o grid.o windows.o buttonbar.o \
    2627          checkboxtree.o
    2728
     29ifneq ($(GNU_LD),)
     30SHLIBFLAGS= -Wl,--version-script,newt.0.52.ver -Wl,-soname,$(LIBNEWTSONAME)
     31else
     32SHLIBFLAGS=
     33endif
     34
    2835SHCFLAGS = -fPIC
    2936
    3037prefix = @prefix@
    … …  
    3340libdir = @libdir@
    3441bindir = @bindir@
    3542datadir = @datadir@
     43datarootdir = @datarootdir@
    3644mandir = @mandir@
    3745man1dir = $(mandir)/man1
    3846pkgconfigdir = $(libdir)/pkgconfig
    … …  
    5361all:    $(TARGET) _snackmodule.so
    5462
    5563test:   test.o $(LIBNEWT)
    56         $(CC) -g -o test test.o $(LIBNEWT) $(LIBS)
     64        $(CC) -g -o test test.o $(LIBNEWT) $(LDFLAGS) $(LIBS)
    5765
    5866testgrid:       testgrid.o $(LIBNEWT)
    59         $(CC) -g -o testgrid testgrid.o $(LIBNEWT) $(LIBS)
     67        $(CC) -g -o testgrid testgrid.o $(LIBNEWT) $(LDFLAGS) $(LIBS)
    6068
    6169testtree:       testtree.o $(LIBNEWT)
    62         $(CC) -g -o testtree testtree.o $(LIBNEWT) $(LIBS)
     70        $(CC) -g -o testtree testtree.o $(LIBNEWT) $(LDFLAGS) $(LIBS)
    6371
    6472showchars:      showchars.o $(LIBNEWT)
    65         $(CC) -g -o showchars showchars.o $(LIBNEWT) $(LIBS)
     73        $(CC) -g -o showchars showchars.o $(LIBNEWT) $(LDFLAGS) $(LIBS)
    6674
    6775showkey:        showkey.o $(LIBNEWT)
    68         $(CC) -g -o showkey showkey.o $(LIBNEWT) $(LIBS)
     76        $(CC) -g -o showkey showkey.o $(LIBNEWT) $(LDFLAGS) $(LIBS)
    6977
    7078_snackmodule.so:   snackmodule.c $(LIBNEWTSH)
    7179        for ver in $(PYTHONVERS) ; do \
    7280                mkdir -p $$ver ;\
    73                 $(CC) $(CFLAGS) -I/usr/include/$$ver $(SHCFLAGS) -c -o $$ver/snackmodule.o snackmodule.c ;\
    74                 $(CC) --shared $(SHCFLAGS) -o $$ver/_snackmodule.so $$ver/snackmodule.o -L .  -lnewt ;\
     81                        PCFLAGS=`$$ver-config --cflags`; \
     82                        PIFLAGS=`$$ver-config --includes`; \
     83                        PLDFLAGS=`$$ver-config --ldflags`; \
     84                        PLFLAGS=`$$ver-config --libs`; \
     85                $(CC) $(CPPFLAGS) $$PIFLAGS $$PCFLAGS -c -o $$ver/snackmodule.o snackmodule.c ;\
     86                $(CC) --shared $$PLDFLAGS $$PLFLAGS $(LDFLAGS) -o $$ver/_snackmodule.so $$ver/snackmodule.o -L.  -lnewt $(LIBS);\
    7587        done
    7688        touch $@
    7789
    7890whiptail: $(NDIALOGOBJS) $(LIBNEWTSH)
    79         $(CC) -g -o whiptail $(NDIALOGOBJS) -L . -lnewt $(LIBS) -lpopt
     91        $(CC) -g -o whiptail $(NDIALOGOBJS) -L. $(LDFLAGS) -lnewt $(LIBS) -lpopt
    8092
    8193whiptcl.so: $(WHIPTCLOBJS) $(LIBNEWTSH)
    82         $(CC) -shared $(SHCFLAGS) -o whiptcl.so $(WHIPTCLOBJS) -L . -lnewt  $(LIBTCL) -lpopt
     94        $(CC) -shared $(SHCFLAGS) $(LDFLAGS) -o whiptcl.so $(WHIPTCLOBJS) -L. -lnewt  $(LIBTCL) -lpopt $(LIBS)
    8395
    8496$(LIBNEWT): $(LIBOBJS)
    8597        ar rv $@ $^
    … …  
    102114sharedlib: $(LIBNEWTSH)
    103115
    104116$(LIBNEWTSH): $(SHAREDDIR) $(SHAREDOBJS)
    105         $(CC) -shared -o $(LIBNEWTSH) $(SHLIBFLAGS) -Wl,-soname,$(LIBNEWTSONAME) $(SHAREDOBJS) $(LIBS)
     117        $(CC) -shared -o $(LIBNEWTSH) $(SHLIBFLAGS) $(SHAREDOBJS) $(LDFLAGS) $(LIBS)
    106118        ln -fs $(LIBNEWTSONAME) libnewt.so
    107119        ln -fs $(LIBNEWTSH) $(LIBNEWTSONAME)
    108120
    … …  
    119131        install -m 755 whiptail $(instroot)/$(bindir)
    120132        install -m 644 whiptail.1 $(instroot)/$(man1dir)
    121133        make -C po datadir=$(instroot)/$(datadir) install
    122         install -m 644 -D libnewt.pc $(instroot)/$(pkgconfigdir)/libnewt.pc
     134        install -m 644 -d libnewt.pc $(instroot)/$(pkgconfigdir)/libnewt.pc
    123135
    124136install-sh: sharedlib $(WHIPTCLSO) _snackmodule.so
    125137        [ -d $(instroot)/$(libdir) ] || install -m 755 -d $(instroot)/$(libdir)

  • config.h.in 

    diff -urN newt-0.52.12/config.h.in newt-0.52.12-macosx/config.h.in
    old new  
    99/* Define to 1 if you have the <inttypes.h> header file. */
    1010#undef HAVE_INTTYPES_H
    1111
     12/* Define to 1 if you have the `c' library (-lc). */
     13#undef HAVE_LIBC
     14
     15/* Define to 1 if you have the <libintl.h> header file. */
     16#undef HAVE_LIBINTL_H
     17
    1218/* Define to 1 if you have the <memory.h> header file. */
    1319#undef HAVE_MEMORY_H
    1420
     21/* Define to 1 if you have the <popt.h> header file. */
     22#undef HAVE_POPT_H
     23
    1524/* Define to 1 if you have the <stdint.h> header file. */
    1625#undef HAVE_STDINT_H
    1726

  • configure 

    diff -urN newt-0.52.12/configure newt-0.52.12-macosx/configure
    old new  
    11#! /bin/sh
    22# Guess values for system-dependent variables and create Makefiles.
    3 # Generated by GNU Autoconf 2.65.
     3# Generated by GNU Autoconf 2.68.
    44#
    55#
    66# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
    7 # 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
    8 # Inc.
     7# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
     8# Foundation, Inc.
    99#
    1010#
    1111# This configure script is free software; the Free Software Foundation
    … …  
    8989IFS=" ""        $as_nl"
    9090
    9191# Find who we are.  Look in the path if we contain no directory separator.
     92as_myself=
    9293case $0 in #((
    9394  *[\\/]* ) as_myself=$0 ;;
    9495  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
    … …  
    214215  # We cannot yet assume a decent shell, so we have to provide a
    215216        # neutralization value for shells without unset; and this also
    216217        # works around shells that cannot unset nonexistent variables.
     218        # Preserve -v and -x to the replacement shell.
    217219        BASH_ENV=/dev/null
    218220        ENV=/dev/null
    219221        (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
    220222        export CONFIG_SHELL
    221         exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
     223        case $- in # ((((
     224          *v*x* | *x*v* ) as_opts=-vx ;;
     225          *v* ) as_opts=-v ;;
     226          *x* ) as_opts=-x ;;
     227          * ) as_opts= ;;
     228        esac
     229        exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
    222230fi
    223231
    224232    if test x$as_have_required = xno; then :
    … …  
    316324      test -d "$as_dir" && break
    317325    done
    318326    test -z "$as_dirs" || eval "mkdir $as_dirs"
    319   } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
     327  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
    320328
    321329
    322330} # as_fn_mkdir_p
    … …  
    356364fi # as_fn_arith
    357365
    358366
    359 # as_fn_error ERROR [LINENO LOG_FD]
    360 # ---------------------------------
     367# as_fn_error STATUS ERROR [LINENO LOG_FD]
     368# ----------------------------------------
    361369# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
    362370# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
    363 # script with status $?, using 1 if that was 0.
     371# script with STATUS, using 1 if that was 0.
    364372as_fn_error ()
    365373{
    366   as_status=$?; test $as_status -eq 0 && as_status=1
    367   if test "$3"; then
    368     as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
    369     $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
     374  as_status=$1; test $as_status -eq 0 && as_status=1
     375  if test "$4"; then
     376    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
     377    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
    370378  fi
    371   $as_echo "$as_me: error: $1" >&2
     379  $as_echo "$as_me: error: $2" >&2
    372380  as_fn_exit $as_status
    373381} # as_fn_error
    374382
    … …  
    530538exec 6>&1
    531539
    532540# Name of the host.
    533 # hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
     541# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
    534542# so uname gets run too.
    535543ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
    536544
    … …  
    594602ac_subst_vars='LTLIBOBJS
    595603LIBOBJS
    596604WHIPTCLSO
     605TCL_LIB_FLAG
    597606PYTHONVERS
    598607EGREP
    599 GREP
    600608CPP
     609GNU_LD
     610GREP
    601611LN_S
    602612INSTALL_DATA
    603613INSTALL_SCRIPT
    … …  
    664674LDFLAGS
    665675LIBS
    666676CPPFLAGS
    667 CPP'
     677CPP
     678CPPFLAGS'
    668679
    669680
    670681# Initialize some variables set by options.
    … …  
    727738  fi
    728739
    729740  case $ac_option in
    730   *=*)  ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
    731   *)    ac_optarg=yes ;;
     741  *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
     742  *=)   ac_optarg= ;;
     743  *)    ac_optarg=yes ;;
    732744  esac
    733745
    734746  # Accept the important Cygnus configure options, so we can diagnose typos.
    … …  
    773785    ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
    774786    # Reject names that are not valid shell variable names.
    775787    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
    776       as_fn_error "invalid feature name: $ac_useropt"
     788      as_fn_error $? "invalid feature name: $ac_useropt"
    777789    ac_useropt_orig=$ac_useropt
    778790    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
    779791    case $ac_user_opts in
    … …  
    799811    ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
    800812    # Reject names that are not valid shell variable names.
    801813    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
    802       as_fn_error "invalid feature name: $ac_useropt"
     814      as_fn_error $? "invalid feature name: $ac_useropt"
    803815    ac_useropt_orig=$ac_useropt
    804816    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
    805817    case $ac_user_opts in
    … …  
    10031015    ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
    10041016    # Reject names that are not valid shell variable names.
    10051017    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
    1006       as_fn_error "invalid package name: $ac_useropt"
     1018      as_fn_error $? "invalid package name: $ac_useropt"
    10071019    ac_useropt_orig=$ac_useropt
    10081020    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
    10091021    case $ac_user_opts in
    … …  
    10191031    ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
    10201032    # Reject names that are not valid shell variable names.
    10211033    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
    1022       as_fn_error "invalid package name: $ac_useropt"
     1034      as_fn_error $? "invalid package name: $ac_useropt"
    10231035    ac_useropt_orig=$ac_useropt
    10241036    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
    10251037    case $ac_user_opts in
    … …  
    10491061  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
    10501062    x_libraries=$ac_optarg ;;
    10511063
    1052   -*) as_fn_error "unrecognized option: \`$ac_option'
    1053 Try \`$0 --help' for more information."
     1064  -*) as_fn_error $? "unrecognized option: \`$ac_option'
     1065Try \`$0 --help' for more information"
    10541066    ;;
    10551067
    10561068  *=*)
    … …  
    10581070    # Reject names that are not valid shell variable names.
    10591071    case $ac_envvar in #(
    10601072      '' | [0-9]* | *[!_$as_cr_alnum]* )
    1061       as_fn_error "invalid variable name: \`$ac_envvar'" ;;
     1073      as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
    10621074    esac
    10631075    eval $ac_envvar=\$ac_optarg
    10641076    export $ac_envvar ;;
    … …  
    10681080    $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
    10691081    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
    10701082      $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
    1071     : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
     1083    : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
    10721084    ;;
    10731085
    10741086  esac
    … …  
    10761088
    10771089if test -n "$ac_prev"; then
    10781090  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
    1079   as_fn_error "missing argument to $ac_option"
     1091  as_fn_error $? "missing argument to $ac_option"
    10801092fi
    10811093
    10821094if test -n "$ac_unrecognized_opts"; then
    10831095  case $enable_option_checking in
    10841096    no) ;;
    1085     fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
     1097    fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
    10861098    *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
    10871099  esac
    10881100fi
    … …  
    11051117    [\\/$]* | ?:[\\/]* )  continue;;
    11061118    NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
    11071119  esac
    1108   as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
     1120  as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
    11091121done
    11101122
    11111123# There might be people who depend on the old broken behavior: `$host'
    … …  
    11191131if test "x$host_alias" != x; then
    11201132  if test "x$build_alias" = x; then
    11211133    cross_compiling=maybe
    1122     $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
    1123     If a cross compiler is detected then cross compile mode will be used." >&2
     1134    $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
     1135    If a cross compiler is detected then cross compile mode will be used" >&2
    11241136  elif test "x$build_alias" != "x$host_alias"; then
    11251137    cross_compiling=yes
    11261138  fi
    … …  
    11351147ac_pwd=`pwd` && test -n "$ac_pwd" &&
    11361148ac_ls_di=`ls -di .` &&
    11371149ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
    1138   as_fn_error "working directory cannot be determined"
     1150  as_fn_error $? "working directory cannot be determined"
    11391151test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
    1140   as_fn_error "pwd does not report name of working directory"
     1152  as_fn_error $? "pwd does not report name of working directory"
    11411153
    11421154
    11431155# Find the source files, if location was not specified.
    … …  
    11761188fi
    11771189if test ! -r "$srcdir/$ac_unique_file"; then
    11781190  test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
    1179   as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
     1191  as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
    11801192fi
    11811193ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
    11821194ac_abs_confdir=`(
    1183         cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
     1195        cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
    11841196        pwd)`
    11851197# When building in place, set srcdir=.
    11861198if test "$ac_abs_confdir" = "$ac_pwd"; then
    … …  
    12201232      --help=short        display options specific to this package
    12211233      --help=recursive    display the short help of all the included packages
    12221234  -V, --version           display version information and exit
    1223   -q, --quiet, --silent   do not print \`checking...' messages
     1235  -q, --quiet, --silent   do not print \`checking ...' messages
    12241236      --cache-file=FILE   cache test results in FILE [disabled]
    12251237  -C, --config-cache      alias for \`--cache-file=config.cache'
    12261238  -n, --no-create         do not create output files
    … …  
    13581370if $ac_init_version; then
    13591371  cat <<\_ACEOF
    13601372configure
    1361 generated by GNU Autoconf 2.65
     1373generated by GNU Autoconf 2.68
    13621374
    1363 Copyright (C) 2009 Free Software Foundation, Inc.
     1375Copyright (C) 2010 Free Software Foundation, Inc.
    13641376This configure script is free software; the Free Software Foundation
    13651377gives unlimited permission to copy, distribute and modify it.
    13661378_ACEOF
    … …  
    14041416
    14051417        ac_retval=1
    14061418fi
    1407   eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
     1419  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
    14081420  as_fn_set_status $ac_retval
    14091421
    14101422} # ac_fn_c_try_compile
    … …  
    14301442    mv -f conftest.er1 conftest.err
    14311443  fi
    14321444  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
    1433   test $ac_status = 0; } >/dev/null && {
     1445  test $ac_status = 0; } > conftest.i && {
    14341446         test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
    14351447         test ! -s conftest.err
    14361448       }; then :
    … …  
    14411453
    14421454    ac_retval=1
    14431455fi
    1444   eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
     1456  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
    14451457  as_fn_set_status $ac_retval
    14461458
    14471459} # ac_fn_c_try_cpp
    … …  
    14541466ac_fn_c_check_header_mongrel ()
    14551467{
    14561468  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
    1457   if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
     1469  if eval \${$3+:} false; then :
    14581470  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
    14591471$as_echo_n "checking for $2... " >&6; }
    1460 if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
     1472if eval \${$3+:} false; then :
    14611473  $as_echo_n "(cached) " >&6
    14621474fi
    14631475eval ac_res=\$$3
    … …  
    14931505else
    14941506  ac_header_preproc=no
    14951507fi
    1496 rm -f conftest.err conftest.$ac_ext
     1508rm -f conftest.err conftest.i conftest.$ac_ext
    14971509{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
    14981510$as_echo "$ac_header_preproc" >&6; }
    14991511
    … …  
    15201532esac
    15211533  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
    15221534$as_echo_n "checking for $2... " >&6; }
    1523 if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
     1535if eval \${$3+:} false; then :
    15241536  $as_echo_n "(cached) " >&6
    15251537else
    15261538  eval "$3=\$ac_header_compiler"
    … …  
    15291541               { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
    15301542$as_echo "$ac_res" >&6; }
    15311543fi
    1532   eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
     1544  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
    15331545
    15341546} # ac_fn_c_check_header_mongrel
    15351547
    … …  
    15701582       ac_retval=$ac_status
    15711583fi
    15721584  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
    1573   eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
     1585  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
    15741586  as_fn_set_status $ac_retval
    15751587
    15761588} # ac_fn_c_try_run
    … …  
    15841596  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
    15851597  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
    15861598$as_echo_n "checking for $2... " >&6; }
    1587 if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
     1599if eval \${$3+:} false; then :
    15881600  $as_echo_n "(cached) " >&6
    15891601else
    15901602  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
    … …  
    16021614eval ac_res=\$$3
    16031615               { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
    16041616$as_echo "$ac_res" >&6; }
    1605   eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
     1617  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
    16061618
    16071619} # ac_fn_c_check_header_compile
     1620
     1621# ac_fn_c_try_link LINENO
     1622# -----------------------
     1623# Try to link conftest.$ac_ext, and return whether this succeeded.
     1624ac_fn_c_try_link ()
     1625{
     1626  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
     1627  rm -f conftest.$ac_objext conftest$ac_exeext
     1628  if { { ac_try="$ac_link"
     1629case "(($ac_try" in
     1630  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
     1631  *) ac_try_echo=$ac_try;;
     1632esac
     1633eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
     1634$as_echo "$ac_try_echo"; } >&5
     1635  (eval "$ac_link") 2>conftest.err
     1636  ac_status=$?
     1637  if test -s conftest.err; then
     1638    grep -v '^ *+' conftest.err >conftest.er1
     1639    cat conftest.er1 >&5
     1640    mv -f conftest.er1 conftest.err
     1641  fi
     1642  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
     1643  test $ac_status = 0; } && {
     1644         test -z "$ac_c_werror_flag" ||
     1645         test ! -s conftest.err
     1646       } && test -s conftest$ac_exeext && {
     1647         test "$cross_compiling" = yes ||
     1648         $as_test_x conftest$ac_exeext
     1649       }; then :
     1650  ac_retval=0
     1651else
     1652  $as_echo "$as_me: failed program was:" >&5
     1653sed 's/^/| /' conftest.$ac_ext >&5
     1654
     1655        ac_retval=1
     1656fi
     1657  # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
     1658  # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
     1659  # interfere with the next link command; also delete a directory that is
     1660  # left behind by Apple's compiler.  We do this before executing the actions.
     1661  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
     1662  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
     1663  as_fn_set_status $ac_retval
     1664
     1665} # ac_fn_c_try_link
    16081666cat >config.log <<_ACEOF
    16091667This file contains any messages produced by compilers while
    16101668running configure, to aid debugging if configure makes a mistake.
    16111669
    16121670It was created by $as_me, which was
    1613 generated by GNU Autoconf 2.65.  Invocation command line was
     1671generated by GNU Autoconf 2.68.  Invocation command line was
    16141672
    16151673  $ $0 $@
    16161674
    … …  
    17201778  {
    17211779    echo
    17221780
    1723     cat <<\_ASBOX
    1724 ## ---------------- ##
     1781    $as_echo "## ---------------- ##
    17251782## Cache variables. ##
    1726 ## ---------------- ##
    1727 _ASBOX
     1783## ---------------- ##"
    17281784    echo
    17291785    # The following way of writing the cache mishandles newlines in values,
    17301786(
    … …  
    17581814)
    17591815    echo
    17601816
    1761     cat <<\_ASBOX
    1762 ## ----------------- ##
     1817    $as_echo "## ----------------- ##
    17631818## Output variables. ##
    1764 ## ----------------- ##
    1765 _ASBOX
     1819## ----------------- ##"
    17661820    echo
    17671821    for ac_var in $ac_subst_vars
    17681822    do
    … …  
    17751829    echo
    17761830
    17771831    if test -n "$ac_subst_files"; then
    1778       cat <<\_ASBOX
    1779 ## ------------------- ##
     1832      $as_echo "## ------------------- ##
    17801833## File substitutions. ##
    1781 ## ------------------- ##
    1782 _ASBOX
     1834## ------------------- ##"
    17831835      echo
    17841836      for ac_var in $ac_subst_files
    17851837      do
    … …  
    17931845    fi
    17941846
    17951847    if test -s confdefs.h; then
    1796       cat <<\_ASBOX
    1797 ## ----------- ##
     1848      $as_echo "## ----------- ##
    17981849## confdefs.h. ##
    1799 ## ----------- ##
    1800 _ASBOX
     1850## ----------- ##"
    18011851      echo
    18021852      cat confdefs.h
    18031853      echo
    … …  
    18521902ac_site_file1=NONE
    18531903ac_site_file2=NONE
    18541904if test -n "$CONFIG_SITE"; then
    1855   ac_site_file1=$CONFIG_SITE
     1905  # We do not want a PATH search for config.site.
     1906  case $CONFIG_SITE in #((
     1907    -*)  ac_site_file1=./$CONFIG_SITE;;
     1908    */*) ac_site_file1=$CONFIG_SITE;;
     1909    *)   ac_site_file1=./$CONFIG_SITE;;
     1910  esac
    18561911elif test "x$prefix" != xNONE; then
    18571912  ac_site_file1=$prefix/share/config.site
    18581913  ac_site_file2=$prefix/etc/config.site
    … …  
    18671922    { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
    18681923$as_echo "$as_me: loading site script $ac_site_file" >&6;}
    18691924    sed 's/^/| /' "$ac_site_file" >&5
    1870     . "$ac_site_file"
     1925    . "$ac_site_file" \
     1926      || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
     1927$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
     1928as_fn_error $? "failed to load site script $ac_site_file
     1929See \`config.log' for more details" "$LINENO" 5; }
    18711930  fi
    18721931done
    18731932
    … …  
    19432002$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
    19442003  { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
    19452004$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
    1946   as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
     2005  as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
    19472006fi
    19482007## -------------------- ##
    19492008## Main body of script. ##
    … …  
    19862045set dummy ${ac_tool_prefix}gcc; ac_word=$2
    19872046{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
    19882047$as_echo_n "checking for $ac_word... " >&6; }
    1989 if test "${ac_cv_prog_CC+set}" = set; then :
     2048if ${ac_cv_prog_CC+:} false; then :
    19902049  $as_echo_n "(cached) " >&6
    19912050else
    19922051  if test -n "$CC"; then
    … …  
    20262085set dummy gcc; ac_word=$2
    20272086{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
    20282087$as_echo_n "checking for $ac_word... " >&6; }
    2029 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
     2088if ${ac_cv_prog_ac_ct_CC+:} false; then :
    20302089  $as_echo_n "(cached) " >&6
    20312090else
    20322091  if test -n "$ac_ct_CC"; then
    … …  
    20792138set dummy ${ac_tool_prefix}cc; ac_word=$2
    20802139{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
    20812140$as_echo_n "checking for $ac_word... " >&6; }
    2082 if test "${ac_cv_prog_CC+set}" = set; then :
     2141if ${ac_cv_prog_CC+:} false; then :
    20832142  $as_echo_n "(cached) " >&6
    20842143else
    20852144  if test -n "$CC"; then
    … …  
    21192178set dummy cc; ac_word=$2
    21202179{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
    21212180$as_echo_n "checking for $ac_word... " >&6; }
    2122 if test "${ac_cv_prog_CC+set}" = set; then :
     2181if ${ac_cv_prog_CC+:} false; then :
    21232182  $as_echo_n "(cached) " >&6
    21242183else
    21252184  if test -n "$CC"; then
    … …  
    21782237set dummy $ac_tool_prefix$ac_prog; ac_word=$2
    21792238{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
    21802239$as_echo_n "checking for $ac_word... " >&6; }
    2181 if test "${ac_cv_prog_CC+set}" = set; then :
     2240if ${ac_cv_prog_CC+:} false; then :
    21822241  $as_echo_n "(cached) " >&6
    21832242else
    21842243  if test -n "$CC"; then
    … …  
    22222281set dummy $ac_prog; ac_word=$2
    22232282{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
    22242283$as_echo_n "checking for $ac_word... " >&6; }
    2225 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
     2284if ${ac_cv_prog_ac_ct_CC+:} false; then :
    22262285  $as_echo_n "(cached) " >&6
    22272286else
    22282287  if test -n "$ac_ct_CC"; then
    … …  
    22762335
    22772336test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
    22782337$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
    2279 as_fn_error "no acceptable C compiler found in \$PATH
    2280 See \`config.log' for more details." "$LINENO" 5; }
     2338as_fn_error $? "no acceptable C compiler found in \$PATH
     2339See \`config.log' for more details" "$LINENO" 5; }
    22812340
    22822341# Provide some information about the compiler.
    22832342$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
    … …  
    23912450
    23922451{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
    23932452$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
    2394 { as_fn_set_status 77
    2395 as_fn_error "C compiler cannot create executables
    2396 See \`config.log' for more details." "$LINENO" 5; }; }
     2453as_fn_error 77 "C compiler cannot create executables
     2454See \`config.log' for more details" "$LINENO" 5; }
    23972455else
    23982456  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
    23992457$as_echo "yes" >&6; }
    … …  
    24352493else
    24362494  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
    24372495$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
    2438 as_fn_error "cannot compute suffix of executables: cannot compile and link
    2439 See \`config.log' for more details." "$LINENO" 5; }
     2496as_fn_error $? "cannot compute suffix of executables: cannot compile and link
     2497See \`config.log' for more details" "$LINENO" 5; }
    24402498fi
    24412499rm -f conftest conftest$ac_cv_exeext
    24422500{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
    … …  
    24932551    else
    24942552        { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
    24952553$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
    2496 as_fn_error "cannot run C compiled programs.
     2554as_fn_error $? "cannot run C compiled programs.
    24972555If you meant to cross compile, use \`--host'.
    2498 See \`config.log' for more details." "$LINENO" 5; }
     2556See \`config.log' for more details" "$LINENO" 5; }
    24992557    fi
    25002558  fi
    25012559fi
    … …  
    25062564ac_clean_files=$ac_clean_files_save
    25072565{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
    25082566$as_echo_n "checking for suffix of object files... " >&6; }
    2509 if test "${ac_cv_objext+set}" = set; then :
     2567if ${ac_cv_objext+:} false; then :
    25102568  $as_echo_n "(cached) " >&6
    25112569else
    25122570  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
    … …  
    25462604
    25472605{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
    25482606$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
    2549 as_fn_error "cannot compute suffix of object files: cannot compile
    2550 See \`config.log' for more details." "$LINENO" 5; }
     2607as_fn_error $? "cannot compute suffix of object files: cannot compile
     2608See \`config.log' for more details" "$LINENO" 5; }
    25512609fi
    25522610rm -f conftest.$ac_cv_objext conftest.$ac_ext
    25532611fi
    … …  
    25572615ac_objext=$OBJEXT
    25582616{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
    25592617$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
    2560 if test "${ac_cv_c_compiler_gnu+set}" = set; then :
     2618if ${ac_cv_c_compiler_gnu+:} false; then :
    25612619  $as_echo_n "(cached) " >&6
    25622620else
    25632621  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
    … …  
    25942652ac_save_CFLAGS=$CFLAGS
    25952653{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
    25962654$as_echo_n "checking whether $CC accepts -g... " >&6; }
    2597 if test "${ac_cv_prog_cc_g+set}" = set; then :
     2655if ${ac_cv_prog_cc_g+:} false; then :
    25982656  $as_echo_n "(cached) " >&6
    25992657else
    26002658  ac_save_c_werror_flag=$ac_c_werror_flag
    … …  
    26722730fi
    26732731{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
    26742732$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
    2675 if test "${ac_cv_prog_cc_c89+set}" = set; then :
     2733if ${ac_cv_prog_cc_c89+:} false; then :
    26762734  $as_echo_n "(cached) " >&6
    26772735else
    26782736  ac_cv_prog_cc_c89=no
    … …  
    27692827
    27702828ac_aux_dir=
    27712829for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
    2772   for ac_t in install-sh install.sh shtool; do
    2773     if test -f "$ac_dir/$ac_t"; then
    2774       ac_aux_dir=$ac_dir
    2775       ac_install_sh="$ac_aux_dir/$ac_t -c"
    2776       break 2
    2777     fi
    2778   done
     2830  if test -f "$ac_dir/install-sh"; then
     2831    ac_aux_dir=$ac_dir
     2832    ac_install_sh="$ac_aux_dir/install-sh -c"
     2833    break
     2834  elif test -f "$ac_dir/install.sh"; then
     2835    ac_aux_dir=$ac_dir
     2836    ac_install_sh="$ac_aux_dir/install.sh -c"
     2837    break
     2838  elif test -f "$ac_dir/shtool"; then
     2839    ac_aux_dir=$ac_dir
     2840    ac_install_sh="$ac_aux_dir/shtool install -c"
     2841    break
     2842  fi
    27792843done
    27802844if test -z "$ac_aux_dir"; then
    2781   as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
     2845  as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
    27822846fi
    27832847
    27842848# These three variables are undocumented and unsupported,
    … …  
    28072871{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
    28082872$as_echo_n "checking for a BSD-compatible install... " >&6; }
    28092873if test -z "$INSTALL"; then
    2810 if test "${ac_cv_path_install+set}" = set; then :
     2874if ${ac_cv_path_install+:} false; then :
    28112875  $as_echo_n "(cached) " >&6
    28122876else
    28132877  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
    … …  
    28942958$as_echo "no, using $LN_S" >&6; }
    28952959fi
    28962960
     2961{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
     2962$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
     2963if ${ac_cv_path_GREP+:} false; then :
     2964  $as_echo_n "(cached) " >&6
     2965else
     2966  if test -z "$GREP"; then
     2967  ac_path_GREP_found=false
     2968  # Loop through the user's path and test for each of PROGNAME-LIST
     2969  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
     2970for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
     2971do
     2972  IFS=$as_save_IFS
     2973  test -z "$as_dir" && as_dir=.
     2974    for ac_prog in grep ggrep; do
     2975    for ac_exec_ext in '' $ac_executable_extensions; do
     2976      ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
     2977      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
     2978# Check for GNU ac_path_GREP and select it if it is found.
     2979  # Check for GNU $ac_path_GREP
     2980case `"$ac_path_GREP" --version 2>&1` in
     2981*GNU*)
     2982  ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
     2983*)
     2984  ac_count=0
     2985  $as_echo_n 0123456789 >"conftest.in"
     2986  while :
     2987  do
     2988    cat "conftest.in" "conftest.in" >"conftest.tmp"
     2989    mv "conftest.tmp" "conftest.in"
     2990    cp "conftest.in" "conftest.nl"
     2991    $as_echo 'GREP' >> "conftest.nl"
     2992    "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
     2993    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     2994    as_fn_arith $ac_count + 1 && ac_count=$as_val
     2995    if test $ac_count -gt ${ac_path_GREP_max-0}; then
     2996      # Best one so far, save it but keep looking for a better one
     2997      ac_cv_path_GREP="$ac_path_GREP"
     2998      ac_path_GREP_max=$ac_count
     2999    fi
     3000    # 10*(2^10) chars as input seems more than enough
     3001    test $ac_count -gt 10 && break
     3002  done
     3003  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
     3004esac
     3005
     3006      $ac_path_GREP_found && break 3
     3007    done
     3008  done
     3009  done
     3010IFS=$as_save_IFS
     3011  if test -z "$ac_cv_path_GREP"; then
     3012    as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
     3013  fi
     3014else
     3015  ac_cv_path_GREP=$GREP
     3016fi
     3017
     3018fi
     3019{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
     3020$as_echo "$ac_cv_path_GREP" >&6; }
     3021 GREP="$ac_cv_path_GREP"
     3022
     3023
     3024
     3025# Are we using GNU ld?
     3026{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
     3027$as_echo_n "checking for GNU ld... " >&6; }
     3028LD=`$CC -print-prog-name=ld 2>&5`
     3029
     3030if test `$LD -v 2>&1 | $ac_cv_path_GREP -c "GNU ld"` = 0; then
     3031        # Not
     3032        GNU_LD=""
     3033        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
     3034$as_echo "no" >&6; }
     3035else
     3036        GNU_LD="$LD"
     3037        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
     3038$as_echo "yes" >&6; }
     3039
     3040fi
    28973041
    28983042
    28993043ac_ext=c
    … …  
    29083052  CPP=
    29093053fi
    29103054if test -z "$CPP"; then
    2911   if test "${ac_cv_prog_CPP+set}" = set; then :
     3055  if ${ac_cv_prog_CPP+:} false; then :
    29123056  $as_echo_n "(cached) " >&6
    29133057else
    29143058      # Double quotes because CPP needs to be expanded
    … …  
    29383082  # Broken: fails on valid input.
    29393083continue
    29403084fi
    2941 rm -f conftest.err conftest.$ac_ext
     3085rm -f conftest.err conftest.i conftest.$ac_ext
    29423086
    29433087  # OK, works on sane cases.  Now check whether nonexistent headers
    29443088  # can be detected and how.
    … …  
    29543098ac_preproc_ok=:
    29553099break
    29563100fi
    2957 rm -f conftest.err conftest.$ac_ext
     3101rm -f conftest.err conftest.i conftest.$ac_ext
    29583102
    29593103done
    29603104# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
    2961 rm -f conftest.err conftest.$ac_ext
     3105rm -f conftest.i conftest.err conftest.$ac_ext
    29623106if $ac_preproc_ok; then :
    29633107  break
    29643108fi
    … …  
    29973141  # Broken: fails on valid input.
    29983142continue
    29993143fi
    3000 rm -f conftest.err conftest.$ac_ext
     3144rm -f conftest.err conftest.i conftest.$ac_ext
    30013145
    30023146  # OK, works on sane cases.  Now check whether nonexistent headers
    30033147  # can be detected and how.
    … …  
    30133157ac_preproc_ok=:
    30143158break
    30153159fi
    3016 rm -f conftest.err conftest.$ac_ext
     3160rm -f conftest.err conftest.i conftest.$ac_ext
    30173161
    30183162done
    30193163# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
    3020 rm -f conftest.err conftest.$ac_ext
     3164rm -f conftest.i conftest.err conftest.$ac_ext
    30213165if $ac_preproc_ok; then :
    30223166
    30233167else
    30243168  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
    30253169$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
    3026 as_fn_error "C preprocessor \"$CPP\" fails sanity check
    3027 See \`config.log' for more details." "$LINENO" 5; }
     3170as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
     3171See \`config.log' for more details" "$LINENO" 5; }
    30283172fi
    30293173
    30303174ac_ext=c
    … …  
    30343178ac_compiler_gnu=$ac_cv_c_compiler_gnu
    30353179
    30363180
    3037 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
    3038 $as_echo_n "checking for grep that handles long lines and -e... " >&6; }
    3039 if test "${ac_cv_path_GREP+set}" = set; then :
    3040   $as_echo_n "(cached) " >&6
    3041 else
    3042   if test -z "$GREP"; then
    3043   ac_path_GREP_found=false
    3044   # Loop through the user's path and test for each of PROGNAME-LIST
    3045   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
    3046 for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
    3047 do
    3048   IFS=$as_save_IFS
    3049   test -z "$as_dir" && as_dir=.
    3050     for ac_prog in grep ggrep; do
    3051     for ac_exec_ext in '' $ac_executable_extensions; do
    3052       ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
    3053       { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
    3054 # Check for GNU ac_path_GREP and select it if it is found.
    3055   # Check for GNU $ac_path_GREP
    3056 case `"$ac_path_GREP" --version 2>&1` in
    3057 *GNU*)
    3058   ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
    3059 *)
    3060   ac_count=0
    3061   $as_echo_n 0123456789 >"conftest.in"
    3062   while :
    3063   do
    3064     cat "conftest.in" "conftest.in" >"conftest.tmp"
    3065     mv "conftest.tmp" "conftest.in"
    3066     cp "conftest.in" "conftest.nl"
    3067     $as_echo 'GREP' >> "conftest.nl"
    3068     "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
    3069     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
    3070     as_fn_arith $ac_count + 1 && ac_count=$as_val
    3071     if test $ac_count -gt ${ac_path_GREP_max-0}; then
    3072       # Best one so far, save it but keep looking for a better one
    3073       ac_cv_path_GREP="$ac_path_GREP"
    3074       ac_path_GREP_max=$ac_count
    3075     fi
    3076     # 10*(2^10) chars as input seems more than enough
    3077     test $ac_count -gt 10 && break
    3078   done
    3079   rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
    3080 esac
    3081 
    3082       $ac_path_GREP_found && break 3
    3083     done
    3084   done
    3085   done
    3086 IFS=$as_save_IFS
    3087   if test -z "$ac_cv_path_GREP"; then
    3088     as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
    3089   fi
    3090 else
    3091   ac_cv_path_GREP=$GREP
    3092 fi
    3093 
    3094 fi
    3095 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
    3096 $as_echo "$ac_cv_path_GREP" >&6; }
    3097  GREP="$ac_cv_path_GREP"
    3098 
    3099 
    31003181{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
    31013182$as_echo_n "checking for egrep... " >&6; }
    3102 if test "${ac_cv_path_EGREP+set}" = set; then :
     3183if ${ac_cv_path_EGREP+:} false; then :
    31033184  $as_echo_n "(cached) " >&6
    31043185else
    31053186  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
    … …  
    31513232  done
    31523233IFS=$as_save_IFS
    31533234  if test -z "$ac_cv_path_EGREP"; then
    3154     as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
     3235    as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
    31553236  fi
    31563237else
    31573238  ac_cv_path_EGREP=$EGREP
    … …  
    31663247
    31673248{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
    31683249$as_echo_n "checking for ANSI C header files... " >&6; }
    3169 if test "${ac_cv_header_stdc+set}" = set; then :
     3250if ${ac_cv_header_stdc+:} false; then :
    31703251  $as_echo_n "(cached) " >&6
    31713252else
    31723253  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
    … …  
    32833364  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
    32843365ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
    32853366"
    3286 eval as_val=\$$as_ac_Header
    3287    if test "x$as_val" = x""yes; then :
     3367if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
    32883368  cat >>confdefs.h <<_ACEOF
    32893369#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
    32903370_ACEOF
    … …  
    32983378do :
    32993379  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
    33003380ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
    3301 eval as_val=\$$as_ac_Header
    3302    if test "x$as_val" = x""yes; then :
     3381if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
     3382  cat >>confdefs.h <<_ACEOF
     3383#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
     3384_ACEOF
     3385
     3386fi
     3387
     3388done
     3389
     3390ac_fn_c_check_header_mongrel "$LINENO" "slang.h" "ac_cv_header_slang_h" "$ac_includes_default"
     3391if test "x$ac_cv_header_slang_h" = xyes; then :
     3392
     3393else
     3394
     3395        old_CPPFLAGS=${CPPFLAGS}
     3396        CPPFLAGS="${CPPFLAGS} -I/opt/local/include"
     3397        unset ac_cv_header_slang_h
     3398        ac_fn_c_check_header_mongrel "$LINENO" "slang.h" "ac_cv_header_slang_h" "$ac_includes_default"
     3399if test "x$ac_cv_header_slang_h" = xyes; then :
     3400
     3401fi
     3402
     3403
     3404        if test x$ac_cv_header_slang_h = x; then
     3405                CPPFLAGS="${old_CPPFLAGS}"
     3406        else
     3407                LDFLAGS="${LDFLAGS} -L/opt/local/lib"
     3408        fi
     3409
     3410fi
     3411
     3412
     3413if test x$ac_cv_header_slang_h = x; then
     3414        old_CPPFLAGS=${CPPFLAGS}
     3415        CPPFLAGS="${CPPFLAGS} -I/sw/include"
     3416        ac_fn_c_check_header_mongrel "$LINENO" "slang.h" "ac_cv_header_slang_h" "$ac_includes_default"
     3417if test "x$ac_cv_header_slang_h" = xyes; then :
     3418
     3419fi
     3420
     3421
     3422        if test x$ac_cv_header_slang_h = x; then
     3423                CPPFLAGS=${old_CPPFLAGS}
     3424        else
     3425                LDFLAGS="${LDFLAGS} -L/sw/lib"
     3426        fi
     3427fi
     3428for ac_header in popt.h libintl.h
     3429do :
     3430  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
     3431ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
     3432if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
    33033433  cat >>confdefs.h <<_ACEOF
    33043434#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
    33053435_ACEOF
    … …  
    33253455if test "x$with_tcl" = "xno"; then
    33263456  WHIPTCLSO=
    33273457else
    3328   ac_fn_c_check_header_mongrel "$LINENO" "tcl.h" "ac_cv_header_tcl_h" "$ac_includes_default"
    3329 if test "x$ac_cv_header_tcl_h" = x""yes; then :
    3330   WHIPTCLSO=whiptcl.so
    3331 else
    3332   WHIPTCLSO=
    3333 fi
     3458  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tcl configuration" >&5
     3459$as_echo_n "checking for tcl configuration... " >&6; }
     3460  for i in ../tcl \
     3461      `ls -dr ../tcl[8-9].[0-9]* 2>/dev/null` \
     3462      ../../tcl \
     3463      `ls -dr ../../tcl[8-9].[0-9]* 2>/dev/null` \
     3464      ../../../tcl \
     3465      `ls -dr ../../../tcl[8-9].[0-9]* 2>/dev/null` ; do
     3466    if test -f "$i/unix/tclConfig.sh" ; then
     3467      ac_cv_c_tclconfig=`(cd $i/unix; pwd)`
     3468      break
     3469    fi
     3470  done
     3471
     3472            # check in a few common install locations
     3473            if test x"${ac_cv_c_tclconfig}" = x ; then
     3474                for i in `ls -d ${libdir} 2>/dev/null` \
     3475                        `ls -d /usr/lib 2>/dev/null` \
     3476                        `ls -d /usr/local/lib 2>/dev/null` \
     3477                        `ls -d /usr/contrib/lib 2>/dev/null` \
     3478                        `ls -d /usr/pkg/lib 2>/dev/null` \
     3479                        `ls -d /usr/local/lib/tcl8.5 2>/dev/null` \
     3480                        `ls -d /usr/local/lib/tcl8.4 2>/dev/null` \
     3481                        `ls -d /usr/lib/tcl8.5 2>/dev/null` \
     3482                        `ls -d /usr/lib/tcl8.4 2>/dev/null` \
     3483                        `ls -d /opt/local/lib 2>/dev/null` \
     3484                        ; do
     3485                    if test -f "$i/tclConfig.sh" ; then
     3486                        ac_cv_c_tclconfig=`(cd $i; pwd)`
     3487                        break
     3488                    fi
     3489                done
     3490            fi
     3491
     3492            # check in a few other private locations
     3493            if test x"${ac_cv_c_tclconfig}" = x ; then
     3494                for i in \
     3495                        ${srcdir}/../tcl \
     3496                        `ls -dr ${srcdir}/../tcl[8-9].[0-9]* 2>/dev/null` ; do
     3497                    if test -f "$i/unix/tclConfig.sh" ; then
     3498                    ac_cv_c_tclconfig=`(cd $i/unix; pwd)`
     3499                    break
     3500                fi
     3501                done
     3502            fi
    33343503
     3504  if test x"${ac_cv_c_tclconfig}" != x ; then
     3505    { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
     3506$as_echo "found" >&6; }
     3507    . ${ac_cv_c_tclconfig}/tclConfig.sh
    33353508
     3509    WHIPTCLSO=whiptcl.so
     3510  else
     3511    { $as_echo "$as_me:${as_lineno-$LINENO}: result: NOT found" >&5
     3512$as_echo "NOT found" >&6; }
     3513  fi
    33363514fi
    33373515
    33383516
    … …  
    33563534
    33573535
    33583536if test "x$enable_nls" != "xno"; then
     3537  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gettext in -lc" >&5
     3538$as_echo_n "checking for gettext in -lc... " >&6; }
     3539if ${ac_cv_lib_c_gettext+:} false; then :
     3540  $as_echo_n "(cached) " >&6
     3541else
     3542  ac_check_lib_save_LIBS=$LIBS
     3543LIBS="-lc  $LIBS"
     3544cat confdefs.h - <<_ACEOF >conftest.$ac_ext
     3545/* end confdefs.h.  */
     3546
     3547/* Override any GCC internal prototype to avoid an error.
     3548   Use char because int might match the return type of a GCC
     3549   builtin and then its argument prototype would still apply.  */
     3550#ifdef __cplusplus
     3551extern "C"
     3552#endif
     3553char gettext ();
     3554int
     3555main ()
     3556{
     3557return gettext ();
     3558  ;
     3559  return 0;
     3560}
     3561_ACEOF
     3562if ac_fn_c_try_link "$LINENO"; then :
     3563  ac_cv_lib_c_gettext=yes
     3564else
     3565  ac_cv_lib_c_gettext=no
     3566fi
     3567rm -f core conftest.err conftest.$ac_objext \
     3568    conftest$ac_exeext conftest.$ac_ext
     3569LIBS=$ac_check_lib_save_LIBS
     3570fi
     3571{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_gettext" >&5
     3572$as_echo "$ac_cv_lib_c_gettext" >&6; }
     3573if test "x$ac_cv_lib_c_gettext" = xyes; then :
     3574  cat >>confdefs.h <<_ACEOF
     3575#define HAVE_LIBC 1
     3576_ACEOF
     3577
     3578  LIBS="-lc $LIBS"
     3579
     3580else
     3581
     3582    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gettext in -lintl" >&5
     3583$as_echo_n "checking for gettext in -lintl... " >&6; }
     3584if ${ac_cv_lib_intl_gettext+:} false; then :
     3585  $as_echo_n "(cached) " >&6
     3586else
     3587  ac_check_lib_save_LIBS=$LIBS
     3588LIBS="-lintl  $LIBS"
     3589cat confdefs.h - <<_ACEOF >conftest.$ac_ext
     3590/* end confdefs.h.  */
     3591
     3592/* Override any GCC internal prototype to avoid an error.
     3593   Use char because int might match the return type of a GCC
     3594   builtin and then its argument prototype would still apply.  */
     3595#ifdef __cplusplus
     3596extern "C"
     3597#endif
     3598char gettext ();
     3599int
     3600main ()
     3601{
     3602return gettext ();
     3603  ;
     3604  return 0;
     3605}
     3606_ACEOF
     3607if ac_fn_c_try_link "$LINENO"; then :
     3608  ac_cv_lib_intl_gettext=yes
     3609else
     3610  ac_cv_lib_intl_gettext=no
     3611fi
     3612rm -f core conftest.err conftest.$ac_objext \
     3613    conftest$ac_exeext conftest.$ac_ext
     3614LIBS=$ac_check_lib_save_LIBS
     3615fi
     3616{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_gettext" >&5
     3617$as_echo "$ac_cv_lib_intl_gettext" >&6; }
     3618if test "x$ac_cv_lib_intl_gettext" = xyes; then :
     3619
     3620      LIBS="-lintl"
     3621
     3622else
     3623
     3624        if test "x$enable_nls" != "xcheck"; then
     3625          { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
     3626$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
     3627as_fn_error $? "--enable-nls was specified, but the configure check failed
     3628See \`config.log' for more details" "$LINENO" 5; }
     3629        else
     3630          enable_nls=no
     3631        fi
     3632
     3633fi
     3634
     3635
     3636fi
     3637
     3638  if test "x$enable_nls" != "xno"; then
    33593639
    33603640$as_echo "#define ENABLE_NLS 1" >>confdefs.h
    33613641
     3642  fi
    33623643fi
    33633644
    33643645ac_config_files="$ac_config_files Makefile libnewt.pc"
    … …  
    34273708     :end' >>confcache
    34283709if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
    34293710  if test -w "$cache_file"; then
    3430     test "x$cache_file" != "x/dev/null" &&
     3711    if test "x$cache_file" != "x/dev/null"; then
    34313712      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
    34323713$as_echo "$as_me: updating cache $cache_file" >&6;}
    3433     cat confcache >$cache_file
     3714      if test ! -f "$cache_file" || test -h "$cache_file"; then
     3715        cat confcache >"$cache_file"
     3716      else
     3717        case $cache_file in #(
     3718        */* | ?:*)
     3719          mv -f confcache "$cache_file"$$ &&
     3720          mv -f "$cache_file"$$ "$cache_file" ;; #(
     3721        *)
     3722          mv -f confcache "$cache_file" ;;
     3723        esac
     3724      fi
     3725    fi
    34343726  else
    34353727    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
    34363728$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
    … …  
    34463738
    34473739ac_libobjs=
    34483740ac_ltlibobjs=
     3741U=
    34493742for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
    34503743  # 1. Remove the extension, and $U if already installed.
    34513744  ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
    … …  
    34613754
    34623755
    34633756
    3464 : ${CONFIG_STATUS=./config.status}
     3757: "${CONFIG_STATUS=./config.status}"
    34653758ac_write_fail=0
    34663759ac_clean_files_save=$ac_clean_files
    34673760ac_clean_files="$ac_clean_files $CONFIG_STATUS"
    … …  
    35623855IFS=" ""        $as_nl"
    35633856
    35643857# Find who we are.  Look in the path if we contain no directory separator.
     3858as_myself=
    35653859case $0 in #((
    35663860  *[\\/]* ) as_myself=$0 ;;
    35673861  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
    … …  
    36073901(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
    36083902
    36093903
    3610 # as_fn_error ERROR [LINENO LOG_FD]
    3611 # ---------------------------------
     3904# as_fn_error STATUS ERROR [LINENO LOG_FD]
     3905# ----------------------------------------
    36123906# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
    36133907# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
    3614 # script with status $?, using 1 if that was 0.
     3908# script with STATUS, using 1 if that was 0.
    36153909as_fn_error ()
    36163910{
    3617   as_status=$?; test $as_status -eq 0 && as_status=1
    3618   if test "$3"; then
    3619     as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
    3620     $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
     3911  as_status=$1; test $as_status -eq 0 && as_status=1
     3912  if test "$4"; then
     3913    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
     3914    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
    36213915  fi
    3622   $as_echo "$as_me: error: $1" >&2
     3916  $as_echo "$as_me: error: $2" >&2
    36233917  as_fn_exit $as_status
    36243918} # as_fn_error
    36253919
    … …  
    38154109      test -d "$as_dir" && break
    38164110    done
    38174111    test -z "$as_dirs" || eval "mkdir $as_dirs"
    3818   } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
     4112  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
    38194113
    38204114
    38214115} # as_fn_mkdir_p
    … …  
    38694163# values after options handling.
    38704164ac_log="
    38714165This file was extended by $as_me, which was
    3872 generated by GNU Autoconf 2.65.  Invocation command line was
     4166generated by GNU Autoconf 2.68.  Invocation command line was
    38734167
    38744168  CONFIG_FILES    = $CONFIG_FILES
    38754169  CONFIG_HEADERS  = $CONFIG_HEADERS
    … …  
    39314225ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
    39324226ac_cs_version="\\
    39334227config.status
    3934 configured by $0, generated by GNU Autoconf 2.65,
     4228configured by $0, generated by GNU Autoconf 2.68,
    39354229  with options \\"\$ac_cs_config\\"
    39364230
    3937 Copyright (C) 2009 Free Software Foundation, Inc.
     4231Copyright (C) 2010 Free Software Foundation, Inc.
    39384232This config.status script is free software; the Free Software Foundation
    39394233gives unlimited permission to copy, distribute and modify it."
    39404234
    … …  
    39504244while test $# != 0
    39514245do
    39524246  case $1 in
    3953   --*=*)
     4247  --*=?*)
    39544248    ac_option=`expr "X$1" : 'X\([^=]*\)='`
    39554249    ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
    39564250    ac_shift=:
    39574251    ;;
     4252  --*=)
     4253    ac_option=`expr "X$1" : 'X\([^=]*\)='`
     4254    ac_optarg=
     4255    ac_shift=:
     4256    ;;
    39584257  *)
    39594258    ac_option=$1
    39604259    ac_optarg=$2
    … …  
    39764275    $ac_shift
    39774276    case $ac_optarg in
    39784277    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
     4278    '') as_fn_error $? "missing file argument" ;;
    39794279    esac
    39804280    as_fn_append CONFIG_FILES " '$ac_optarg'"
    39814281    ac_need_defaults=false;;
    … …  
    39884288    ac_need_defaults=false;;
    39894289  --he | --h)
    39904290    # Conflict between --help and --header
    3991     as_fn_error "ambiguous option: \`$1'
     4291    as_fn_error $? "ambiguous option: \`$1'
    39924292Try \`$0 --help' for more information.";;
    39934293  --help | --hel | -h )
    39944294    $as_echo "$ac_cs_usage"; exit ;;
    … …  
    39974297    ac_cs_silent=: ;;
    39984298
    39994299  # This is an error.
    4000   -*) as_fn_error "unrecognized option: \`$1'
     4300  -*) as_fn_error $? "unrecognized option: \`$1'
    40014301Try \`$0 --help' for more information." ;;
    40024302
    40034303  *) as_fn_append ac_config_targets " $1"
    … …  
    40504350    "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
    40514351    "libnewt.pc") CONFIG_FILES="$CONFIG_FILES libnewt.pc" ;;
    40524352
    4053   *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
     4353  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
    40544354  esac
    40554355done
    40564356
    … …  
    40724372# after its creation but before its name has been assigned to `$tmp'.
    40734373$debug ||
    40744374{
    4075   tmp=
     4375  tmp= ac_tmp=
    40764376  trap 'exit_status=$?
    4077   { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
     4377  : "${ac_tmp:=$tmp}"
     4378  { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
    40784379' 0
    40794380  trap 'as_fn_exit 1' 1 2 13 15
    40804381}
    … …  
    40824383
    40834384{
    40844385  tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
    4085   test -n "$tmp" && test -d "$tmp"
     4386  test -d "$tmp"
    40864387}  ||
    40874388{
    40884389  tmp=./conf$$-$RANDOM
    40894390  (umask 077 && mkdir "$tmp")
    4090 } || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
     4391} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
     4392ac_tmp=$tmp
    40914393
    40924394# Set up the scripts for CONFIG_FILES section.
    40934395# No need to generate them if there are no CONFIG_FILES.
    … …  
    41044406fi
    41054407ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
    41064408if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
    4107   ac_cs_awk_cr='\r'
     4409  ac_cs_awk_cr='\\r'
    41084410else
    41094411  ac_cs_awk_cr=$ac_cr
    41104412fi
    41114413
    4112 echo 'BEGIN {' >"$tmp/subs1.awk" &&
     4414echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
    41134415_ACEOF
    41144416
    41154417
    … …  
    41184420  echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
    41194421  echo "_ACEOF"
    41204422} >conf$$subs.sh ||
    4121   as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
    4122 ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
     4423  as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
     4424ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
    41234425ac_delim='%!_!# '
    41244426for ac_last_try in false false false false false :; do
    41254427  . ./conf$$subs.sh ||
    4126     as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
     4428    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
    41274429
    41284430  ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
    41294431  if test $ac_delim_n = $ac_delim_num; then
    41304432    break
    41314433  elif $ac_last_try; then
    4132     as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
     4434    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
    41334435  else
    41344436    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
    41354437  fi
    … …  
    41374439rm -f conf$$subs.sh
    41384440
    41394441cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
    4140 cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
     4442cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
    41414443_ACEOF
    41424444sed -n '
    41434445h
    … …  
    41854487rm -f conf$$subs.awk
    41864488cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
    41874489_ACAWK
    4188 cat >>"\$tmp/subs1.awk" <<_ACAWK &&
     4490cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
    41894491  for (key in S) S_is_set[key] = 1
    41904492  FS = ""
    41914493
    … …  
    42174519  sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
    42184520else
    42194521  cat
    4220 fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
    4221   || as_fn_error "could not setup config files machinery" "$LINENO" 5
     4522fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
     4523  || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
    42224524_ACEOF
    42234525
    4224 # VPATH may cause trouble with some makes, so we remove $(srcdir),
    4225 # ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
     4526# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
     4527# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
    42264528# trailing colons and then remove the whole line if VPATH becomes empty
    42274529# (actually we leave an empty line to preserve line numbers).
    42284530if test "x$srcdir" = x.; then
    4229   ac_vpsub='/^[  ]*VPATH[        ]*=/{
    4230 s/:*\$(srcdir):*/:/
    4231 s/:*\${srcdir}:*/:/
    4232 s/:*@srcdir@:*/:/
    4233 s/^\([^=]*=[     ]*\):*/\1/
     4531  ac_vpsub='/^[  ]*VPATH[        ]*=[    ]*/{
     4532h
     4533s///
     4534s/^/:/
     4535s/[      ]*$/:/
     4536s/:\$(srcdir):/:/g
     4537s/:\${srcdir}:/:/g
     4538s/:@srcdir@:/:/g
     4539s/^:*//
    42344540s/:*$//
     4541x
     4542s/\(=[   ]*\).*/\1/
     4543G
     4544s/\n//
    42354545s/^[^=]*=[       ]*$//
    42364546}'
    42374547fi
    … …  
    42434553# No need to generate them if there are no CONFIG_HEADERS.
    42444554# This happens for instance with `./config.status Makefile'.
    42454555if test -n "$CONFIG_HEADERS"; then
    4246 cat >"$tmp/defines.awk" <<\_ACAWK ||
     4556cat >"$ac_tmp/defines.awk" <<\_ACAWK ||
    42474557BEGIN {
    42484558_ACEOF
    42494559
    … …  
    42554565# handling of long lines.
    42564566ac_delim='%!_!# '
    42574567for ac_last_try in false false :; do
    4258   ac_t=`sed -n "/$ac_delim/p" confdefs.h`
    4259   if test -z "$ac_t"; then
     4568  ac_tt=`sed -n "/$ac_delim/p" confdefs.h`
     4569  if test -z "$ac_tt"; then
    42604570    break
    42614571  elif $ac_last_try; then
    4262     as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5
     4572    as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
    42634573  else
    42644574    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
    42654575  fi
    … …  
    43444654_ACAWK
    43454655_ACEOF
    43464656cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
    4347   as_fn_error "could not setup config headers machinery" "$LINENO" 5
     4657  as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
    43484658fi # test -n "$CONFIG_HEADERS"
    43494659
    43504660
    … …  
    43574667  esac
    43584668  case $ac_mode$ac_tag in
    43594669  :[FHL]*:*);;
    4360   :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
     4670  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
    43614671  :[FH]-) ac_tag=-:-;;
    43624672  :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
    43634673  esac
    … …  
    43764686    for ac_f
    43774687    do
    43784688      case $ac_f in
    4379       -) ac_f="$tmp/stdin";;
     4689      -) ac_f="$ac_tmp/stdin";;
    43804690      *) # Look for the file first in the build tree, then in the source tree
    43814691         # (if the path is not absolute).  The absolute path cannot be DOS-style,
    43824692         # because $ac_f cannot contain `:'.
    … …  
    43854695           [\\/$]*) false;;
    43864696           *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
    43874697           esac ||
    4388            as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;
     4698           as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
    43894699      esac
    43904700      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
    43914701      as_fn_append ac_file_inputs " '$ac_f'"
    … …  
    44114721    esac
    44124722
    44134723    case $ac_tag in
    4414     *:-:* | *:-) cat >"$tmp/stdin" \
    4415       || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
     4724    *:-:* | *:-) cat >"$ac_tmp/stdin" \
     4725      || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
    44164726    esac
    44174727    ;;
    44184728  esac
    … …  
    45424852s&@INSTALL@&$ac_INSTALL&;t t
    45434853$ac_datarootdir_hack
    45444854"
    4545 eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
    4546   || as_fn_error "could not create $ac_file" "$LINENO" 5
     4855eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
     4856  >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
    45474857
    45484858test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
    4549   { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
    4550   { ac_out=`sed -n '/^[  ]*datarootdir[  ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
     4859  { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
     4860  { ac_out=`sed -n '/^[  ]*datarootdir[  ]*:*=/p' \
     4861      "$ac_tmp/out"`; test -z "$ac_out"; } &&
    45514862  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
    4552 which seems to be undefined.  Please make sure it is defined." >&5
     4863which seems to be undefined.  Please make sure it is defined" >&5
    45534864$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
    4554 which seems to be undefined.  Please make sure it is defined." >&2;}
     4865which seems to be undefined.  Please make sure it is defined" >&2;}
    45554866
    4556   rm -f "$tmp/stdin"
     4867  rm -f "$ac_tmp/stdin"
    45574868  case $ac_file in
    4558   -) cat "$tmp/out" && rm -f "$tmp/out";;
    4559   *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
     4869  -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
     4870  *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
    45604871  esac \
    4561   || as_fn_error "could not create $ac_file" "$LINENO" 5
     4872  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
    45624873 ;;
    45634874  :H)
    45644875  #
    … …  
    45674878  if test x"$ac_file" != x-; then
    45684879    {
    45694880      $as_echo "/* $configure_input  */" \
    4570       && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
    4571     } >"$tmp/config.h" \
    4572       || as_fn_error "could not create $ac_file" "$LINENO" 5
    4573     if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
     4881      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
     4882    } >"$ac_tmp/config.h" \
     4883      || as_fn_error $? "could not create $ac_file" "$LINENO" 5
     4884    if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
    45744885      { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
    45754886$as_echo "$as_me: $ac_file is unchanged" >&6;}
    45764887    else
    45774888      rm -f "$ac_file"
    4578       mv "$tmp/config.h" "$ac_file" \
    4579         || as_fn_error "could not create $ac_file" "$LINENO" 5
     4889      mv "$ac_tmp/config.h" "$ac_file" \
     4890        || as_fn_error $? "could not create $ac_file" "$LINENO" 5
    45804891    fi
    45814892  else
    45824893    $as_echo "/* $configure_input  */" \
    4583       && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
    4584       || as_fn_error "could not create -" "$LINENO" 5
     4894      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
     4895      || as_fn_error $? "could not create -" "$LINENO" 5
    45854896  fi
    45864897 ;;
    45874898
    … …  
    45964907ac_clean_files=$ac_clean_files_save
    45974908
    45984909test $ac_write_fail = 0 ||
    4599   as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
     4910  as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
    46004911
    46014912
    46024913# configure is writing to config.log, and then calls config.status.
    … …  
    46174928  exec 5>>config.log
    46184929  # Use ||, not &&, to avoid exiting from the if with $? = 1, which
    46194930  # would make configure fail if this is the last instruction.
    4620   $ac_cs_success || as_fn_exit $?
     4931  $ac_cs_success || as_fn_exit 1
    46214932fi
    46224933if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
    46234934  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5

  • configure.ac 

    diff -urN newt-0.52.12/configure.ac newt-0.52.12-macosx/configure.ac
    old new  
    1313AC_PROG_CC
    1414AC_PROG_INSTALL
    1515AC_PROG_LN_S
     16AC_PROG_GREP
     17
     18# Are we using GNU ld?
     19AC_MSG_CHECKING([for GNU ld])
     20LD=`$CC -print-prog-name=ld 2>&5`
     21
     22if test `$LD -v 2>&1 | $ac_cv_path_GREP -c "GNU ld"` = 0; then
     23        # Not
     24        GNU_LD=""
     25        AC_MSG_RESULT([no])
     26else
     27        GNU_LD="$LD"
     28        AC_MSG_RESULT([yes])
     29        AC_SUBST([GNU_LD])
     30fi
    1631
    1732AC_CHECK_HEADERS([sys/select.h alloca.h])
     33AC_CHECK_HEADER([slang.h], [], [
     34        old_CPPFLAGS=${CPPFLAGS}
     35        CPPFLAGS="${CPPFLAGS} -I/opt/local/include"
     36        unset ac_cv_header_slang_h
     37        AC_CHECK_HEADER([slang.h])
     38        if test x$ac_cv_header_slang_h = x; then
     39                CPPFLAGS="${old_CPPFLAGS}"
     40        else
     41                LDFLAGS="${LDFLAGS} -L/opt/local/lib"
     42        fi
     43])
     44if test x$ac_cv_header_slang_h = x; then
     45        old_CPPFLAGS=${CPPFLAGS}
     46        CPPFLAGS="${CPPFLAGS} -I/sw/include"
     47        AC_CHECK_HEADER([slang.h])
     48        if test x$ac_cv_header_slang_h = x; then
     49                CPPFLAGS=${old_CPPFLAGS}
     50        else
     51                LDFLAGS="${LDFLAGS} -L/sw/lib"
     52        fi
     53fi
     54AC_CHECK_HEADERS([popt.h libintl.h])
    1855
    1956AC_MSG_CHECKING([for python versions])
    2057PYTHONVERS=$(echo /usr/include/python*/Python.h | sed "s|/usr/include/||g"| sed "s|/Python.h||g" 2> /dev/null)
    … …  
    2562if test "x$with_tcl" = "xno"; then
    2663  WHIPTCLSO=
    2764else
    28   AC_CHECK_HEADER([tcl.h], [WHIPTCLSO=whiptcl.so], [WHIPTCLSO=])
     65  AC_MSG_CHECKING([for tcl configuration])
     66  for i in ../tcl \
     67      `ls -dr ../tcl[[8-9]].[[0-9]]* 2>/dev/null` \
     68      ../../tcl \
     69      `ls -dr ../../tcl[[8-9]].[[0-9]]* 2>/dev/null` \
     70      ../../../tcl \
     71      `ls -dr ../../../tcl[[8-9]].[[0-9]]* 2>/dev/null` ; do
     72    if test -f "$i/unix/tclConfig.sh" ; then
     73      ac_cv_c_tclconfig=`(cd $i/unix; pwd)`
     74      break
     75    fi
     76  done
     77
     78            # check in a few common install locations
     79            if test x"${ac_cv_c_tclconfig}" = x ; then
     80                for i in `ls -d ${libdir} 2>/dev/null` \
     81                        `ls -d /usr/lib 2>/dev/null` \
     82                        `ls -d /usr/local/lib 2>/dev/null` \
     83                        `ls -d /usr/contrib/lib 2>/dev/null` \
     84                        `ls -d /usr/pkg/lib 2>/dev/null` \
     85                        `ls -d /usr/local/lib/tcl8.5 2>/dev/null` \
     86                        `ls -d /usr/local/lib/tcl8.4 2>/dev/null` \
     87                        `ls -d /usr/lib/tcl8.5 2>/dev/null` \
     88                        `ls -d /usr/lib/tcl8.4 2>/dev/null` \
     89                        `ls -d /opt/local/lib 2>/dev/null` \
     90                        ; do
     91                    if test -f "$i/tclConfig.sh" ; then
     92                        ac_cv_c_tclconfig=`(cd $i; pwd)`
     93                        break
     94                    fi
     95                done
     96            fi
     97
     98            # check in a few other private locations
     99            if test x"${ac_cv_c_tclconfig}" = x ; then
     100                for i in \
     101                        ${srcdir}/../tcl \
     102                        `ls -dr ${srcdir}/../tcl[[8-9]].[[0-9]]* 2>/dev/null` ; do
     103                    if test -f "$i/unix/tclConfig.sh" ; then
     104                    ac_cv_c_tclconfig=`(cd $i/unix; pwd)`
     105                    break
     106                fi
     107                done
     108            fi
     109
     110  if test x"${ac_cv_c_tclconfig}" != x ; then
     111    AC_MSG_RESULT([found])
     112    . ${ac_cv_c_tclconfig}/tclConfig.sh
     113    AC_SUBST([TCL_LIB_FLAG])
     114    WHIPTCLSO=whiptcl.so
     115  else
     116    AC_MSG_RESULT([NOT found])
     117  fi
    29118fi
    30119AC_SUBST([WHIPTCLSO])
    31120
    … …  
    38127AC_ARG_ENABLE([nls], [  --disable-nls           compile without NLS support])
    39128
    40129if test "x$enable_nls" != "xno"; then
    41   AC_DEFINE([ENABLE_NLS], 1, [Define to 1 if NLS support is enabled])
     130  AC_CHECK_LIB([c], [gettext], [], [
     131    AC_CHECK_LIB([intl], [gettext], [
     132      LIBS="-lintl"
     133      AC_SUBST([LIBS])], [
     134        if test "x$enable_nls" != "xcheck"; then
     135          AC_MSG_FAILURE([--enable-nls was specified, but the configure check failed])
     136        else
     137          enable_nls=no
     138        fi
     139    ])
     140  ])
     141  if test "x$enable_nls" != "xno"; then
     142    AC_DEFINE([ENABLE_NLS], 1, [Define to 1 if NLS support is enabled])
     143  fi
    42144fi
    43145
    44146AC_CONFIG_FILES([Makefile libnewt.pc])

  • whiptail.c 

    diff -urN newt-0.52.12/whiptail.c newt-0.52.12-macosx/whiptail.c
    old new  
    88#include <unistd.h>
    99#include <wchar.h>
    1010#include <slang.h>
     11#include <sys/stat.h>
    1112
    1213#include "nls.h"
    1314#include "dialogboxes.h"