From e833bb37461b6ec65023b3f4e1df9c9f0a24a266 Mon Sep 17 00:00:00 2001 From: Takamichi Horikawa Date: Sun, 22 Jan 2017 23:09:37 +0900 Subject: fix curses autoconf --- curses/Makefile.am | 5 +++-- curses/configure.ac | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/curses/Makefile.am b/curses/Makefile.am index ef1a134..92f981f 100644 --- a/curses/Makefile.am +++ b/curses/Makefile.am @@ -1,3 +1,4 @@ +ACLOCAL_AMFLAGS=-Im4 bin_PROGRAMS=fmpc LIBOPNA_SOURCES=../libopna/opnaadpcm.c \ @@ -14,5 +15,5 @@ fmpc_SOURCES=main.c \ $(FMDRIVER_SOURCES) fmpc_CFLAGS=-Wall -Wextra -pedantic \ - -I.. $(PORTAUDIO_CFLAGS) $(NCURSES_CFLAGS) -fmpc_LDADD=$(PORTAUDIO_LIBS) $(NCURSES_LIBS) + -I.. $(PORTAUDIO_CFLAGS) $(CURSES_CFLAGS) +fmpc_LDADD=$(PORTAUDIO_LIBS) $(CURSES_LIBS) $(LIBICONV) diff --git a/curses/configure.ac b/curses/configure.ac index fd8e0cc..d4623ea 100644 --- a/curses/configure.ac +++ b/curses/configure.ac @@ -2,9 +2,9 @@ AC_INIT([fmplayer], [0.1.0]) AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects]) AC_PROG_CC_C99 -dnl AM_PATH_SDL2([2.0.5]) PKG_CHECK_MODULES([PORTAUDIO], [portaudio-2.0]) -PKG_CHECK_MODULES([NCURSES], [ncursesw >= 6]) +AX_WITH_CURSES +AM_ICONV AC_CONFIG_FILES([Makefile]) AC_OUTPUT -- cgit v1.2.3