diff --git a/Makefile.am b/Makefile.am index 47bcf2b6..51e137fe 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -# $Id: Makefile.am,v 1.42 2008/03/09 18:10:46 rocky Exp $ +# $Id: Makefile.am,v 1.43 2008/03/09 18:41:27 rocky Exp $ # # Copyright (C) 2003, 2004, 2006 Rocky Bernstein # @@ -20,7 +20,7 @@ ## which configure then turns into a Makefile ... ## which make can then use to produce stuff. Isn't configuration simple? -EXTRA_DIST = config.rpath codeset.m4 gettext.m4 glibc2.m4 glibc21.m4 iconv.m4 intdiv0.m4 intmax.m4 inttypes_h.m4 inttypes-h.m4 inttypes-pri.m4 lcmessage.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 lock.m4 longdouble.m4 longlong.m4 nls.m4 po.m4 printf-posix.m4 progtest.m4 signed.m4 size_max.m4 stdint_h.m4 uintmax_t.m4 ulonglong.m4 visibility.m4 wchar_t.m4 wint_t.m4 xsize.m4 \ +EXTRA_DIST = \ MSVC/README MSVC/cd-info.vcproj \ MSVC/config.h \ MSVC/libcdio.sln \ @@ -37,7 +37,7 @@ EXTRA_DIST = config.rpath codeset.m4 gettext.m4 glibc2.m4 glibc21.m4 iconv.m4 i package/libcdio.spec \ package/libcdio.spec.in -SUBDIRS = po doc include lib src test example +SUBDIRS = doc include lib src test example if BUILD_CD_PARANOIA paranoiapcs = libcdio_paranoia.pc libcdio_cdda.pc diff --git a/autogen.sh b/autogen.sh index 17729a45..08be03a5 100755 --- a/autogen.sh +++ b/autogen.sh @@ -38,7 +38,9 @@ grep "^AM_GNU_GETTEXT" $srcdir/configure.ac >/dev/null && { DIE=1 } } -gettextize +if ! test -f po/Makefile.in.in + gettextize +fi (automake --version) < /dev/null > /dev/null 2>&1 || { echo diff --git a/configure.ac b/configure.ac index b218c242..69a301d4 100644 --- a/configure.ac +++ b/configure.ac @@ -19,7 +19,7 @@ define(RELEASE_NUM, 80) define(CDIO_VERSION_STR, 0.$1) AC_PREREQ(2.52) -AC_REVISION([$Id: configure.ac,v 1.219 2008/01/01 03:14:17 flameeyes Exp $])dnl +AC_REVISION([$Id: configure.ac,v 1.220 2008/03/09 18:41:27 rocky Exp $])dnl AC_INIT(libcdio, CDIO_VERSION_STR(RELEASE_NUM)) AC_CONFIG_SRCDIR(src/cd-info.c) @@ -645,7 +645,8 @@ AC_CONFIG_COMMANDS([checks], dnl dnl Output configuration files dnl -AC_CONFIG_FILES([ \ +## AC_CONFIG_FILES([ po/Makefile.in\ +AC_CONFIG_FILES([ Makefile \ example/C++/Makefile \ example/C++/OO/Makefile \ @@ -685,6 +686,7 @@ AC_CONFIG_FILES([ \ test/Makefile \ ]) +# AC_CONFIG_FILES([po/Makefile]) AC_CONFIG_FILES([test/check_cue.sh], [chmod +x test/check_cue.sh]) AC_CONFIG_FILES([test/check_iso.sh], [chmod +x test/check_iso.sh]) AC_CONFIG_FILES([test/check_nrg.sh], [chmod +x test/check_nrg.sh])