From d47767021f8e357e3d8df446d3942f347c634ae6 Mon Sep 17 00:00:00 2001 From: Thomas Schmitt Date: Thu, 21 Sep 2006 07:50:02 +0000 Subject: [PATCH] Forwarded changes from 0.2.2 to 0.2.3 --- Makefile.am | 21 +++------------------ configure.ac | 26 -------------------------- 2 files changed, 3 insertions(+), 44 deletions(-) diff --git a/Makefile.am b/Makefile.am index da60740..ee2447e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -90,11 +90,8 @@ libinclude_HEADERS = \ ## Build test applications noinst_PROGRAMS = \ test/libburner \ - test/burn \ test/iso \ - test/master \ test/poll \ - test/rip \ test/toc \ test/structest @@ -110,15 +107,6 @@ test_poll_SOURCES = test/poll.c test_toc_CPPFLAGS = -Ilibburn test_toc_LDADD = $(libburn_libburn_la_OBJECTS) $(THREAD_LIBS) test_toc_SOURCES = test/toc.c -test_rip_CPPFLAGS = -Ilibburn -test_rip_LDADD = $(libburn_libburn_la_OBJECTS) $(THREAD_LIBS) -test_rip_SOURCES = test/rip.c -test_burn_CPPFLAGS = -Ilibburn -test_burn_LDADD = $(libburn_libburn_la_OBJECTS) $(THREAD_LIBS) -test_burn_SOURCES = test/burn.c -test_master_CPPFLAGS = -Ilibburn -test_master_LDADD = $(libburn_libburn_la_OBJECTS) $(THREAD_LIBS) -test_master_SOURCES = test/master.c test_structest_CPPFLAGS = -Ilibburn test_structest_LDADD = $(libburn_libburn_la_OBJECTS) $(THREAD_LIBS) test_structest_SOURCES = test/structest.c @@ -173,15 +161,11 @@ indent_files = \ $(libisofs_libisofs_la_SOURCES) \ $(libburn_libburn_la_SOURCES) \ $(test_libburner_SOURCES) \ - $(test_devices_SOURCES) \ $(test_poll_SOURCES) \ $(test_toc_SOURCES) \ - $(test_rip_SOURCES) \ - $(test_burn_SOURCES) \ - $(test_burniso_SOURCES) \ - $(test_master_SOURCES) \ $(test_structest_SOURCES) \ - $(test_blank_SOURCES) + $(test_iso_SOURCES) + indent: $(indent_files) indent -bad -bap -nbbb -nbbo -nbc -bli0 -br -bls \ @@ -207,6 +191,7 @@ EXTRA_DIST = \ doc/doxygen.conf.in \ README \ AUTHORS \ + CONTRIBUTORS \ COPYRIGHT \ cdrskin/README \ cdrskin/cdrecord_spy.sh \ diff --git a/configure.ac b/configure.ac index d4289dd..a164b9c 100644 --- a/configure.ac +++ b/configure.ac @@ -61,15 +61,6 @@ if test ! $ac_cv_func_fseeko; then AC_ERROR([Libburn requires largefile support.]) fi -AC_ARG_ENABLE(static, enable_static=yes) -if test x$enable_static != xyes; then - AC_MSG_RESULT([no]) - AM_DISABLE_STATIC=no -else - AC_MSG_RESULT([yes]) - AM_DISABLE_STATIC=yes -fi - AC_PROG_LIBTOOL AC_SUBST(LIBTOOL_DEPS) LIBTOOL="$LIBTOOL --silent" @@ -102,23 +93,6 @@ else CFLAGS="$CFLAGS -DDEBUG" fi -AC_MSG_CHECKING([if we build the HTML documentation]) -AC_ARG_ENABLE(docs, -[ --enable-docs Use doxygen to build HTML documentation], -[case "${enableval}" in - yes) build_docs=true ;; - no) build_docs=false ;; - *) AC_MSG_ERROR(bad value ${enableval} for --enable-docs) ;; -esac],[build_docs=false]) - -if test "x$build_docs" = "xtrue"; then - AC_MSG_RESULT([yes]) - touch doc/doc.lock -else - AC_MSG_RESULT([no (use --enable-docs to enable)]) - rm -f doc/doc.lock -fi - AC_CONFIG_FILES([ Makefile doc/doxygen.conf