- remove AUTOMAKE_OPTIONS from underlying Makefile.am

- make autogen error out on toolchain failures
- reorder configure.in to get rid of the errors
- make an AM_CONDITIONAL for FLAC builds so building with flac detected works
- make heavy use of config.h so we don't have gcc compile lines that are
  1000 characters long
- make make distcheck pass


svn path=/trunk/vorbis-tools/; revision=9393
parent 2cbbb472
......@@ -66,15 +66,15 @@ fi
echo "Generating configuration files for $package, please wait...."
echo " aclocal $ACLOCAL_FLAGS"
aclocal $ACLOCAL_FLAGS
#echo " autoheader"
#autoheader
aclocal $ACLOCAL_FLAGS || exit 1
echo " autoheader"
autoheader || exit 1
echo " libtoolize --automake"
libtoolize --automake
libtoolize --automake || exit 1
echo " automake --add-missing $AUTOMAKE_FLAGS"
automake --add-missing $AUTOMAKE_FLAGS
automake --add-missing $AUTOMAKE_FLAGS || exit 1
echo " autoconf"
autoconf
autoconf || exit 1
cd $olddir
$srcdir/configure "$@" && echo
/* config.h. Generated by configure. */
/* config.h.in. Generated from configure.in by autoheader. */
/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
systems. This function is required for `alloca.c' support on those systems.
*/
/* #undef CRAY_STACKSEG_END */
/* Define to 1 if using `alloca.c'. */
/* #undef C_ALLOCA */
/* Define to 1 if translation of program messages to the user's native
language is requested. */
#define ENABLE_NLS 1
/* Define to 1 if you have `alloca', as a function or macro. */
#define HAVE_ALLOCA 1
/* Define to 1 if you have <alloca.h> and it should be used (not on Ultrix).
*/
#define HAVE_ALLOCA_H 1
/* Define to 1 if you have the <argz.h> header file. */
#define HAVE_ARGZ_H 1
/* Define to 1 if you have the `asprintf' function. */
#define HAVE_ASPRINTF 1
/* Define to 1 if you have the `atexit' function. */
#define HAVE_ATEXIT 1
/* Define if you have libcurl. */
#define HAVE_CURL 1
/* Define if the GNU dcgettext() function is already present or preinstalled.
*/
#define HAVE_DCGETTEXT 1
/* Define to 1 if you have the declaration of `feof_unlocked', and to 0 if you
don't. */
#define HAVE_DECL_FEOF_UNLOCKED 1
/* Define to 1 if you have the declaration of `fgets_unlocked', and to 0 if
you don't. */
#define HAVE_DECL_FGETS_UNLOCKED 0
/* Define to 1 if you have the declaration of `getc_unlocked', and to 0 if you
don't. */
#define HAVE_DECL_GETC_UNLOCKED 1
/* Define to 1 if you have the declaration of `_snprintf', and to 0 if you
don't. */
#define HAVE_DECL__SNPRINTF 0
/* Define to 1 if you have the declaration of `_snwprintf', and to 0 if you
don't. */
#define HAVE_DECL__SNWPRINTF 0
/* Define to 1 if you have the <dlfcn.h> header file. */
#define HAVE_DLFCN_H 1
/* Define to 1 if you have the `dlopen' function. */
/* #undef HAVE_DLOPEN */
/* Define to 1 if you have the `fwprintf' function. */
#define HAVE_FWPRINTF 1
/* Define to 1 if you have the `getcwd' function. */
#define HAVE_GETCWD 1
/* Define to 1 if you have the `getegid' function. */
#define HAVE_GETEGID 1
/* Define to 1 if you have the `geteuid' function. */
#define HAVE_GETEUID 1
/* Define to 1 if you have the `getgid' function. */
#define HAVE_GETGID 1
/* Define to 1 if you have the `getpagesize' function. */
#define HAVE_GETPAGESIZE 1
/* Define if the GNU gettext() function is already present or preinstalled. */
#define HAVE_GETTEXT 1
/* Define to 1 if you have the `getuid' function. */
#define HAVE_GETUID 1
/* Define if you have the iconv() function. */
#define HAVE_ICONV 1
/* Define if you have the 'intmax_t' type in <stdint.h> or <inttypes.h>. */
#define HAVE_INTMAX_T 1
/* Define if <inttypes.h> exists and doesn't clash with <sys/types.h>. */
#define HAVE_INTTYPES_H 1
/* Define if <inttypes.h> exists, doesn't clash with <sys/types.h>, and
declares uintmax_t. */
#define HAVE_INTTYPES_H_WITH_UINTMAX 1
/* Define if you have <langinfo.h> and nl_langinfo(CODESET). */
#define HAVE_LANGINFO_CODESET 1
/* Define if your <locale.h> file defines LC_MESSAGES. */
#define HAVE_LC_MESSAGES 1
/* Defined if we have libFLAC */
#define HAVE_LIBFLAC 1
/* Defined if we have libspeex */
#define HAVE_LIBSPEEX 1
/* Define to 1 if you have the <limits.h> header file. */
#define HAVE_LIMITS_H 1
/* Define to 1 if you have the <locale.h> header file. */
#define HAVE_LOCALE_H 1
/* Define if you have the 'long double' type. */
#define HAVE_LONG_DOUBLE 1
/* Define if you have the 'long long' type. */
#define HAVE_LONG_LONG 1
/* Define to 1 if you have the <malloc.h> header file. */
#define HAVE_MALLOC_H 1
/* Define to 1 if you have the <memory.h> header file. */
#define HAVE_MEMORY_H 1
/* Define to 1 if you have the `mempcpy' function. */
#define HAVE_MEMPCPY 1
/* Define to 1 if you have a working `mmap' system call. */
#define HAVE_MMAP 1
/* Define to 1 if you have the `munmap' function. */
#define HAVE_MUNMAP 1
/* Define to 1 if you have the <nl_types.h> header file. */
#define HAVE_NL_TYPES_H 1
/* Define to 1 if you have the `on_exit' function. */
#define HAVE_ON_EXIT 1
/* Define if your printf() function supports format strings with positions. */
#define HAVE_POSIX_PRINTF 1
/* Define if you have POSIX threads libraries and header files. */
#define HAVE_PTHREAD 1
/* Define to 1 if you have the `putenv' function. */
#define HAVE_PUTENV 1
/* Define to 1 if you have the `setenv' function. */
#define HAVE_SETENV 1
/* Define to 1 if you have the `setlocale' function. */
#define HAVE_SETLOCALE 1
/* Define to 1 if you have the `snprintf' function. */
#define HAVE_SNPRINTF 1
/* Define to 1 if you have the <stddef.h> header file. */
#define HAVE_STDDEF_H 1
/* Define to 1 if you have the <stdint.h> header file. */
#define HAVE_STDINT_H 1
/* Define if <stdint.h> exists, doesn't clash with <sys/types.h>, and declares
uintmax_t. */
#define HAVE_STDINT_H_WITH_UINTMAX 1
/* Define to 1 if you have the <stdlib.h> header file. */
#define HAVE_STDLIB_H 1
/* Define to 1 if you have the `stpcpy' function. */
#define HAVE_STPCPY 1
/* Define to 1 if you have the `strcasecmp' function. */
#define HAVE_STRCASECMP 1
/* Define to 1 if you have the `strdup' function. */
#define HAVE_STRDUP 1
/* Define to 1 if you have the <strings.h> header file. */
#define HAVE_STRINGS_H 1
/* Define to 1 if you have the <string.h> header file. */
#define HAVE_STRING_H 1
/* Define to 1 if you have the `strtoul' function. */
#define HAVE_STRTOUL 1
/* Define to 1 if you have the <sys/param.h> header file. */
#define HAVE_SYS_PARAM_H 1
/* Define to 1 if you have the <sys/stat.h> header file. */
#define HAVE_SYS_STAT_H 1
/* Define to 1 if you have the <sys/types.h> header file. */
#define HAVE_SYS_TYPES_H 1
/* Define to 1 if you have the `tsearch' function. */
#define HAVE_TSEARCH 1
/* Define if you have the 'uintmax_t' type in <stdint.h> or <inttypes.h>. */
#define HAVE_UINTMAX_T 1
/* Define to 1 if you have the <unistd.h> header file. */
#define HAVE_UNISTD_H 1
/* Define if you have the 'unsigned long long' type. */
#define HAVE_UNSIGNED_LONG_LONG 1
/* Define if you have the 'wchar_t' type. */
#define HAVE_WCHAR_T 1
/* Define to 1 if you have the `wcslen' function. */
#define HAVE_WCSLEN 1
/* Define if you have the 'wint_t' type. */
#define HAVE_WINT_T 1
/* Define to 1 if you have the `__argz_count' function. */
#define HAVE___ARGZ_COUNT 1
/* Define to 1 if you have the `__argz_next' function. */
#define HAVE___ARGZ_NEXT 1
/* Define to 1 if you have the `__argz_stringify' function. */
#define HAVE___ARGZ_STRINGIFY 1
/* Define to 1 if you have the `__fsetlocking' function. */
#define HAVE___FSETLOCKING 1
/* Define as const if the declaration of iconv() needs const. */
#define ICONV_CONST
/* Define if integer division by zero raises signal SIGFPE. */
#define INTDIV0_RAISES_SIGFPE 1
/* Name of package */
#define PACKAGE "vorbis-tools"
/* Define to the address where bug reports for this package should be sent. */
#define PACKAGE_BUGREPORT ""
/* Define to the full name of this package. */
#define PACKAGE_NAME ""
/* Define to the full name and version of this package. */
#define PACKAGE_STRING ""
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME ""
/* Define to the version of this package. */
#define PACKAGE_VERSION ""
/* Define if <inttypes.h> exists and defines unusable PRI* macros. */
/* #undef PRI_MACROS_BROKEN */
/* Define to the necessary symbol if this constant uses a non-standard name on
your system. */
/* #undef PTHREAD_CREATE_JOINABLE */
/* Define as the maximum value of type 'size_t', if the system doesn't define
it. */
/* #undef SIZE_MAX */
/* If using the C implementation of alloca, define if you know the
direction of stack growth for your system; otherwise it will be
automatically deduced at run-time.
STACK_DIRECTION > 0 => grows toward higher addresses
STACK_DIRECTION < 0 => grows toward lower addresses
STACK_DIRECTION = 0 => direction of growth unknown */
/* #undef STACK_DIRECTION */
/* Define to 1 if you have the ANSI C header files. */
#define STDC_HEADERS 1
/* Version number of package */
#define VERSION "1.1.0"
/* Define to empty if `const' does not conform to ANSI C. */
/* #undef const */
/* Define to `__inline__' or `__inline' if that's what the C compiler
calls it, or to nothing if 'inline' is not supported under any name. */
#ifndef __cplusplus
/* #undef inline */
#endif
/* Define to `long' if <sys/types.h> does not define. */
/* #undef off_t */
/* Define as the type of the result of subtracting two pointers, if the system
doesn't define it. */
/* #undef ptrdiff_t */
/* Define to empty if the C compiler doesn't support this keyword. */
/* #undef signed */
/* Define to `unsigned' if <sys/types.h> does not define. */
/* #undef size_t */
/* Define to unsigned long or unsigned long long if <stdint.h> and
<inttypes.h> don't define. */
/* #undef uintmax_t */
......@@ -6,12 +6,17 @@ dnl ------------------------------------------------
AC_INIT(oggenc/encode.c)
AC_CANONICAL_HOST
AC_CANONICAL_TARGET
dnl Apparently we need a newer version than we used to.
AC_PREREQ(2.53)
AM_INIT_AUTOMAKE([vorbis-tools],[1.1.0])
AM_MAINTAINER_MODE
AC_CONFIG_HEADER(config.h)
dnl --------------------------------------------------
dnl Check for programs
dnl --------------------------------------------------
......@@ -31,8 +36,6 @@ dnl --------------------------------------------------
dnl Set build flags based on environment
dnl --------------------------------------------------
AC_CANONICAL_HOST
cflags_save="$CFLAGS"
ldflags_save="$LDFLAGS"
if test -z "$GCC"; then
......@@ -144,12 +147,13 @@ AC_CHECK_HEADER(FLAC/stream_decoder.h,,
if test "x$have_libFLAC" = xyes; then
if test "x$build_flac" = xyes; then
AC_DEFINE(HAVE_LIBFLAC)
AC_DEFINE(HAVE_LIBFLAC, 1, [Defined if we have libFLAC])
fi
else
build_flac="no"
FLAC_LIBS=""
fi
AM_CONDITIONAL(HAVE_LIBFLAC, test "x$have_libFLAC" = "xyes")
AC_SUBST(FLAC_LIBS)
dnl ------------------- Speex ------------------------
......@@ -167,7 +171,7 @@ AC_CHECK_HEADER(speex.h,,
if test "x$have_libspeex" = xyes; then
if test "x$build_speex" = xyes; then
AC_DEFINE(HAVE_LIBSPEEX)
AC_DEFINE(HAVE_LIBSPEEX, 1, [Defined if we have libspeex])
fi
else
build_speex="no"
......
## Process this file with automake to produce Makefile.in
AUTOMAKE_OPTIONS = foreign
EXTRA_DIST = changelog control copyright rules vorbis-tools.README.Debian \
vorbis-tools.install vorbis-tools.manpages vorbis-tools.mime
## Process this file with automake to produce Makefile.in
AUTOMAKE_OPTIONS = foreign
EXTRA_DIST = utf8.h getopt.h i18n.h
## Process this file with automake to produce Makefile.in
AUTOMAKE_OPTIONS = foreign
datadir = @datadir@
localedir = $(datadir)/locale
DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
......
......@@ -20,6 +20,9 @@
#include <string.h>
#include <ao/ao.h>
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include "getopt.h"
#include "cmdline_options.h"
#include "status.h"
......
......@@ -18,6 +18,10 @@
#ifndef __COMPAT_H__
#define __COMPAT_H__
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#ifdef __sun
#include <alloca.h>
#endif
......
......@@ -18,6 +18,9 @@
#include <stdio.h>
#include <string.h>
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include "transport.h"
#include "format.h"
#include "i18n.h"
......
......@@ -15,6 +15,9 @@
********************************************************************/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#ifdef HAVE_CURL
#include <stdlib.h>
......
......@@ -18,6 +18,9 @@
#include <stdio.h>
#include <string.h>
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include "transport.h"
#include "i18n.h"
......
## Process this file with automake to produce Makefile.in
AUTOMAKE_OPTIONS = foreign
mans = oggdec.1
oggdecsources = oggdec.c
......
## Process this file with automake to produce Makefile.in
AUTOMAKE_OPTIONS = foreign
if HAVE_LIBFLAC
flac_sources = flac.c flac.h easyflac.c easyflac.h
else
flac_sources =
endif
SUBDIRS = man
......@@ -18,10 +21,10 @@ oggenc_LDADD = @OGGENC_FLAC_OBJS@ @SHARE_LIBS@ \
oggenc_DEPENDENCIES = @OGGENC_FLAC_OBJS@ @SHARE_LIBS@
oggenc_SOURCES = oggenc.c audio.c encode.c platform.c \
oggenc_SOURCES = $(flac_sources) \
oggenc.c audio.c encode.c platform.c \
audio.h encode.h platform.h resample.c resample.h
EXTRA_oggenc_SOURCES = flac.c flac.h easyflac.c easyflac.h
debug:
$(MAKE) all CFLAGS="@DEBUG@"
......
......@@ -14,6 +14,11 @@
#include <string.h>
#include <sys/types.h>
#include <math.h>
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include "audio.h"
#include "platform.h"
#include "i18n.h"
......
## Process this file with automake to produce Makefile.in
AUTOMAKE_OPTIONS = foreign
mans = oggenc.1
mandir = @MANDIR@
......
## Process this file with automake to produce Makefile.in
AUTOMAKE_OPTIONS = foreign
mans = ogginfo.1
ogginfosources = ogginfo2.c theora.c
......
## Process this file with automake to produce Makefile.in
AUTOMAKE_OPTIONS = foreign
INCLUDES = -I$(top_srcdir)/include
noinst_LIBRARIES = libutf8.a libgetopt.a
......
## Process this file with automake to produce Makefile.in
AUTOMAKE_OPTIONS = foreign
mans = vcut.1
vcutsources = vcut.c vcut.h
......
## Process this file with automake to produce Makefile.in
AUTOMAKE_OPTIONS = foreign
mans = vorbiscomment.1
vorbiscommentsources = vcedit.c vcedit.h vcomment.c
......
......@@ -13,6 +13,11 @@
#include <string.h>
#include <stdlib.h>
#include <locale.h>
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include "getopt.h"
#include "utf8.h"
#include "i18n.h"
......
## Process this file with automake to produce Makefile.in
AUTOMAKE_OPTIONS = foreign dist-zip
EXTRA_DIST = oggenc.dsp oggenc_dynamic.dsp ogginfo.dsp tools.dsp tools.dsw\
tools.opt vcut.dsp vorbiscomment.dsp
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment