From 47df1ae40adecd0a02fc7dd06ab0745cb18c3fe0 Mon Sep 17 00:00:00 2001 From: Łukasz Niemier Date: Sun, 18 Nov 2012 11:23:22 +0100 Subject: Remove trailing whitespaces and change tabs to spaces --- configure.ac | 826 +++++++++++++++++++++++++++++------------------------------ 1 file changed, 413 insertions(+), 413 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index ddb8a915..e413be09 100644 --- a/configure.ac +++ b/configure.ac @@ -51,25 +51,25 @@ AC_SUBST(XSEL_MAN_PATH) 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. + 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 + ) + fi else - AC_MSG_RESULT([no]) + AC_MSG_RESULT([no]) fi @@ -82,19 +82,19 @@ fi 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. + 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 + ) + fi else - AC_MSG_RESULT([no]) + AC_MSG_RESULT([no]) fi @@ -110,30 +110,30 @@ fi for i in /usr/pkg /sw /opt /opt/local /usr/local; do - AC_MSG_CHECKING([for $i/include include directory]) - if test -d $i/include; then - AC_MSG_RESULT(yes) - CXXFLAGS="$CXXFLAGS -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/ -Wl,-rpath,$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 + AC_MSG_CHECKING([for $i/include include directory]) + if test -d $i/include; then + AC_MSG_RESULT(yes) + CXXFLAGS="$CXXFLAGS -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/ -Wl,-rpath,$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 @@ -176,24 +176,24 @@ 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. - # + # + # 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 + 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` + 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 + if test "$shebang"; then + SEQ_FALLBACK=seq + AC_MSG_RESULT(yes, replace it) + else + AC_MSG_RESULT(no, keep it) + fi + fi fi @@ -202,21 +202,21 @@ fi # AC_ARG_WITH( - xsel, - AC_HELP_STRING( - [--without-xsel], - [do not build the xsel program needed for X clipboard integration. - If build xsel, it will be configured with the same options as fish.] - ), - [xsel=$withval], - [xsel=with_xsel] + xsel, + AC_HELP_STRING( + [--without-xsel], + [do not build the xsel program needed for X clipboard integration. + If build xsel, it will be configured with the same options as fish.] + ), + [xsel=$withval], + [xsel=with_xsel] ) if [[ "$xsel" = "with_xsel" ]]; then - XSEL=xsel-1.2.0 - XSEL_BIN=$XSEL/xsel - XSEL_MAN=xsel.1x - XSEL_MAN_PATH=$XSEL/xsel.1x + XSEL=xsel-1.2.0 + XSEL_BIN=$XSEL/xsel + XSEL_MAN=xsel.1x + XSEL_MAN_PATH=$XSEL/xsel.1x fi @@ -225,17 +225,17 @@ fi # AC_ARG_WITH( - gettext, - AC_HELP_STRING( - [--without-gettext], - [do not translate messages, even if gettext is available] - ), - [local_gettext=$withval], - [local_gettext=yes] + 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]) + AC_DEFINE([USE_GETTEXT],[1],[Perform string translations with gettext]) fi @@ -254,31 +254,31 @@ CXXFLAGS="$CXXFLAGS -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64" 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. - # + # + # -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. + # - CXXFLAGS="$CXXFLAGS -fno-optimize-sibling-calls" + CXXFLAGS="$CXXFLAGS -fno-optimize-sibling-calls" - # - # -Wall is there to keep me on my toes - # + # + # -Wall is there to keep me on my toes + # - # Some day... - CXXFLAGS="$CXXFLAGS -Wall" + # Some day... + CXXFLAGS="$CXXFLAGS -Wall" - # - # This is needed in order to get the really cool backtraces - # + # + # This is needed in order to get the really cool backtraces + # - LDFLAGS_FISH="$LDFLAGS_FISH -rdynamic" + LDFLAGS_FISH="$LDFLAGS_FISH -rdynamic" fi @@ -291,38 +291,38 @@ fi AC_MSG_CHECKING([if we are compiling against glibc]) AC_RUN_IFELSE( - [ - AC_LANG_PROGRAM( - [ - #include - #ifdef __GLIBC__ - #define STATUS 0 - #else - #define STATUS 1 - #endif - ], - [ - return STATUS; - ] - ) - ], - [glibc=yes], - [glibc=no] + [ + AC_LANG_PROGRAM( + [ + #include + #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) + 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. - # + # + # 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" + CFLAGS="$CFLAGS -D_GNU_SOURCE=1 -D_ISO99_SOURCE=1" else - AC_MSG_RESULT(no) + AC_MSG_RESULT(no) fi @@ -340,7 +340,7 @@ fi AC_CANONICAL_TARGET if test $target_cpu = powerpc; then - AC_DEFINE([TPUTS_KLUDGE],[1],[Evil kludge to get Power based machines to work]) + AC_DEFINE([TPUTS_KLUDGE],[1],[Evil kludge to get Power based machines to work]) fi @@ -350,38 +350,38 @@ fi 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) - ;; + 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 - #include - ], - [ - tparm( "" ); - ] - ) - ], - [tparm_solaris_kludge=no], - [tparm_solaris_kludge=yes] + [ + AC_LANG_PROGRAM( + [ + #include + #include + ], + [ + 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.] + 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) @@ -394,14 +394,14 @@ fi 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) - ;; + *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 @@ -413,7 +413,7 @@ esac # if [[ "$prefix" = NONE ]]; then - prefix=/usr/local + prefix=/usr/local fi @@ -425,9 +425,9 @@ fi AC_ARG_VAR( [docdir], [Documentation direcotry] ) if test -z $docdir; then - docdir=$datadir/doc/fish + docdir=$datadir/doc/fish else - docdir=$docdir + docdir=$docdir fi @@ -453,9 +453,9 @@ AC_CHECK_FILES([/proc/self/stat]) # AC_DEFINE( - [HAVE_TRANSLATE_H], - [1], - [Define to 1 if the wgettext function should be used for translating strings.] + [HAVE_TRANSLATE_H], + [1], + [Define to 1 if the wgettext function should be used for translating strings.] ) @@ -484,7 +484,7 @@ LIBS=$LIBS_COMMON LIBS_COMMON=$LIBS LIBS="$LIBS_SHARED" if test x$local_gettext != xno; then - AC_SEARCH_LIBS( gettext, intl,,) + AC_SEARCH_LIBS( gettext, intl,,) fi # Check for libiconv_open if we can't find iconv_open. Silly OS X does @@ -501,7 +501,7 @@ LIBS=$LIBS_COMMON LIBS_COMMON=$LIBS LIBS="$LIBS_SHARED" if test x$local_gettext != xno; then - AC_SEARCH_LIBS( gettext, intl,,) + AC_SEARCH_LIBS( gettext, intl,,) fi LIBS_FISH_INDENT=$LIBS LIBS=$LIBS_COMMON @@ -513,7 +513,7 @@ LIBS=$LIBS_COMMON LIBS_COMMON=$LIBS LIBS="$LIBS_SHARED" if test x$local_gettext != xno; then - AC_SEARCH_LIBS( gettext, intl,,) + AC_SEARCH_LIBS( gettext, intl,,) fi AC_SEARCH_LIBS( iconv_open, iconv, , [AC_SEARCH_LIBS( libiconv_open, iconv, , [AC_MSG_ERROR([Could not find an iconv implementation, needed to build fish])] )] ) LIBS_FISH_PAGER=$LIBS @@ -526,7 +526,7 @@ LIBS=$LIBS_COMMON LIBS_COMMON=$LIBS LIBS="$LIBS_SHARED" if test x$local_gettext != xno; then - AC_SEARCH_LIBS( gettext, intl,,) + AC_SEARCH_LIBS( gettext, intl,,) fi AC_SEARCH_LIBS( iconv_open, iconv, , [AC_SEARCH_LIBS( libiconv_open, iconv, , [AC_MSG_ERROR([Could not find an iconv implementation, needed to build fish])] )] ) LIBS_FISHD=$LIBS @@ -539,7 +539,7 @@ LIBS=$LIBS_COMMON LIBS_COMMON=$LIBS LIBS="$LIBS_SHARED" if test x$local_gettext != xno; then - AC_SEARCH_LIBS( gettext, intl,,) + AC_SEARCH_LIBS( gettext, intl,,) fi LIBS_MIMEDB=$LIBS LIBS=$LIBS_COMMON @@ -552,7 +552,7 @@ LIBS=$LIBS_COMMON LIBS_COMMON=$LIBS LIBS="$LIBS_SHARED" if test x$local_gettext != xno; then - AC_SEARCH_LIBS( gettext, intl,,) + AC_SEARCH_LIBS( gettext, intl,,) fi LIBS_SET_COLOR=$LIBS LIBS=$LIBS_COMMON @@ -564,15 +564,15 @@ LIBS=$LIBS_COMMON 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 spawn.h]) AC_CHECK_HEADER( - [regex.h], - [ - AC_DEFINE( - [HAVE_REGEX_H], - [1], - [Define to 1 if you have the header file.] - ) - ], - [AC_MSG_ERROR([Could not find the header regex.h, needed to build fish])] + [regex.h], + [ + AC_DEFINE( + [HAVE_REGEX_H], + [1], + [Define to 1 if you have the header file.] + ) + ], + [AC_MSG_ERROR([Could not find the header regex.h, needed to build fish])] ) @@ -612,78 +612,78 @@ 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 - #include - #include - - /* POSIX, C89 and C99: POSIX extends this header. - * For: kill(), killpg(), siginfo_t, sigset_t, - * struct sigaction, sigemptyset(), sigaction(), - * SIGIO and SIGWINCH. */ - #include - - #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 - #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 - #endif - - #ifdef HAVE_SYS_IOCTL_H - /* As above (under at least Linux and FreeBSD). */ - #include - #endif - ], - [ - /* Avert high-level optimisation, by making the program's - * return value depend on all tested identifiers. */ - long ret = 0; - /* POSIX only: might be unhidden by _POSIX_C_SOURCE. */ - struct sigaction sa; - sigset_t ss; - siginfo_t info; - ret += (long)(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 += (long)(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 + 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 + #include + #include + + /* POSIX, C89 and C99: POSIX extends this header. + * For: kill(), killpg(), siginfo_t, sigset_t, + * struct sigaction, sigemptyset(), sigaction(), + * SIGIO and SIGWINCH. */ + #include + + #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 + #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 + #endif + + #ifdef HAVE_SYS_IOCTL_H + /* As above (under at least Linux and FreeBSD). */ + #include + #endif + ], + [ + /* Avert high-level optimisation, by making the program's + * return value depend on all tested identifiers. */ + long ret = 0; + /* POSIX only: might be unhidden by _POSIX_C_SOURCE. */ + struct sigaction sa; + sigset_t ss; + siginfo_t info; + ret += (long)(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 += (long)(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 @@ -694,7 +694,7 @@ done # if test ! x$local_found_posix_switch = xyes; then - CFLAGS="$XCFLAGS" + CFLAGS="$XCFLAGS" fi @@ -713,7 +713,7 @@ AC_CHECK_FUNCS( dcgettext backtrace backtrace_symbols sysconf ) # if test x$local_gettext != xno; then - AC_CHECK_FUNC( gettext, HAVE_GETTEXT=1, HAVE_GETTEXT=0 ) + AC_CHECK_FUNC( gettext, HAVE_GETTEXT=1, HAVE_GETTEXT=0 ) fi # @@ -728,35 +728,35 @@ fi AC_MSG_CHECKING([if realpath accepts null for its second argument]) AC_RUN_IFELSE( - [ - AC_LANG_PROGRAM( - [ - #include - #include - #include - ], - [ - int status; - char *res; - res = realpath( "somefile", 0 ); - status = !(res != 0 || errno == ENOENT); - exit( status ); - ] - ) - ], - [have_realpath_null=yes], - [have_realpath_null=no] + [ + AC_LANG_PROGRAM( + [ + #include + #include + #include + ], + [ + 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.] - ) + 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) + AC_MSG_RESULT(no) fi @@ -766,30 +766,30 @@ fi AC_MSG_CHECKING([if struct winsize and TIOCGWINSZ exist]) AC_LINK_IFELSE( - [ - AC_LANG_PROGRAM( - [ - #ifdef HAVE_SYS_TERMIOS_H - #include - #endif - - #ifdef HAVE_SYS_IOCTL_H - #include - #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) - ] + [ + AC_LANG_PROGRAM( + [ + #ifdef HAVE_SYS_TERMIOS_H + #include + #endif + + #ifdef HAVE_SYS_IOCTL_H + #include + #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) + ] ) @@ -800,30 +800,30 @@ AC_LINK_IFELSE( if test "$ac_cv_func_fwprintf" = yes; then - AC_MSG_CHECKING([if fwprintf is broken]) - AC_RUN_IFELSE( - [ - AC_LANG_PROGRAM( - [ - #include - #include - #include - #include - ], - [ - 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]) - ] - ) + AC_MSG_CHECKING([if fwprintf is broken]) + AC_RUN_IFELSE( + [ + AC_LANG_PROGRAM( + [ + #include + #include + #include + #include + ], + [ + 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 @@ -831,89 +831,89 @@ 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 - #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 HAVE_LIBINTL_H + #include + #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.] - ) + 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) + AC_MSG_RESULT(no) fi # Check for __environ symbol AC_MSG_CHECKING([for __environ symbol]) AC_TRY_LINK( - [ - #include - ], - [ - extern char **__environ; - char **tmp = __environ; - exit(tmp!=0); - ], - have___environ=yes, - have___environ=no + [ + #include + ], + [ + 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.] - ) + AC_MSG_RESULT(yes) + AC_DEFINE( + [HAVE___ENVIRON], + [1], + [Define to 1 if the __environ symbol is exported.] + ) else - AC_MSG_RESULT(no) + 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 - #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 HAVE_GETOPT_H + #include + #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.] - ) + 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) + AC_MSG_RESULT(no) fi # Check if del_curterm is broken - in that case we redefine @@ -921,17 +921,17 @@ fi 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) - ;; + *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 @@ -939,15 +939,15 @@ 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." + echo "Can't find a combination of switches to enable common extensions like detecting window size." + echo "Some fish features may be disabled." fi if [[ "$xsel" = "with_xsel" ]]; then - echo "Now configure xsel with $conf_arg" - rm -rf $XSEL - tar xf $XSEL.tar.gz - cd $XSEL && ./configure $conf_arg + echo "Now configure xsel with $conf_arg" + rm -rf $XSEL + tar xf $XSEL.tar.gz + cd $XSEL && ./configure $conf_arg fi echo "fish is now configured." echo "Use 'make' and 'make install' to build and install fish." -- cgit v1.2.3