Cleanup configure.ac a bit

This is not a thorough cleanup, but removes some of the obvious
obsolete stuff.

configure.ac

@@ -8,19 +8,12 @@ AC_CONFIG_SRCDIR([config.h.in])
 AC_CONFIG_HEADERS([config.h])
 
 # Checks for programs.
-AC_PROG_AWK
 AC_PROG_CC
 AC_PROG_CPP
 AC_PROG_INSTALL
 AC_PROG_LN_S
 AC_PROG_MAKE_SET
-AC_PROG_RANLIB
-AC_PROG_CXX
-AC_PROG_OBJC
-AC_PROG_OBJCXX
 AC_PROG_MKDIR_P
-AM_PROG_AS
-AM_PROG_GCJ
 
 # locate pkg-config
 PKG_PROG_PKG_CONFIG
@@ -45,7 +38,6 @@ AC_CHECK_HEADERS([fcntl.h libintl.h locale.h stdlib.h string.h strings.h \
 #AC_CHECK_HEADERS([cdio/paranoia/cdda.h])
 
 # Checks for typedefs, structures, and compiler characteristics.
-AC_C_INLINE
 AC_TYPE_INT16_T
 AC_TYPE_PID_T
 AC_TYPE_SIZE_T
@@ -57,7 +49,7 @@ AC_FUNC_FORK
 AC_FUNC_MALLOC
 AC_FUNC_REALLOC
 AC_FUNC_STRTOD
-AC_CHECK_FUNCS([atexit ftruncate mkdir  select setlocale strcasecmp strchr strdup strerror strrchr strstr])
+AC_CHECK_FUNCS([atexit mkdir select setlocale strcasecmp strchr strdup strerror strrchr strstr])
 AC_CHECK_FUNCS([isascii])
 AC_CHECK_FUNCS([rmdir])
 AC_CHECK_FUNCS([memmove])
@@ -68,7 +60,6 @@ AC_CHECK_FUNCS([strncasecmp])
 AC_CHECK_FUNCS([strtol])
 AC_CHECK_HEADERS([termios.h])
 AC_CHECK_HEADERS([wchar.h])
-AC_FUNC_ERROR_AT_LINE
 AC_FUNC_MMAP
 AC_TYPE_SSIZE_T
 
@@ -84,41 +75,25 @@ dnl System type.
 
 AC_CANONICAL_HOST
 
-dnl Support for libtool.
-
 dnl Compiler options.
 
 AM_SILENT_RULES([yes])
 
-dnl Checks for header files.
-
-AC_HEADER_STDC
 dnl Checks for typedefs, structures, and compiler characteristics.
 
 AC_C_CONST
 AC_C_BIGENDIAN
 
 dnl Checks for library functions.
 
-AC_FUNC_VPRINTF
 AC_CHECK_FUNCS(madvise localeconv)
 AC_REPLACE_FUNCS(strcasecmp strncasecmp)
 AC_SEARCH_LIBS(pow, m)
 AC_SEARCH_LIBS(log10, m)
-AC_MSG_CHECKING([whether to use mmap])
 AC_CACHE_SAVE
-AC_MSG_CHECKING([whether to enable profiling])
-AC_MSG_RESULT(${enable_profiling-no})
-
-AC_MSG_CHECKING([whether to enable debugging])
-AC_MSG_RESULT(${enable_experimental-no})
 
 dnl Create output files.
 
-AC_PROG_YACC
-AC_CHECK_FUNCS([__argz_count])
-AC_CHECK_FUNCS([__argz_next])
-AC_CHECK_FUNCS([__argz_stringify])
 AC_CHECK_FUNCS([nl_langinfo])
 AC_CHECK_FUNCS([strchr])
 AC_CHECK_FUNCS([strcspn])
@@ -140,7 +115,6 @@ AC_CHECK_HEADERS([argz.h])
 AC_CHECK_HEADERS([limits.h])
 AC_CHECK_HEADERS([stddef.h])
 AC_CHECK_HEADERS([sys/param.h])
-AC_FUNC_ALLOCA
 
 dnl Select an audio system.
 

src/Makefile.am

@@ -12,12 +12,11 @@ AM_CPPFLAGS = $(CDIO_CFLAGS) \
 	$(ID3TAG_CFLAGS) \
 	$(ASOUND_CFLAGS)
 
-AM_CFLAGS = -I . -D LOCALEDIR=\"$(prefix)/share/locale\"  -Wall -Wextra \
+AM_CFLAGS = -I . -D LOCALEDIR=\"$(datadir)/locale\"  -Wall -Wextra \
             -Wunused -Wunused-variable -Wunused-function \
             -Wmissing-declarations \
             -g -O3 \
-            -Wuninitialized -Winit-self \
-            -DPROGRAMNAME_LOCALEDIR=\"${PROGRAMNAME_LOCALEDIR}\"
+            -Wuninitialized -Winit-self
 
 #AM_LDFLAGS = -static # jos
 
@@ -35,25 +34,15 @@ LIBS += $(CDIO_LIBS) \
 
 bin_PROGRAMS = daisy-player
 
-ldadd = $(depend) @LTLIBINTL@
-
-DEPENDENCIES = $(depend)
-
-LDADD =	$(ldadd)
-
-CLEANFILES = $(EXTRA_PROGRAMS)
-
-libtool: $(LIBTOOL_DEPS)
-	$(SHELL) ./config.status --recheck
+LDADD = @LTLIBINTL@
 
 .c.s:
 	(cd madplay && $(MAKE))
 	(cd pactl/src && $(MAKE))
 	$(COMPILE) -S $<
 
 again:
-	$(MAKE) clean
-	$(MAKE)                 
+	$(MAKE) clean all
 
 .PHONY: profile again
 
@@ -70,5 +59,3 @@ daisy_player_SOURCES = madplay/madplay.c madplay/audio.c \
                        daisy3.c daisy-player.c playfile.c \
                        daisy.h \
                        ncx.c opf.c
-
-localedir = $(datadir)/locale