From a23c5c73be4209534a4d8055847f8a6e96d3abb6 Mon Sep 17 00:00:00 2001 From: Kevin Zheng Date: Tue, 22 Dec 2015 12:01:22 -0600 Subject: [PATCH] Clean up configure script --- configure.ac | 78 ++++++++++++++-------------------------------------- 1 file changed, 20 insertions(+), 58 deletions(-) diff --git a/configure.ac b/configure.ac index 65e91f2..0d5e862 100644 --- a/configure.ac +++ b/configure.ac @@ -1,31 +1,14 @@ -dnl -dnl configure.ac Generated by project-setup -dnl - -AC_DEFUN([PKG_NAME], [minimodem]) -AC_DEFUN([PKG_VERSION], [0.22.1]) -AC_DEFUN([PKG_AUTHOR], [Kamal Mostafa ]) -AC_DEFUN([PKG_BUGS_TO], [kamal@whence.com]) - - AC_PREREQ([2.64]) +AC_INIT([minimodem], [0.22.1], [kamal@whence.com]) +AC_CONFIG_HEADERS([config.h]) +AC_CONFIG_SRCDIR([src/Makefile.in]) +AM_INIT_AUTOMAKE -AC_INIT(PKG_NAME, PKG_VERSION, PKG_BUGS_TO) - -dnl Release versioning info -VERSION=PKG_VERSION +VERSION=PACKAGE_VERSION AC_SUBST(VERSION) -AM_INIT_AUTOMAKE -AC_CONFIG_SRCDIR([src/Makefile.in]) - -AC_CONFIG_HEADERS([config.h]) - -# AC_CONFIG_MACRO_DIR([m4]) - -# Checks for programs. +# Program Checks AC_PROG_CC -# AC_PROG_RANLIB # Library Checks AC_SEARCH_LIBS([lroundf], [m]) @@ -48,10 +31,10 @@ AC_DEFINE_UNQUOTED([USE_ALSA], [$use_alsa], AC_ARG_WITH([pulseaudio], AS_HELP_STRING([--without-pulseaudio], [build without pulseaudio support])) AS_IF([test "x$with_pulseaudio" == "xno"], [ - use_pulseaudio=0 + use_pulseaudio=0 ], [ - use_pulseaudio=1 - deps_packages="$deps_packages libpulse-simple" + use_pulseaudio=1 + deps_packages="$deps_packages libpulse-simple" ]) AC_DEFINE_UNQUOTED([USE_PULSEAUDIO], [$use_pulseaudio], [Define to 1 to enable pulseaudio support]) @@ -60,10 +43,10 @@ AC_DEFINE_UNQUOTED([USE_PULSEAUDIO], [$use_pulseaudio], AC_ARG_WITH([sndfile], AS_HELP_STRING([--without-sndfile], [build without sndfile support])) AS_IF([test "x$with_sndfile" == "xno"], [ - use_sndfile=0 + use_sndfile=0 ], [ use_sndfile=1 - deps_packages="$deps_packages sndfile" + deps_packages="$deps_packages sndfile" ]) AC_DEFINE_UNQUOTED([USE_SNDFILE], [$use_sndfile], [Define to 1 to enable sndfile support]) @@ -72,46 +55,25 @@ AC_DEFINE_UNQUOTED([USE_SNDFILE], [$use_sndfile], AC_ARG_WITH([benchmarks], AS_HELP_STRING([--disable-benchmarks], [build without internal benchmarks])) AS_IF([test "x$with_benchmarks" == "xno"], [ - use_benchmarks=0 + use_benchmarks=0 ], [ - use_benchmarks=1 + use_benchmarks=1 ]) AC_DEFINE_UNQUOTED([USE_BENCHMARKS], [$use_benchmarks], [Define to 1 to enable internal benchmarks]) AC_MSG_RESULT([ -PKG_NAME PKG_VERSION configuration summary: - --with-pulseaudio $with_pulseaudio ($use_pulseaudio) - --with-alsa $with_alsa ($use_alsa) - --with-sndfile $with_sndfile ($use_sndfile) - --with-benchmarks $with_benchmarks ($use_benchmarks) - deps_packages: $deps_packages +option summary: + alsa $with_alsa ($use_alsa) + benchmarks $with_benchmarks ($use_benchmarks) + pulseaudio $with_pulseaudio ($use_pulseaudio) + sndfile $with_sndfile ($use_sndfile) ]) - # Checks for libraries. -PKG_CHECK_MODULES(DEPS, [ $deps_packages ]) - -AC_SUBST(DEPS_CFLAGS) -AC_SUBST(DEPS_LIBS) +PKG_CHECK_MODULES(DEPS, [$deps_packages]) AC_SUBST([auto_find_tests], ['$(sort $(wildcard *.test))']) -# Checks for header files. -# AC_CHECK_HEADERS([stdlib.h string.h unistd.h]) - -# Checks for typedefs, structures, and compiler characteristics. -# AC_HEADER_STDBOOL -# AC_TYPE_PID_T - -# Checks for library functions. -# AC_FUNC_FORK - -AC_CONFIG_FILES([ - Makefile - src/Makefile - src/minimodem.1 - tests/Makefile - ]) -# testdata/Makefile +AC_CONFIG_FILES([Makefile src/Makefile src/minimodem.1 tests/Makefile]) AC_OUTPUT