From 3f6c998ba54504396cc107e96177114d6ebcb6de Mon Sep 17 00:00:00 2001 From: Josh Coalson Date: Thu, 5 Sep 2002 05:40:58 +0000 Subject: [PATCH] gettext-related fixes --- Makefile.am | 5 ++++- configure.in | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index 5286bf8..000f40e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -29,11 +29,12 @@ # -SUBDIRS = doc include man src test build flac.pbproj obj +SUBDIRS = intl m4 doc include man src test build flac.pbproj obj DISTCLEANFILES = libtool-disable-static EXTRA_DIST = \ + config.rpath \ COPYING.FDL \ COPYING.GPL \ COPYING.LGPL \ @@ -43,3 +44,5 @@ EXTRA_DIST = \ strip_fPIC.sh AUTOMAKE_OPTIONS = foreign + +ACLOCAL_AMFLAGS = -I m4 diff --git a/configure.in b/configure.in index 3eefbf2..8fb0435 100644 --- a/configure.in +++ b/configure.in @@ -105,7 +105,7 @@ if test x$exhaustive_tests = xtrue ; then AC_DEFINE(FLAC__EXHAUSTIVE_TESTS) fi -AM_PATH_OGG(have_ogg=yes, AC_MSG_WARN([*** Ogg development enviroment not installed - Ogg support will not be built])) +XIPH_PATH_OGG(have_ogg=yes, AC_MSG_WARN([*** Ogg development enviroment not installed - Ogg support will not be built])) AM_CONDITIONAL(FLaC__HAS_OGG, [test x$have_ogg = xyes]) if test x$have_ogg = xyes ; then AC_DEFINE(FLAC__HAS_OGG) @@ -230,6 +230,9 @@ CFLAGS="$OUR_CFLAGS_HEAD $CFLAGS $OUR_CFLAGS_TAIL" CXXFLAGS="$OUR_CFLAGS_HEAD $CXXFLAGS $OUR_CFLAGS_TAIL" AC_OUTPUT( \ + po/Makefile.in \ + m4/Makefile \ + intl/Makefile \ Makefile \ src/Makefile \ src/libFLAC/Makefile \ -- 2.7.4