annotate rogue3/acinclude.m4 @ 239:837044d2c362

Merge the GCC5 and build fix branches. This fixes all warnings produced by GCC 5, except the ones related to system functions. Those could be fixed by including the proper headers, but it would be better to replace the system-dependent code with functions from mdport.c.
author John "Elwin" Edwards
date Fri, 11 Mar 2016 19:47:52 -0500
parents 07c4d4883ef2
children 029c1f5c5588
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
88
07c4d4883ef2 rogue3: begin porting to autoconf.
John "Elwin" Edwards
parents:
diff changeset
1 AC_DEFUN([MP_WITH_CURSES],
07c4d4883ef2 rogue3: begin porting to autoconf.
John "Elwin" Edwards
parents:
diff changeset
2 [AC_ARG_WITH(ncurses, [ --with-ncurses Force the use of ncurses over curses],,)
07c4d4883ef2 rogue3: begin porting to autoconf.
John "Elwin" Edwards
parents:
diff changeset
3 mp_save_LIBS="$LIBS"
07c4d4883ef2 rogue3: begin porting to autoconf.
John "Elwin" Edwards
parents:
diff changeset
4 CURSES_LIB=""
07c4d4883ef2 rogue3: begin porting to autoconf.
John "Elwin" Edwards
parents:
diff changeset
5 if test "$with_ncurses" != yes
07c4d4883ef2 rogue3: begin porting to autoconf.
John "Elwin" Edwards
parents:
diff changeset
6 then
07c4d4883ef2 rogue3: begin porting to autoconf.
John "Elwin" Edwards
parents:
diff changeset
7 AC_CACHE_CHECK([for working curses], mp_cv_curses,
07c4d4883ef2 rogue3: begin porting to autoconf.
John "Elwin" Edwards
parents:
diff changeset
8 [LIBS="$LIBS -lcurses"
07c4d4883ef2 rogue3: begin porting to autoconf.
John "Elwin" Edwards
parents:
diff changeset
9 AC_TRY_LINK(
07c4d4883ef2 rogue3: begin porting to autoconf.
John "Elwin" Edwards
parents:
diff changeset
10 [#include <curses.h>],
07c4d4883ef2 rogue3: begin porting to autoconf.
John "Elwin" Edwards
parents:
diff changeset
11 [chtype a; int b=A_STANDOUT, c=KEY_LEFT; initscr(); ],
07c4d4883ef2 rogue3: begin porting to autoconf.
John "Elwin" Edwards
parents:
diff changeset
12 mp_cv_curses=yes, mp_cv_curses=no)])
07c4d4883ef2 rogue3: begin porting to autoconf.
John "Elwin" Edwards
parents:
diff changeset
13 if test "$mp_cv_curses" = yes
07c4d4883ef2 rogue3: begin porting to autoconf.
John "Elwin" Edwards
parents:
diff changeset
14 then
07c4d4883ef2 rogue3: begin porting to autoconf.
John "Elwin" Edwards
parents:
diff changeset
15 AC_DEFINE(HAVE_CURSES_H, 1, [Define to 1 if libcurses is requested])
07c4d4883ef2 rogue3: begin porting to autoconf.
John "Elwin" Edwards
parents:
diff changeset
16 #AC_DEFINE(HAVE_CURSES_H)
07c4d4883ef2 rogue3: begin porting to autoconf.
John "Elwin" Edwards
parents:
diff changeset
17 CURSES_LIB="-lcurses"
07c4d4883ef2 rogue3: begin porting to autoconf.
John "Elwin" Edwards
parents:
diff changeset
18 fi
07c4d4883ef2 rogue3: begin porting to autoconf.
John "Elwin" Edwards
parents:
diff changeset
19 fi
07c4d4883ef2 rogue3: begin porting to autoconf.
John "Elwin" Edwards
parents:
diff changeset
20 if test ! "$CURSES_LIB"
07c4d4883ef2 rogue3: begin porting to autoconf.
John "Elwin" Edwards
parents:
diff changeset
21 then
07c4d4883ef2 rogue3: begin porting to autoconf.
John "Elwin" Edwards
parents:
diff changeset
22 AC_CACHE_CHECK([for working ncurses], mp_cv_ncurses,
07c4d4883ef2 rogue3: begin porting to autoconf.
John "Elwin" Edwards
parents:
diff changeset
23 [LIBS="$mp_save_LIBS -lncurses"
07c4d4883ef2 rogue3: begin porting to autoconf.
John "Elwin" Edwards
parents:
diff changeset
24 AC_TRY_LINK(
07c4d4883ef2 rogue3: begin porting to autoconf.
John "Elwin" Edwards
parents:
diff changeset
25 [#include <ncurses.h>],
07c4d4883ef2 rogue3: begin porting to autoconf.
John "Elwin" Edwards
parents:
diff changeset
26 [chtype a; int b=A_STANDOUT, c=KEY_LEFT; initscr(); ],
07c4d4883ef2 rogue3: begin porting to autoconf.
John "Elwin" Edwards
parents:
diff changeset
27 mp_cv_ncurses=yes, mp_cv_ncurses=no)])
07c4d4883ef2 rogue3: begin porting to autoconf.
John "Elwin" Edwards
parents:
diff changeset
28 if test "$mp_cv_ncurses" = yes
07c4d4883ef2 rogue3: begin porting to autoconf.
John "Elwin" Edwards
parents:
diff changeset
29 then
07c4d4883ef2 rogue3: begin porting to autoconf.
John "Elwin" Edwards
parents:
diff changeset
30 AC_DEFINE(HAVE_NCURSES_H, 1, [Define to 1 if libncurses is requested])
07c4d4883ef2 rogue3: begin porting to autoconf.
John "Elwin" Edwards
parents:
diff changeset
31 CURSES_LIB="-lncurses"
07c4d4883ef2 rogue3: begin porting to autoconf.
John "Elwin" Edwards
parents:
diff changeset
32 fi
07c4d4883ef2 rogue3: begin porting to autoconf.
John "Elwin" Edwards
parents:
diff changeset
33 fi
07c4d4883ef2 rogue3: begin porting to autoconf.
John "Elwin" Edwards
parents:
diff changeset
34 if test ! "$CURSES_LIB"
07c4d4883ef2 rogue3: begin porting to autoconf.
John "Elwin" Edwards
parents:
diff changeset
35 then
07c4d4883ef2 rogue3: begin porting to autoconf.
John "Elwin" Edwards
parents:
diff changeset
36 AC_CACHE_CHECK([for working pdcurses], mp_cv_pdcurses,
07c4d4883ef2 rogue3: begin porting to autoconf.
John "Elwin" Edwards
parents:
diff changeset
37 [LIBS="$mp_save_LIBS -lpdcurses"
07c4d4883ef2 rogue3: begin porting to autoconf.
John "Elwin" Edwards
parents:
diff changeset
38 AC_TRY_LINK(
07c4d4883ef2 rogue3: begin porting to autoconf.
John "Elwin" Edwards
parents:
diff changeset
39 [#include <curses.h>],
07c4d4883ef2 rogue3: begin porting to autoconf.
John "Elwin" Edwards
parents:
diff changeset
40 [chtype a; int b=A_STANDOUT, c=KEY_LEFT; initscr(); ],
07c4d4883ef2 rogue3: begin porting to autoconf.
John "Elwin" Edwards
parents:
diff changeset
41 mp_cv_pdcurses=yes, mp_cv_pdcurses=no)])
07c4d4883ef2 rogue3: begin porting to autoconf.
John "Elwin" Edwards
parents:
diff changeset
42 if test "$mp_cv_pdcurses" = yes
07c4d4883ef2 rogue3: begin porting to autoconf.
John "Elwin" Edwards
parents:
diff changeset
43 then
07c4d4883ef2 rogue3: begin porting to autoconf.
John "Elwin" Edwards
parents:
diff changeset
44 AC_DEFINE(HAVE_CURSES_H, 1, [Define to 1 if libcurses is requested])
07c4d4883ef2 rogue3: begin porting to autoconf.
John "Elwin" Edwards
parents:
diff changeset
45 CURSES_LIB="-lpdcurses"
07c4d4883ef2 rogue3: begin porting to autoconf.
John "Elwin" Edwards
parents:
diff changeset
46 fi
07c4d4883ef2 rogue3: begin porting to autoconf.
John "Elwin" Edwards
parents:
diff changeset
47 fi
07c4d4883ef2 rogue3: begin porting to autoconf.
John "Elwin" Edwards
parents:
diff changeset
48 if test ! "$CURSES_LIB"
07c4d4883ef2 rogue3: begin porting to autoconf.
John "Elwin" Edwards
parents:
diff changeset
49 then
07c4d4883ef2 rogue3: begin porting to autoconf.
John "Elwin" Edwards
parents:
diff changeset
50 AC_CACHE_CHECK([for working pdcur], mp_cv_pdcur,
07c4d4883ef2 rogue3: begin porting to autoconf.
John "Elwin" Edwards
parents:
diff changeset
51 [LIBS="$mp_save_LIBS -lpdcur"
07c4d4883ef2 rogue3: begin porting to autoconf.
John "Elwin" Edwards
parents:
diff changeset
52 AC_TRY_LINK(
07c4d4883ef2 rogue3: begin porting to autoconf.
John "Elwin" Edwards
parents:
diff changeset
53 [#include <curses.h>],
07c4d4883ef2 rogue3: begin porting to autoconf.
John "Elwin" Edwards
parents:
diff changeset
54 [chtype a; int b=A_STANDOUT, c=KEY_LEFT; initscr(); ],
07c4d4883ef2 rogue3: begin porting to autoconf.
John "Elwin" Edwards
parents:
diff changeset
55 mp_cv_pdcur=yes, mp_cv_pdcur=no)])
07c4d4883ef2 rogue3: begin porting to autoconf.
John "Elwin" Edwards
parents:
diff changeset
56 if test "$mp_cv_pdcur" = yes
07c4d4883ef2 rogue3: begin porting to autoconf.
John "Elwin" Edwards
parents:
diff changeset
57 then
07c4d4883ef2 rogue3: begin porting to autoconf.
John "Elwin" Edwards
parents:
diff changeset
58 AC_DEFINE(HAVE_CURSES_H, 1, [Define to 1 if libcurses is requested])
07c4d4883ef2 rogue3: begin porting to autoconf.
John "Elwin" Edwards
parents:
diff changeset
59 CURSES_LIB="-lpdcur"
07c4d4883ef2 rogue3: begin porting to autoconf.
John "Elwin" Edwards
parents:
diff changeset
60 fi
07c4d4883ef2 rogue3: begin porting to autoconf.
John "Elwin" Edwards
parents:
diff changeset
61 fi
07c4d4883ef2 rogue3: begin porting to autoconf.
John "Elwin" Edwards
parents:
diff changeset
62 if test ! "$CURSES_LIB"
07c4d4883ef2 rogue3: begin porting to autoconf.
John "Elwin" Edwards
parents:
diff changeset
63 then
07c4d4883ef2 rogue3: begin porting to autoconf.
John "Elwin" Edwards
parents:
diff changeset
64 AC_CACHE_CHECK([for working peer pdcurses], mp_cv_lpdcurses,
07c4d4883ef2 rogue3: begin porting to autoconf.
John "Elwin" Edwards
parents:
diff changeset
65 [LIBS="$mp_save_LIBS ../pdcurses/pdcurses.a"
07c4d4883ef2 rogue3: begin porting to autoconf.
John "Elwin" Edwards
parents:
diff changeset
66 AC_TRY_LINK(
07c4d4883ef2 rogue3: begin porting to autoconf.
John "Elwin" Edwards
parents:
diff changeset
67 [#include "../pdcurses/curses.h"],
07c4d4883ef2 rogue3: begin porting to autoconf.
John "Elwin" Edwards
parents:
diff changeset
68 [chtype a; int b=A_STANDOUT, c=KEY_LEFT; initscr(); ],
07c4d4883ef2 rogue3: begin porting to autoconf.
John "Elwin" Edwards
parents:
diff changeset
69 mp_cv_lpdcurses=yes, mp_cv_lpdcurses=no)])
07c4d4883ef2 rogue3: begin porting to autoconf.
John "Elwin" Edwards
parents:
diff changeset
70 if test "$mp_cv_lpdcurses" = yes
07c4d4883ef2 rogue3: begin porting to autoconf.
John "Elwin" Edwards
parents:
diff changeset
71 then
07c4d4883ef2 rogue3: begin porting to autoconf.
John "Elwin" Edwards
parents:
diff changeset
72 AC_DEFINE(HAVE_CURSES_H, 1, [Define to 1 if libcurses is requested])
07c4d4883ef2 rogue3: begin porting to autoconf.
John "Elwin" Edwards
parents:
diff changeset
73 CURSES_LIB="../pdcurses/pdcurses.a"
07c4d4883ef2 rogue3: begin porting to autoconf.
John "Elwin" Edwards
parents:
diff changeset
74 RF_ADDTO(CPPFLAGS,"-I../pdcurses")
07c4d4883ef2 rogue3: begin porting to autoconf.
John "Elwin" Edwards
parents:
diff changeset
75 fi
07c4d4883ef2 rogue3: begin porting to autoconf.
John "Elwin" Edwards
parents:
diff changeset
76 fi
07c4d4883ef2 rogue3: begin porting to autoconf.
John "Elwin" Edwards
parents:
diff changeset
77 AC_CACHE_CHECK([for ESCDELAY variable],
07c4d4883ef2 rogue3: begin porting to autoconf.
John "Elwin" Edwards
parents:
diff changeset
78 [mc_cv_ncurses_escdelay],
07c4d4883ef2 rogue3: begin porting to autoconf.
John "Elwin" Edwards
parents:
diff changeset
79 [AC_TRY_LINK([], [
07c4d4883ef2 rogue3: begin porting to autoconf.
John "Elwin" Edwards
parents:
diff changeset
80 extern int ESCDELAY;
07c4d4883ef2 rogue3: begin porting to autoconf.
John "Elwin" Edwards
parents:
diff changeset
81 ESCDELAY = 0;
07c4d4883ef2 rogue3: begin porting to autoconf.
John "Elwin" Edwards
parents:
diff changeset
82 ],
07c4d4883ef2 rogue3: begin porting to autoconf.
John "Elwin" Edwards
parents:
diff changeset
83 [mc_cv_ncurses_escdelay=yes],
07c4d4883ef2 rogue3: begin porting to autoconf.
John "Elwin" Edwards
parents:
diff changeset
84 [mc_cv_ncurses_escdelay=no])
07c4d4883ef2 rogue3: begin porting to autoconf.
John "Elwin" Edwards
parents:
diff changeset
85 ])
07c4d4883ef2 rogue3: begin porting to autoconf.
John "Elwin" Edwards
parents:
diff changeset
86 if test "$mc_cv_ncurses_escdelay" = yes; then
07c4d4883ef2 rogue3: begin porting to autoconf.
John "Elwin" Edwards
parents:
diff changeset
87 AC_DEFINE(HAVE_ESCDELAY, 1,
07c4d4883ef2 rogue3: begin porting to autoconf.
John "Elwin" Edwards
parents:
diff changeset
88 [Define if ncurses has ESCDELAY variable])
07c4d4883ef2 rogue3: begin porting to autoconf.
John "Elwin" Edwards
parents:
diff changeset
89 fi
07c4d4883ef2 rogue3: begin porting to autoconf.
John "Elwin" Edwards
parents:
diff changeset
90 if test ! "$CURSES_LIB" ; then
07c4d4883ef2 rogue3: begin porting to autoconf.
John "Elwin" Edwards
parents:
diff changeset
91 LIBS="$mp_save_LIBS"
07c4d4883ef2 rogue3: begin porting to autoconf.
John "Elwin" Edwards
parents:
diff changeset
92 fi
07c4d4883ef2 rogue3: begin porting to autoconf.
John "Elwin" Edwards
parents:
diff changeset
93 ])dnl
07c4d4883ef2 rogue3: begin porting to autoconf.
John "Elwin" Edwards
parents:
diff changeset
94
07c4d4883ef2 rogue3: begin porting to autoconf.
John "Elwin" Edwards
parents:
diff changeset
95 dnl
07c4d4883ef2 rogue3: begin porting to autoconf.
John "Elwin" Edwards
parents:
diff changeset
96 dnl RF_ADDTO(variable, value)
07c4d4883ef2 rogue3: begin porting to autoconf.
John "Elwin" Edwards
parents:
diff changeset
97 dnl
07c4d4883ef2 rogue3: begin porting to autoconf.
John "Elwin" Edwards
parents:
diff changeset
98 dnl Add value to variable
07c4d4883ef2 rogue3: begin porting to autoconf.
John "Elwin" Edwards
parents:
diff changeset
99 dnl
07c4d4883ef2 rogue3: begin porting to autoconf.
John "Elwin" Edwards
parents:
diff changeset
100 AC_DEFUN([RF_ADDTO],[
07c4d4883ef2 rogue3: begin porting to autoconf.
John "Elwin" Edwards
parents:
diff changeset
101 if test "x$$1" = "x"; then
07c4d4883ef2 rogue3: begin porting to autoconf.
John "Elwin" Edwards
parents:
diff changeset
102 test "x$silent" != "xyes" && echo " setting $1 to \"$2\""
07c4d4883ef2 rogue3: begin porting to autoconf.
John "Elwin" Edwards
parents:
diff changeset
103 $1="$2"
07c4d4883ef2 rogue3: begin porting to autoconf.
John "Elwin" Edwards
parents:
diff changeset
104 else
07c4d4883ef2 rogue3: begin porting to autoconf.
John "Elwin" Edwards
parents:
diff changeset
105 apr_addto_bugger="$2"
07c4d4883ef2 rogue3: begin porting to autoconf.
John "Elwin" Edwards
parents:
diff changeset
106 for i in $apr_addto_bugger; do
07c4d4883ef2 rogue3: begin porting to autoconf.
John "Elwin" Edwards
parents:
diff changeset
107 apr_addto_duplicate="0"
07c4d4883ef2 rogue3: begin porting to autoconf.
John "Elwin" Edwards
parents:
diff changeset
108 for j in $$1; do
07c4d4883ef2 rogue3: begin porting to autoconf.
John "Elwin" Edwards
parents:
diff changeset
109 if test "x$i" = "x$j"; then
07c4d4883ef2 rogue3: begin porting to autoconf.
John "Elwin" Edwards
parents:
diff changeset
110 apr_addto_duplicate="1"
07c4d4883ef2 rogue3: begin porting to autoconf.
John "Elwin" Edwards
parents:
diff changeset
111 break
07c4d4883ef2 rogue3: begin porting to autoconf.
John "Elwin" Edwards
parents:
diff changeset
112 fi
07c4d4883ef2 rogue3: begin porting to autoconf.
John "Elwin" Edwards
parents:
diff changeset
113 done
07c4d4883ef2 rogue3: begin porting to autoconf.
John "Elwin" Edwards
parents:
diff changeset
114 if test $apr_addto_duplicate = "0"; then
07c4d4883ef2 rogue3: begin porting to autoconf.
John "Elwin" Edwards
parents:
diff changeset
115 test "x$silent" != "xyes" && echo " adding \"$i\" to $1"
07c4d4883ef2 rogue3: begin porting to autoconf.
John "Elwin" Edwards
parents:
diff changeset
116 $1="$$1 $i"
07c4d4883ef2 rogue3: begin porting to autoconf.
John "Elwin" Edwards
parents:
diff changeset
117 fi
07c4d4883ef2 rogue3: begin porting to autoconf.
John "Elwin" Edwards
parents:
diff changeset
118 done
07c4d4883ef2 rogue3: begin porting to autoconf.
John "Elwin" Edwards
parents:
diff changeset
119 fi
07c4d4883ef2 rogue3: begin porting to autoconf.
John "Elwin" Edwards
parents:
diff changeset
120 ])dnl
07c4d4883ef2 rogue3: begin porting to autoconf.
John "Elwin" Edwards
parents:
diff changeset
121
07c4d4883ef2 rogue3: begin porting to autoconf.
John "Elwin" Edwards
parents:
diff changeset
122