---- fish-1.22.3/configure.ac.orig 2007-02-08 18:38:58.000000000 +0100
-+++ fish-1.22.3/configure.ac 2007-08-25 15:38:21.396699519 +0200
-@@ -457,7 +457,7 @@
- fi
+diff -Nur fish-1.23.0.orig/configure.ac fish-1.23.0.link/configure.ac
+--- fish-1.23.0.orig/configure.ac 2008-01-12 18:47:44.000000000 -0700
++++ fish-1.23.0.link/configure.ac 2008-01-16 21:27:38.000000000 -0700
+@@ -504,7 +504,7 @@
+ LIBS=""
AC_SEARCH_LIBS( connect, socket, , [AC_MSG_ERROR([Cannot find the socket library, needed to build this package.] )] )
AC_SEARCH_LIBS( nanosleep, rt, , [AC_MSG_ERROR([Cannot find the rt library, needed to build this package.] )] )
-AC_SEARCH_LIBS( setupterm, [ncurses curses], , [AC_MSG_ERROR([Could not find a curses implementation, needed to build fish])] )
+AC_SEARCH_LIBS( setupterm, [tinfo ncurses curses], , [AC_MSG_ERROR([Could not find a curses implementation, needed to build fish])] )
- AC_SEARCH_LIBS( iconv_open, iconv, , [AC_MSG_ERROR([Could not find an iconv implementation, needed to build fish])] )
-
+ LIBS_SHARED=$LIBS
+ LIBS=$LIBS_COMMON
+diff -Nur fish-1.23.0.orig/configure.ac.orig fish-1.23.0.link/configure.ac.orig
+--- fish-1.23.0.orig/configure.ac.orig 1969-12-31 17:00:00.000000000 -0700
++++ fish-1.23.0.link/configure.ac.orig 2008-01-12 18:47:44.000000000 -0700
+@@ -0,0 +1,975 @@
++
++#
++# This file is the main build configuration file for fish. It is used
++# to determine your systems capabilities, and tries to adapt fish to
++# take maximum advantage of the services your system offers.
++#
++# Process this file using the 'autoconf' command to produce a working
++# configure script, which should in turn be executed in order to
++# configure the build process.
++#
++
++AC_INIT(fish,1.23.0,fish-users@lists.sf.net)
++
++
++#
++# List of output variables produced by this configure script
++#
++
++AC_SUBST( docdir )
++AC_SUBST( HAVE_GETTEXT )
++AC_SUBST( LDFLAGS_FISH )
++AC_SUBST( LIBS_FISH )
++AC_SUBST( LIBS_FISH_INDENT )
++AC_SUBST( LIBS_FISH_PAGER )
++AC_SUBST( LIBS_FISHD )
++AC_SUBST( LIBS_MIMEDB )
++AC_SUBST( LIBS_SET_COLOR )
++AC_SUBST( localedir )
++AC_SUBST( optbindirs )
++AC_SUBST( prefix )
++AC_SUBST( SEQ_FALLBACK )
++AC_SUBST( XSEL )
++AC_SUBST( XSEL_MAN )
++AC_SUBST( XSEL_MAN_PATH )
++
++#
++# If needed, run autoconf to regenerate the configure file
++#
++# This makes sure that after running autoconf once to create the first
++# version of configure, we never again need to worry about manually
++# running autoconf to handle an updates configure.ac.
++#
++
++AC_MSG_CHECKING([if autoconf needs to be run])
++if test configure -ot configure.ac; then
++ AC_MSG_RESULT([yes])
++ if which autoconf >/dev/null; then
++ # No need to provide any error messages if autoconf fails, the
++ # shell and autconf should take care of that themselves
++ AC_MSG_NOTICE([running autoconf])
++ if autoconf; then
++ ./configure "$@"
++ exit
++ fi
++ exit 1
++ else
++ AC_MSG_ERROR(
++ [cannot find the autoconf program in your path.
++This program needs to be run whenever the configure.ac file is modified.
++Please install it and try again.]
++ )
++ fi
++else
++ AC_MSG_RESULT([no])
++fi
++
++
++#
++# If needed, run autoheader to regenerate config.h.in
++#
++# This makes sure we never ever have to run autoheader manually. It
++# will be run whenever needed automatically.
++#
++
++AC_MSG_CHECKING([if autoheader needs to be run])
++if test ! -f ./config.h.in -o config.h.in -ot configure.ac; then
++ AC_MSG_RESULT([yes])
++ if which autoheader >/dev/null; then
++ AC_MSG_NOTICE([running autoheader])
++ autoheader || exit 1
++ else
++ AC_MSG_ERROR(
++ [cannot find the autoheader program in your path.
++This program needs to be run whenever the configure.ac file is modified.
++Please install it and try again.]
++ )
++ fi
++else
++ AC_MSG_RESULT([no])
++fi
++
++
++#
++# Detect directories which may contain additional headers, libraries
++# and commands. This needs to be done early - before Autoconf starts
++# to mess with CFLAGS and all the other environemnt variables.
++#
++# This mostly helps OS X users, since fink usually installs out of
++# tree and doesn't update CFLAGS.
++#
++
++for i in /usr/pkg /sw /opt /opt/local; do
++
++ AC_MSG_CHECKING([for $i/include include directory])
++ if test -d $i/include; then
++ AC_MSG_RESULT(yes)
++ CPPFLAGS="$CPPFLAGS -I$i/include/"
++ CFLAGS="$CFLAGS -I$i/include/"
++ else
++ AC_MSG_RESULT(no)
++ fi
++
++ AC_MSG_CHECKING([for $i/lib library directory])
++ if test -d $i/lib; then
++ AC_MSG_RESULT(yes)
++ LDFLAGS="$LDFLAGS -L$i/lib/ -R$i/lib/"
++ else
++ AC_MSG_RESULT(no)
++ fi
++
++ AC_MSG_CHECKING([for $i/bin command directory])
++ if test -d $i/bin; then
++ AC_MSG_RESULT(yes)
++ optbindirs="$optbindirs $i/bin"
++ else
++ AC_MSG_RESULT(no)
++ fi
++
++done
++
++
++#
++# Tell autoconf to create config.h header
++#
++AC_CONFIG_HEADERS(config.h)
++
++
++#
++# This adds markup to the code that results in a few extra compile
++# time checks on recent GCC versions. It helps stop a few common bugs.
++#
++
++AH_BOTTOM([#if __GNUC__ >= 3
++#define __warn_unused __attribute__ ((warn_unused_result))
++#define __sentinel __attribute__ ((sentinel))
++#else
++#define __warn_unused
++#define __sentinel
++#endif])
++
++
++#
++# Set up various programs needed for install
++#
++
++# Here we look for c99 before cc as Sun Studio compiler supports c99
++# through the c99 binary.
++
++AC_PROG_CC([gcc c99 cc])
++AC_PROG_CPP
++AC_PROG_INSTALL
++
++#
++# Check for seq command. If missing, make sure fallback shellscript
++# implementation is installed.
++#
++
++AC_CHECK_PROG( SEQ_FALLBACK, seq, [ ], [seq])
++
++
++if test "$SEQ_FALLBACK"; then
++
++ #
++ # We already have seq. Check if the seq version is installed by an
++ # earlier fish version. If it is, we'll replace it.
++ #
++
++ file=`which seq`
++ if test -f "$file"; then
++
++ AC_MSG_CHECKING([if seq comes from a previous fish version])
++ shebang=`grep "\(^#!/.*/fish\|^#!/usr/bin/env fish\)" $file`
++
++ if test "$shebang"; then
++ SEQ_FALLBACK=seq
++ AC_MSG_RESULT(yes, replace it)
++ else
++ AC_MSG_RESULT(no, keep it)
++ fi
++ fi
++fi
++
++
++#
++# Optionally drop xsel command
++#
++
++AC_ARG_WITH(
++ xsel,
++ AC_HELP_STRING(
++ [--without-xsel],
++ [do not build the xsel program needed for X clipboard integration]
++ ),
++ [xsel=$withval],
++ [xsel=with_xsel]
++)
++
++if [[ "$xsel" = "with_xsel" ]]; then
++ XSEL=xsel-0.9.6/xsel
++ XSEL_MAN=xsel.1x
++ XSEL_MAN_PATH=xsel-0.9.6/xsel.1x
++fi
++
++
++#
++# Optionally drop gettext support
++#
++
++AC_ARG_WITH(
++ gettext,
++ AC_HELP_STRING(
++ [--without-gettext],
++ [do not translate messages, even if gettext is available]
++ ),
++ [local_gettext=$withval],
++ [local_gettext=yes]
++)
++
++if test x$local_gettext != xno; then
++ AC_DEFINE([USE_GETTEXT],[1],[Perform string translations with gettext])
++fi
++
++
++#
++# Test if the compiler accepts the -std=c99 flag. If so, using it
++# increases the odds of correct compilation, since we want to use the
++# *wprintf functions, which where defined in C99.
++#
++# NOTE: Never versions of autoconf has AC_CHECK_PROG_CC_C99
++#
++
++if test "$CC" != "c99"; then
++ XCFLAGS="$CFLAGS"
++ CFLAGS="$CFLAGS -std=c99"
++ XCPPFLAGS="$CPPFLAGS"
++ CPPFLAGS="$CPPFLAGS -std=c99"
++ AC_MSG_CHECKING(if -std=c99 works)
++
++ AC_CACHE_VAL(
++ local_cv_has__std_c99,
++ [
++ AC_TRY_RUN(
++ [
++ #include <stdlib.h>
++ #include <stdio.h>
++
++ int main()
++ {
++ return 0;
++ }
++ ],
++ local_cv_has__std_c99=yes,
++ local_cv_has__std_c99=no,
++ )
++ ]
++ )
++
++ AC_MSG_RESULT($local_cv_has__std_c99)
++ case x$local_cv_has__std_c99 in
++ xno)
++ CFLAGS="$XCFLAGS"
++ CPPFLAGS="$XCPPFLAGS" ;;
++ esac
++fi
++
++#
++# Try to enable large file support. This will make sure that on systems
++# where off_t can be either 32 or 64 bit, the latter size is used. On
++# other systems, this should do nothing. (Hopefully)
++#
++
++CFLAGS="$CFLAGS -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64"
++
++#
++# If we are using gcc, set some flags that increase the odds of the
++# compiler producing a working binary...
++#
++
++if test "$GCC" = yes; then
++
++ #
++ # -fno-optimize-sibling-calls seems to work around a bug where
++ # sending a SIGWINCH to fish on NetBSD 3.0 causes fish to exit when
++ # compiled with GCC 3.3.3. This is probably either a compiler bug
++ # or a libc bug, but adding this flag seems to fix things for
++ # now. Long term, the real problem should be tracked down and
++ # truly fixed, at which point we can remove this silly flag. This
++ # bug has been verified to not exist on Linux using GCC 3.3.3.
++ #
++
++ CFLAGS="$CFLAGS -fno-optimize-sibling-calls"
++
++
++ #
++ # -Wall is there to keep me on my toes
++ #
++
++ CFLAGS="$CFLAGS -Wall"
++
++ #
++ # This is needed in order to get the really cool backtraces
++ #
++
++ LDFLAGS_FISH="$LDFLAGS_FISH -rdynamic"
++
++fi
++
++
++#
++# If we are compiling against glibc, set some flags to work around
++# some rather stupid attempts to hide prototypes for *wprintf
++# functions, as well as prototypes of various gnu extensions.
++#
++
++AC_MSG_CHECKING([if we are compiling against glibc])
++AC_RUN_IFELSE(
++ [
++ AC_LANG_PROGRAM(
++ [
++ #include <stdlib.h>
++ #ifdef __GLIBC__
++ #define STATUS 0
++ #else
++ #define STATUS 1
++ #endif
++ ],
++ [
++ return STATUS;
++ ]
++ )
++ ],
++ [glibc=yes],
++ [glibc=no]
++)
++
++if test "$glibc" = yes; then
++ AC_MSG_RESULT(yes)
++
++ #
++ # This gives us access to prototypes for gnu extensions and C99
++ # functions if we are compiling agains glibc. All GNU extensions
++ # that are used must have a fallback implementation available in
++ # fallback.h, in order to keep fish working on non-gnu platforms.
++ #
++
++ CFLAGS="$CFLAGS -D_GNU_SOURCE=1 -D_ISO99_SOURCE=1"
++else
++ AC_MSG_RESULT(no)
++fi
++
++
++#
++# Test cpu for special handling of ppc
++#
++# This is used to skip use of tputs on ppc systems, since it seemed to
++# be broken, at least on older debin-based systems. This is obviously
++# not the right way to to detect whether this workaround should be
++# used, since it catches far to many systems, but I do not have the
++# hardware available to narrow this problem down, and in practice, it
++# seems that tputs is never really needed.
++#
++
++AC_CANONICAL_TARGET
++
++if test $target_cpu = powerpc; then
++ AC_DEFINE([TPUTS_KLUDGE],[1],[Evil kludge to get Power based machines to work])
++fi
++
++
++#
++# Solaris-specific flags go here
++#
++
++AC_MSG_CHECKING([if we are under Solaris])
++case $target_os in
++ solaris*)
++ AC_DEFINE( __EXTENSIONS__, 1, [Macro to enable additional prototypes under Solaris])
++ AC_MSG_RESULT(yes)
++ ;;
++ *)
++ AC_MSG_RESULT(no)
++ ;;
++esac
++
++# Check for Solaris curses tputs having fixed length parameter list.
++AC_MSG_CHECKING([if we are using non varargs tparm.])
++AC_COMPILE_IFELSE(
++ [
++ AC_LANG_PROGRAM(
++ [
++ #include <curses.h>
++ #include <term.h>
++ ],
++ [
++ tparm( "" );
++ ]
++ )
++ ],
++ [tparm_solaris_kludge=no],
++ [tparm_solaris_kludge=yes]
++)
++if test "x$tparm_solaris_kludge" = "xyes"; then
++ AC_MSG_RESULT(yes)
++ AC_DEFINE(
++ [TPARM_SOLARIS_KLUDGE],
++ [1],
++ [Define to 1 if tparm accepts a fixed amount of paramters.]
++ )
++else
++ AC_MSG_RESULT(no)
++fi
++
++
++#
++# BSD-specific flags go here
++#
++
++AC_MSG_CHECKING([if we are under BSD])
++case $target_os in
++ *bsd*)
++ AC_DEFINE( __BSD_VISIBLE, 1, [Macro to enable additional prototypes under BSD])
++ AC_DEFINE( _NETBSD_SOURCE, 1, [Macro to enable additional prototypes under BSD])
++ AC_MSG_RESULT(yes)
++ ;;
++ *)
++ AC_MSG_RESULT(no)
++ ;;
++esac
++
++
++#
++# Set up PREFIX and related preprocessor symbols. Fish needs to know
++# where it will be installed. One of the reasons for this is so that
++# it can make sure the fish installation directory is in the path
++# during startup.
++#
++
++if [[ "$prefix" = NONE ]]; then
++ prefix=/usr/local
++fi
++
++
++#
++# Set up the directory where the documentation files should be
++# installed
++#
++
++AC_ARG_VAR( [docdir], [Documentation direcotry] )
++
++if test -z $docdir; then
++ docdir=$datadir/doc/fish
++else
++ docdir=$docdir
++fi
++
++
++#
++# Set up locale directory. This is where the .po files will be
++# installed.
++#
++
++localedir=$datadir/locale
++
++
++#
++# See if Linux procfs is present. This is used to get extra
++# information about running processes.
++#
++
++AC_CHECK_FILES([/proc/self/stat])
++
++
++#
++# This is ued to tell the wgetopt library to translate strings. This
++# way wgetopt can be dropped into any project without requiring i18n.
++#
++
++AC_DEFINE(
++ [HAVE_TRANSLATE_H],
++ [1],
++ [Define to 1 if the wgettext function should be used for translating strings.]
++)
++
++
++#
++# Check presense of various libraries. This is done on a per-binary
++# level, since including various extra libraries in all binaries only
++# because thay are used by some of them can cause extra bloat and
++# slower compiles when developing fish.
++#
++
++# Check for os dependant libraries for all binaries.
++LIBS_COMMON=$LIBS
++LIBS=""
++AC_SEARCH_LIBS( connect, socket, , [AC_MSG_ERROR([Cannot find the socket library, needed to build this package.] )] )
++AC_SEARCH_LIBS( nanosleep, rt, , [AC_MSG_ERROR([Cannot find the rt library, needed to build this package.] )] )
++AC_SEARCH_LIBS( setupterm, [ncurses curses], , [AC_MSG_ERROR([Could not find a curses implementation, needed to build fish])] )
++LIBS_SHARED=$LIBS
++LIBS=$LIBS_COMMON
++
++#
++# Check for libraries needed by fish.
++#
++
++LIBS_COMMON=$LIBS
++LIBS="$LIBS_SHARED"
++if test x$local_gettext != xno; then
++ AC_SEARCH_LIBS( gettext, intl,,)
++fi
++
++
++AC_SEARCH_LIBS( iconv_open, iconv, , [AC_MSG_ERROR([Could not find an iconv implementation, needed to build fish])] )
++LIBS_FISH=$LIBS
++LIBS=$LIBS_COMMON
++
++#
++# Check for libraries needed by fish_indent.
++#
++
++LIBS_COMMON=$LIBS
++LIBS="$LIBS_SHARED"
++if test x$local_gettext != xno; then
++ AC_SEARCH_LIBS( gettext, intl,,)
++fi
++LIBS_FISH_INDENT=$LIBS
++LIBS=$LIBS_COMMON
++
++#
++# Check for libraries needed by fish_pager.
++#
++
++LIBS_COMMON=$LIBS
++LIBS="$LIBS_SHARED"
++if test x$local_gettext != xno; then
++ AC_SEARCH_LIBS( gettext, intl,,)
++fi
++LIBS_FISH_PAGER=$LIBS
++LIBS=$LIBS_COMMON
++
++#
++# Check for libraries needed by fishd.
++#
++
++LIBS_COMMON=$LIBS
++LIBS="$LIBS_SHARED"
++if test x$local_gettext != xno; then
++ AC_SEARCH_LIBS( gettext, intl,,)
++fi
++LIBS_FISHD=$LIBS
++LIBS=$LIBS_COMMON
++
++#
++# Check for libraries needed by mimedb.
++#
++
++LIBS_COMMON=$LIBS
++LIBS="$LIBS_SHARED"
++if test x$local_gettext != xno; then
++ AC_SEARCH_LIBS( gettext, intl,,)
++fi
++LIBS_MIMEDB=$LIBS
++LIBS=$LIBS_COMMON
++
++
++#
++# Check for libraries needed by set_color
++#
++
++LIBS_COMMON=$LIBS
++LIBS="$LIBS_SHARED"
++if test x$local_gettext != xno; then
++ AC_SEARCH_LIBS( gettext, intl,,)
++fi
++LIBS_SET_COLOR=$LIBS
++LIBS=$LIBS_COMMON
++
++#
++# Check presense of various header files
++#
++
++AC_CHECK_HEADERS([getopt.h termio.h sys/resource.h term.h ncurses/term.h ncurses.h curses.h stropts.h siginfo.h sys/select.h sys/ioctl.h sys/termios.h libintl.h execinfo.h])
++
++AC_CHECK_HEADER(
++ [regex.h],
++ [
++ AC_DEFINE(
++ [HAVE_REGEX_H],
++ [1],
++ [Define to 1 if you have the <regex.h> header file.]
++ )
++ ],
++ [AC_MSG_ERROR([Could not find the header regex.h, needed to build fish])]
++)
++
++
++#
++# On some platforms (Solaris 10) adding -std=c99 in turn requires that
++# _POSIX_C_SOURCE be defined to 200112L otherwise several
++# POSIX-specific, non-ISO-C99 types/prototypes are made unavailable
++# e.g. siginfo_t. Defining _XOPEN_SOURCE to 600 is compatible with
++# the _POSIX_C_SOURCE value and provides a little assurance that
++# extension functions' prototypes are available, e.g. killpg().
++#
++# Some other platforms (OS X), will remove types/prototypes/macros
++# e.g. SIGWINCH if either _POSIX_C_SOURCE or _XOPEN_SOURCE is defined.
++#
++# This test adds these macros only if they enable a program that uses
++# both Posix and non-standard features to compile, and that program
++# does not compile without these macros.
++#
++# We try to make everyone happy.
++#
++# The ordering of the various autoconf tests is very critical as well:
++#
++# * This test needs to be run _after_ header detection tests, so that
++# the proper headers are included.
++#
++# * This test needs to be run _before_ testing for the presense of any
++# prototypes or other language functinality.
++#
++# * This test should be (but does not need to be) run after the
++# conditional definition of __EXTENSIONS__, to avoid redundant tests.
++#
++
++XCFLAGS="$CFLAGS"
++
++echo Checking how to use -D_XOPEN_SOURCE=600 and -D_POSIX_C_SOURCE=200112L...
++local_found_posix_switch=no
++
++for i in "" "-D_POSIX_C_SOURCE=200112L" "-D_XOPEN_SOURCE=600 -D_POSIX_C_SOURCE=200112L"; do
++
++ AC_MSG_CHECKING( if switches \"$i\" works)
++ CFLAGS="$XCFLAGS $i"
++
++ #
++ # Try to run this program, which should test various extensions
++ # and Posix functionality. If this program works, then everything
++ # should work. Hopefully.
++ #
++
++ AC_TRY_LINK(
++ [
++ #include <stdlib.h>
++ #include <stdio.h>
++ #include <sys/types.h>
++
++ /* POSIX, C89 and C99: POSIX extends this header.
++ * For: kill(), killpg(), siginfo_t, sigset_t,
++ * struct sigaction, sigemptyset(), sigaction(),
++ * SIGIO and SIGWINCH. */
++ #include <signal.h>
++
++ #ifdef HAVE_SIGINFO_H
++ /* Neither POSIX, C89 nor C99: Solaris-specific (others?).
++ * For: siginfo_t (also defined by signal.h when in
++ * POSIX/extensions mode). */
++ #include <siginfo.h>
++ #endif
++
++ #ifdef HAVE_SYS_TERMIOS_H
++ /* Neither POSIX, C89 nor C99: a common extension.
++ * For: TIOCGWINSZ and struct winsize (under at least
++ * Solaris, NetBSD and (dual-listed) FreeBSD). */
++ #include <sys/termios.h>
++ #endif
++
++ #ifdef HAVE_SYS_IOCTL_H
++ /* As above (under at least Linux and FreeBSD). */
++ #include <sys/ioctl.h>
++ #endif
++ ],
++ [
++ /* Avert high-level optimisation, by making the program's
++ * return value depend on all tested identifiers. */
++ int ret = 0;
++ /* POSIX only: might be unhidden by _POSIX_C_SOURCE. */
++ struct sigaction sa;
++ sigset_t ss;
++ siginfo_t info;
++ ret += (int)(void *)&info + kill( 0, 0 ) +
++ sigaction( 0, &sa, 0 ) + sigemptyset( &ss );
++ /* Extended-POSIX: might be unhidden by _XOPEN_SOURCE. */
++ ret += killpg( 0, 0 );
++ /* Non-standard: might be hidden by the macros. */
++ {
++ struct winsize termsize;
++ ret += (int)(void *)&termsize;
++ ret += SIGWINCH + TIOCGWINSZ + SIGIO;
++ }
++ return ret;
++
++ ],
++ local_cv_use__posix_c_source=yes,
++ local_cv_use__posix_c_source=no,
++ )
++
++ if test x$local_cv_use__posix_c_source = xyes; then
++ AC_MSG_RESULT( yes )
++ local_found_posix_switch=yes
++ break;
++ else
++ AC_MSG_RESULT( no )
++ fi
++
++done
++
++#
++# We didn't find any combination of switches that worked - revert to
++# no switches and hope that the fallbacks work. A warning will be
++# printed at the end of the configure script.
++#
++
++if test ! x$local_found_posix_switch = xyes; then
++ CFLAGS="$XCFLAGS"
++fi
++
++
++#
++# Check for presense of various functions used by fish
++#
++
++AC_CHECK_FUNCS( wcsdup wcsndup wcslen wcscasecmp wcsncasecmp fwprintf )
++AC_CHECK_FUNCS( futimes wcwidth wcswidth wcstok fputwc fgetwc )
++AC_CHECK_FUNCS( wcstol wcslcat wcslcpy lrand48_r killpg gettext )
++AC_CHECK_FUNCS( dcgettext backtrace backtrace_symbols sysconf )
++
++#
++# The Makefile also needs to know if we have gettext, so it knows if
++# the translations should be installed.
++#
++
++if test x$local_gettext != xno; then
++ AC_CHECK_FUNC( gettext, HAVE_GETTEXT=1, HAVE_GETTEXT=0 )
++fi
++
++#
++# Here follows a list of small programs used to test for various
++# features that Autoconf doesn't tell us about
++#
++
++
++#
++# Check if realpath accepts null for its second argument
++#
++
++AC_MSG_CHECKING([if realpath accepts null for its second argument])
++AC_RUN_IFELSE(
++ [
++ AC_LANG_PROGRAM(
++ [
++ #include <limits.h>
++ #include <errno.h>
++ #include <stdlib.h>
++ ],
++ [
++ int status;
++ char *res;
++ res = realpath( "somefile", 0 );
++ status = !(res != 0 || errno == ENOENT);
++ exit( status );
++ ]
++ )
++ ],
++ [have_realpath_null=yes],
++ [have_realpath_null=no]
++)
++
++if test "$have_realpath_null" = yes; then
++ AC_MSG_RESULT(yes)
++ AC_DEFINE(
++ [HAVE_REALPATH_NULL],
++ [1],
++ [Define to 1 if realpath accepts null for its second argument.]
++ )
++else
++ AC_MSG_RESULT(no)
++fi
++
++
++#
++# Check if struct winsize and TIOCGWINSZ exist
++#
++
++AC_MSG_CHECKING([if struct winsize and TIOCGWINSZ exist])
++AC_LINK_IFELSE(
++ [
++ AC_LANG_PROGRAM(
++ [
++ #ifdef HAVE_SYS_TERMIOS_H
++ #include <sys/termios.h>
++ #endif
++
++ #ifdef HAVE_SYS_IOCTL_H
++ #include <sys/ioctl.h>
++ #endif
++ ],
++ [
++ struct winsize termsize = {0};
++ TIOCGWINSZ;
++ ]
++ )
++ ],
++ [
++ AC_MSG_RESULT(yes);
++ AC_DEFINE([HAVE_WINSIZE], [1], [Define to 1 if the winsize struct and TIOCGWINSZ macro exist])
++ ],
++ [
++ AC_MSG_RESULT(no)
++ ]
++)
++
++
++#
++# If we have a fwprintf in libc, test that it actually works. As of
++# March 2006, it is broken under Dragonfly BSD.
++#
++
++if test "$ac_cv_func_fwprintf" = yes; then
++
++ AC_MSG_CHECKING([if fwprintf is broken])
++ AC_RUN_IFELSE(
++ [
++ AC_LANG_PROGRAM(
++ [
++ #include <stdlib.h>
++ #include <stdio.h>
++ #include <locale.h>
++ #include <wchar.h>
++ ],
++ [
++ setlocale( LC_ALL, "" );
++ fwprintf( stderr, L"%ls%ls", L"", L"fish:" );
++ ]
++ )
++ ],
++ [
++ AC_MSG_RESULT(no)
++ ],
++ [
++ AC_MSG_RESULT([yes])
++ AC_DEFINE([HAVE_BROKEN_FWPRINTF], [1], [Define to 1 one if the implemented fwprintf is broken])
++ ]
++ )
++
++fi
++
++
++# Check for _nl_msg_cat_cntr symbol
++AC_MSG_CHECKING([for _nl_msg_cat_cntr symbol])
++AC_TRY_LINK(
++ [
++ #if HAVE_LIBINTL_H
++ #include <libintl.h>
++ #endif
++ ],
++ [
++ extern int _nl_msg_cat_cntr;
++ int tmp = _nl_msg_cat_cntr;
++ exit(tmp);
++ ],
++ have__nl_msg_cat_cntr=yes,
++ have__nl_msg_cat_cntr=no
++)
++if test "$have__nl_msg_cat_cntr" = yes; then
++ AC_MSG_RESULT(yes)
++ AC_DEFINE(
++ [HAVE__NL_MSG_CAT_CNTR],
++ [1],
++ [Define to 1 if the _nl_msg_cat_cntr symbol is exported.]
++ )
++else
++ AC_MSG_RESULT(no)
++fi
++
++# Check for __environ symbol
++AC_MSG_CHECKING([for __environ symbol])
++AC_TRY_LINK(
++ [
++ #include <unistd.h>
++ ],
++ [
++ extern char **__environ;
++ char **tmp = __environ;
++ exit(tmp!=0);
++ ],
++ have___environ=yes,
++ have___environ=no
++)
++if test "$have___environ" = yes; then
++ AC_MSG_RESULT(yes)
++ AC_DEFINE(
++ [HAVE___ENVIRON],
++ [1],
++ [Define to 1 if the __environ symbol is exported.]
++ )
++else
++ AC_MSG_RESULT(no)
++fi
++
++# Check if getopt_long exists and works
++AC_MSG_CHECKING([if getopt_long exists and works])
++AC_TRY_LINK(
++ [
++ #if HAVE_GETOPT_H
++ #include <getopt.h>
++ #endif
++ ],
++ [
++ static struct option
++ long_options[] =
++ {
++ 0, 0, 0, 0
++ }
++ ;
++ int opt = getopt_long( 0,
++ 0,
++ 0,
++ long_options,
++ 0 );
++
++ ],
++ have_working_getopt_long=yes,
++ have_working_getopt_long=no
++)
++if test "$have_working_getopt_long" = yes; then
++ AC_MSG_RESULT(yes)
++ AC_DEFINE(
++ [HAVE_WORKING_GETOPT_LONG],
++ [1],
++ [Define to 1 if getopt_long exists and works.]
++ )
++else
++ AC_MSG_RESULT(no)
++fi
++
++# Check if del_curterm is broken - in that case we redefine
++# del_curterm as a no-op, to avoid a double-free
++
++AC_MSG_CHECKING([If del_curterm is broken])
++case $target_os in
++ *bsd*)
++ AC_MSG_RESULT(yes)
++ AC_DEFINE(
++ [HAVE_BROKEN_DEL_CURTERM],
++ [1],
++ [del_curterm is broken, redefine it to a no-op to avoid a double-free bug]
++ )
++ ;;
++ *)
++ AC_MSG_RESULT(no)
++ ;;
++esac
++
++# Tell the world what we know
++AC_CONFIG_FILES([Makefile fish.spec Doxyfile.help seq])
++AC_OUTPUT
++
++if test ! x$local_found_posix_switch = xyes; then
++ echo "Can't find a combination of switches to enable common extensions like detecting window size."
++ echo "Some fish features may be disabled."
++fi
++
++echo "fish is now configured."
++echo "Use 'make' and 'make install' to build and install fish."
++
+diff -Nur fish-1.23.0.orig/configure.ac.rej fish-1.23.0.link/configure.ac.rej
+--- fish-1.23.0.orig/configure.ac.rej 1969-12-31 17:00:00.000000000 -0700
++++ fish-1.23.0.link/configure.ac.rej 2008-01-16 21:27:07.000000000 -0700
+@@ -0,0 +1,17 @@
++***************
++*** 457,463 ****
++ fi
++ AC_SEARCH_LIBS( connect, socket, , [AC_MSG_ERROR([Cannot find the socket library, needed to build this package.] )] )
++ AC_SEARCH_LIBS( nanosleep, rt, , [AC_MSG_ERROR([Cannot find the rt library, needed to build this package.] )] )
++- AC_SEARCH_LIBS( setupterm, [ncurses curses], , [AC_MSG_ERROR([Could not find a curses implementation, needed to build fish])] )
++ AC_SEARCH_LIBS( iconv_open, iconv, , [AC_MSG_ERROR([Could not find an iconv implementation, needed to build fish])] )
++
++
++--- 457,463 ----
++ fi
++ AC_SEARCH_LIBS( connect, socket, , [AC_MSG_ERROR([Cannot find the socket library, needed to build this package.] )] )
++ AC_SEARCH_LIBS( nanosleep, rt, , [AC_MSG_ERROR([Cannot find the rt library, needed to build this package.] )] )
+++ AC_SEARCH_LIBS( setupterm, [tinfo ncurses curses], , [AC_MSG_ERROR([Could not find a curses implementation, needed to build fish])] )
++ AC_SEARCH_LIBS( iconv_open, iconv, , [AC_MSG_ERROR([Could not find an iconv implementation, needed to build fish])] )
++
++
projects / packages / fish.git / commitdiff