diff --git a/Curses.hsc b/Curses.hsc --- a/Curses.hsc +++ b/Curses.hsc @@ -734,7 +734,7 @@ -foreign import ccall threadsafe getch :: IO CInt +foreign import ccall safe getch :: IO CInt foreign import ccall unsafe def_prog_mode :: IO CInt diff --git a/GinsuConfig.hs b/GinsuConfig.hs --- a/GinsuConfig.hs +++ b/GinsuConfig.hs @@ -27,7 +27,7 @@ gd <- configLookup "GALE_DOMAIN" case gd of Just _ -> return () - Nothing -> putStrLn "GALE_DOMAIN is not set! either set $GALE_DOMAIN in the enviornment or set it in ~/.gale/conf or ~/.gale/ginsu.conf\n" >> doCheckConfig + Nothing -> putStrLn "GALE_DOMAIN is not set! either set $GALE_DOMAIN in the enviornment or set it in ~/.gale/conf or ~/.gale/ginsu.config\n" >> doCheckConfig configFileG xs = mapConfig ("GINSU_" ++) (configFile xs) `mappend` configFile xs diff --git a/config.h.in b/config.h.in --- a/config.h.in +++ b/config.h.in @@ -18,6 +18,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_NCURSES_NCURSES_H +/* Define to 1 if you have the `resizeterm' function. */ +#undef HAVE_RESIZETERM + /* Define to 1 if you have the header file. */ #undef HAVE_STDINT_H @@ -38,6 +41,12 @@ /* Define to 1 if you have the header file. */ #undef HAVE_UNISTD_H + +/* Define to 1 if you have the `use_default_colors' function. */ +#undef HAVE_USE_DEFAULT_COLORS + +/* Define to 1 if you have the `waddnwstr' function. */ +#undef HAVE_WADDNWSTR /* Define to the address where bug reports for this package should be sent. */ #undef PACKAGE_BUGREPORT diff --git a/configure b/configure --- a/configure +++ b/configure @@ -1276,7 +1276,7 @@ --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) --with-compiler=HC use specified haskell compiler (ignored) - --with-gcc=CC use specified C compiler (ignored) + --with-gcc=CC use specified C compiler Some influential environment variables: CC C compiler command @@ -1648,6 +1648,73 @@ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_header_compile + +# ac_fn_c_check_func LINENO FUNC VAR +# ---------------------------------- +# Tests whether FUNC exists, setting the cache variable VAR accordingly +ac_fn_c_check_func () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if eval \${$3+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +/* Define $2 to an innocuous variant, in case declares $2. + For example, HP-UX 11i declares gettimeofday. */ +#define $2 innocuous_$2 + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $2 (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef $2 + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char $2 (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined __stub_$2 || defined __stub___$2 +choke me +#endif + +int +main () +{ +return $2 (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval "$3=yes" +else + eval "$3=no" +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + +} # ac_fn_c_check_func cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. @@ -2011,7 +2078,7 @@ # Check whether --with-gcc was given. if test "${with_gcc+set}" = set; then : - withval=$with_gcc; + withval=$with_gcc; CC=$withval fi @@ -2926,6 +2993,13 @@ CURSES_LIB=ncursesw fi +if test -z $CURSES_LIB; then : + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "curses library not found +See \`config.log' for more details" "$LINENO" 5; } +fi +LDFLAGS="-l$CURSES_LIB $LDFLAGS" ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -3332,9 +3406,28 @@ cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF + CURSES_HDR=$ac_header +fi +done + +if test -z $CURSES_HDR; then : + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "curses headers not found +See \`config.log' for more details" "$LINENO" 5; } fi +for ac_func in waddnwstr use_default_colors resizeterm +do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF + +fi done diff --git a/ginsu.cabal b/ginsu.cabal --- a/ginsu.cabal +++ b/ginsu.cabal @@ -1,5 +1,5 @@ Name: ginsu -Version: 0.8.0 +Version: 0.8.0.1 Copyright: 2002-2009 John Meacham 2011 Dylan Simon Author: John Meacham @@ -11,7 +11,7 @@ Description: Ginsu is a client for the gale chat system. It is designed to be powerful and above all stable, as well as having a quick learning curve. Homepage: http://repetae.net/computer/ginsu/ Category: Network,Console -Build-Type: Simple +Build-Type: Custom Cabal-Version: >= 1.6 tested-with: GHC == 6.12.3, GHC == 7.0.2 extra-source-files: