View | Details | Raw Unified | Return to bug 5546
Collapse All | Expand All

(-)file_not_specified_in_diff (-11 / +10 lines)
Line  Link Here
0
-- aalib.m4
0
++ aalib.m4
Lines 9-15 Link Here
9
dnl AM_PATH_AALIB([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
9
dnl AM_PATH_AALIB([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
10
dnl Test for AALIB, and define AALIB_CFLAGS and AALIB_LIBS
10
dnl Test for AALIB, and define AALIB_CFLAGS and AALIB_LIBS
11
dnl
11
dnl
12
AC_DEFUN(AM_PATH_AALIB,
12
AC_DEFUN([AM_PATH_AALIB],
13
[dnl 
13
[dnl 
14
dnl Get the cflags and libraries from the aalib-config script
14
dnl Get the cflags and libraries from the aalib-config script
15
dnl
15
dnl
16
-- configure.in
16
++ configure.in
Lines 1-4 Link Here
1
include(aclocal.m4)
2
AC_INIT(src/aalib.c)
1
AC_INIT(src/aalib.c)
3
AM_INIT_AUTOMAKE(aalib,1.4.0)
2
AM_INIT_AUTOMAKE(aalib,1.4.0)
4
AC_CANONICAL_HOST
3
AC_CANONICAL_HOST
Lines 126-132 Link Here
126
125
127
126
128
search_ncurses=true
127
search_ncurses=true
129
AC_DEFUN(AC_USE_SUNOS_CURSES, [
128
AC_DEFUN([AC_USE_SUNOS_CURSES], [
130
	search_ncurses=false
129
	search_ncurses=false
131
	curses_driver=true
130
	curses_driver=true
132
	screen_manager="SunOS 4.x /usr/5include curses"
131
	screen_manager="SunOS 4.x /usr/5include curses"
Lines 140-146 Link Here
140
	AC_WARN(Reconsider using Slang)
139
	AC_WARN(Reconsider using Slang)
141
])
140
])
142
141
143
AC_DEFUN(AC_USE_OSF1_CURSES, [
142
AC_DEFUN([AC_USE_OSF1_CURSES], [
144
       AC_MSG_RESULT(Using OSF1 curses)
143
       AC_MSG_RESULT(Using OSF1 curses)
145
       search_ncurses=false
144
       search_ncurses=false
146
       curses_driver=true
145
       curses_driver=true
Lines 152-158 Link Here
152
       AALIB_LIBS="$AALIB_LIBS -lcurses"
151
       AALIB_LIBS="$AALIB_LIBS -lcurses"
153
])
152
])
154
153
155
AC_DEFUN(AC_USE_SYSV_CURSES, [
154
AC_DEFUN([AC_USE_SYSV_CURSES], [
156
	AC_MSG_RESULT(Using SysV curses)
155
	AC_MSG_RESULT(Using SysV curses)
157
        curses_driver=true
156
        curses_driver=true
158
	AC_DEFINE(USE_SYSV_CURSES)
157
	AC_DEFINE(USE_SYSV_CURSES)
Lines 208-214 Link Here
208
)
207
)
209
208
210
if test  "$slang_driver_test" = yes; then
209
if test  "$slang_driver_test" = yes; then
211
  AC_DEFUN(AC_SLANG, [
210
  AC_DEFUN([AC_SLANG], [
212
    if $search_slang
211
    if $search_slang
213
    then
212
    then
214
        if test -f $1/$2
213
        if test -f $1/$2
Lines 246-252 Link Here
246
dnl
245
dnl
247
dnl Parameters: directory filename LIBS_append CFLAGS_append nicename
246
dnl Parameters: directory filename LIBS_append CFLAGS_append nicename
248
dnl
247
dnl
249
AC_DEFUN(AC_NCURSES, [
248
AC_DEFUN([AC_NCURSES], [
250
    if $search_ncurses
249
    if $search_ncurses
251
    then
250
    then
252
        if test -f $1/$2
251
        if test -f $1/$2
Lines 274-280 Link Here
274
dnl
273
dnl
275
dnl Parameters: directory filename LIBS_append CFLAGS_append nicename
274
dnl Parameters: directory filename LIBS_append CFLAGS_append nicename
276
dnl
275
dnl
277
AC_DEFUN(AC_CURSES, [
276
AC_DEFUN([AC_CURSES], [
278
    if $search_ncurses
277
    if $search_ncurses
279
    then
278
    then
280
        if test -f $1/$2
279
        if test -f $1/$2
Lines 320-326 Link Here
320
    if $search_ncurses 
319
    if $search_ncurses 
321
    then
320
    then
322
        AC_EGREP_HEADER(init_color, /usr/include/curses.h,
321
        AC_EGREP_HEADER(init_color, /usr/include/curses.h,
323
	    AC_USE_SYSV_CURSES)
322
	    [AC_USE_SYSV_CURSES])
324
    fi
323
    fi
325
324
326
    dnl
325
    dnl

Return to bug 5546