configure.ac: test for intl and iconv needed for Joliet support
iso-info.c: add --no-joliet option Doxyfile*, configure.ac: Automatically update some ofthe Doxyfile information
This commit is contained in:
rocky
@@ -1,4 +1,4 @@
|
||||
# $Id: Makefile.am,v 1.20 2004/02/29 15:42:30 rocky Exp $
|
||||
# $Id: Makefile.am,v 1.21 2004/10/24 11:20:30 rocky Exp $
|
||||
#
|
||||
# Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com>
|
||||
#
|
||||
@@ -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 = libpopt.m4 THANKS README.libcdio libcdio.spec.in libcdio.spec \
|
||||
EXTRA_DIST = config.rpath codeset.m4 gettext.m4 glibc21.m4 iconv.m4 intdiv0.m4 inttypes.m4 inttypes_h.m4 inttypes-pri.m4 isc-posix.m4 lcmessage.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 progtest.m4 stdint_h.m4 uintmax_t.m4 ulonglong.m4 libpopt.m4 THANKS README.libcdio libcdio.spec.in libcdio.spec \
|
||||
example/README
|
||||
|
||||
SUBDIRS = doc include lib src test example
|
||||
|
||||
30
configure.ac
30
configure.ac
@@ -19,7 +19,7 @@ define(RELEASE_NUM, 71)
|
||||
define(CDIO_VERSION_STR, 0.$1cvs)
|
||||
|
||||
AC_PREREQ(2.52)
|
||||
AC_REVISION([$Id: configure.ac,v 1.95 2004/10/23 20:55:08 rocky Exp $])dnl
|
||||
AC_REVISION([$Id: configure.ac,v 1.96 2004/10/24 11:20:30 rocky Exp $])dnl
|
||||
AC_INIT(libcdio, CDIO_VERSION_STR(RELEASE_NUM))
|
||||
AC_CONFIG_SRCDIR(src/cd-info.c)
|
||||
AM_INIT_AUTOMAKE
|
||||
@@ -48,11 +48,6 @@ AC_ARG_WITH(versioned_libs,
|
||||
[ --without-versioned-libs build versioned library symbols (enabled by default if you have GNU ld)],
|
||||
enable_versioned_libs="${withval}", enable_versioned_libs=yes)
|
||||
|
||||
AC_ARG_WITH([iconv],
|
||||
AC_HELP_STRING([--without-iconv],
|
||||
[do not include character set conversion support using ]
|
||||
[the iconv library (default = enabled if found)]))
|
||||
|
||||
dnl Checks for programs.
|
||||
AC_PROG_CC
|
||||
|
||||
@@ -83,14 +78,6 @@ else
|
||||
unset warning_flags
|
||||
fi
|
||||
|
||||
dnl Check for iconv
|
||||
if test x$with_iconv != xno; then
|
||||
AC_CHECK_HEADERS([iconv.h], [with_iconv=1], [with_iconv=0])
|
||||
else
|
||||
with_iconv=0
|
||||
fi
|
||||
AC_SUBST(with_iconv)
|
||||
|
||||
# We use Perl for documentation and regression tests
|
||||
AC_PATH_PROG(PERL, perl, no)
|
||||
AC_SUBST(PERL)
|
||||
@@ -232,10 +219,7 @@ AM_CONDITIONAL(BUILD_VERSIONED_LIBS, test "x$enable_versioned_libs" = "xyes")
|
||||
dnl Checks for header files.
|
||||
AC_STDC_HEADERS
|
||||
|
||||
AC_HAVE_HEADERS( errno.h fcntl.h \
|
||||
stdbool.h stdlib.h stdio.h \
|
||||
strings.h linux/version.h sys/cdio.h sys/stat.h \
|
||||
sys/types.h )
|
||||
AC_HAVE_HEADERS( errno.h fcntl.h stdio.h linux/version.h )
|
||||
|
||||
LIBCDIO_CFLAGS='-I$(top_srcdir)/lib/ -I$(top_srcdir)/include/'
|
||||
LIBCDIO_LIBS='$(top_builddir)/lib/libcdio.la'
|
||||
@@ -322,6 +306,13 @@ AC_SUBST(HAVE_LINUX_CDROM)
|
||||
AC_SUBST(HAVE_SOLARIS_CDROM)
|
||||
AC_SUBST(HAVE_WIN32_CDROM)
|
||||
|
||||
AM_GNU_GETTEXT([external])
|
||||
|
||||
LIBCDIO_SOURCE_PATH="`pwd`"
|
||||
AC_DEFINE_UNQUOTED(LICDIO_SOURCE_PATH, "$LIBCDIO_SOURCE_PATH",
|
||||
[Full path to libcdio top_sourcedir.])
|
||||
AC_SUBST(LIBCDIO_SOURCE_PATH)
|
||||
|
||||
AC_CHECK_FUNCS( memset bzero memcpy )
|
||||
|
||||
AC_CHECK_MEMBER([struct tm.tm_gmtoff],
|
||||
@@ -373,7 +364,7 @@ AC_CONFIG_COMMANDS([checks],
|
||||
[chmod +x test/check_cue.sh; chmod +x test/check_nrg.sh
|
||||
])
|
||||
|
||||
AC_CONFIG_FILES([ \
|
||||
AC_CONFIG_FILES([ po/Makefile.in \
|
||||
Makefile \
|
||||
libcdio.pc \
|
||||
libcdio.spec \
|
||||
@@ -382,6 +373,7 @@ AC_CONFIG_FILES([ \
|
||||
include/Makefile \
|
||||
include/cdio/Makefile \
|
||||
include/cdio/version.h \
|
||||
doc/doxygen/Doxyfile \
|
||||
doc/Makefile \
|
||||
lib/Makefile \
|
||||
src/Makefile \
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# $Id: Makefile.am,v 1.6 2004/02/21 15:42:14 rocky Exp $
|
||||
# $Id: Makefile.am,v 1.7 2004/10/24 11:20:30 rocky Exp $
|
||||
#
|
||||
# Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com>
|
||||
#
|
||||
@@ -16,7 +16,7 @@
|
||||
# along with this program; if not, write to the Free Software
|
||||
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
#
|
||||
EXTRA_DIST = doxygen/Doxyfile doxygen/run_doxygen
|
||||
EXTRA_DIST = doxygen/Doxyfile.in doxygen/run_doxygen
|
||||
info_TEXINFOS = libcdio.texi
|
||||
libcdio_TEXINFOS = fdl.texi gpl.texi glossary.texi
|
||||
|
||||
|
||||
@@ -17,13 +17,13 @@
|
||||
# The PROJECT_NAME tag is a single word (or a sequence of words surrounded
|
||||
# by quotes) that should identify the project.
|
||||
|
||||
PROJECT_NAME = libcdio
|
||||
PROJECT_NAME = @PACKAGE@
|
||||
|
||||
# The PROJECT_NUMBER tag can be used to enter a project or revision number.
|
||||
# This could be handy for archiving the generated documentation or
|
||||
# if some version control system is used.
|
||||
|
||||
PROJECT_NUMBER =
|
||||
PROJECT_NUMBER = @VERSION@
|
||||
|
||||
# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
|
||||
# base path where the generated documentation will be put.
|
||||
@@ -104,7 +104,7 @@ FULL_PATH_NAMES = NO
|
||||
# If left blank the directory from which doxygen is run is used as the
|
||||
# path to strip.
|
||||
|
||||
STRIP_FROM_PATH =
|
||||
STRIP_FROM_PATH = @LIBCDIO_SOURCE_PATH@
|
||||
|
||||
# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter
|
||||
# (but less readable) file names. This can be useful is your file systems
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
$Id: iso-info.c,v 1.13 2004/10/23 20:55:09 rocky Exp $
|
||||
$Id: iso-info.c,v 1.14 2004/10/24 11:20:30 rocky Exp $
|
||||
|
||||
Copyright (C) 2004 Rocky Bernstein <rocky@panix.com>
|
||||
|
||||
@@ -65,6 +65,7 @@ struct arguments
|
||||
int version_only;
|
||||
int silent;
|
||||
int no_header;
|
||||
int no_joliet;
|
||||
int print_iso9660;
|
||||
} opts;
|
||||
|
||||
@@ -95,6 +96,9 @@ parse_options (int argc, const char *argv[])
|
||||
{"no-header", '\0', POPT_ARG_NONE, &opts.no_header,
|
||||
0, "Don't display header and copyright (for regression testing)"},
|
||||
|
||||
{"no-joliet", '\0', POPT_ARG_NONE, &opts.no_joliet,
|
||||
0, "Don't use Joliet extensions"},
|
||||
|
||||
{"quiet", 'q', POPT_ARG_NONE, &opts.silent, 0,
|
||||
"Don't produce warning output" },
|
||||
|
||||
@@ -246,6 +250,7 @@ init(void)
|
||||
/* Default option values. */
|
||||
opts.silent = false;
|
||||
opts.no_header = false;
|
||||
opts.no_joliet = false;
|
||||
opts.debug_level = 0;
|
||||
opts.print_iso9660 = 0;
|
||||
}
|
||||
@@ -264,6 +269,7 @@ main(int argc, const char *argv[])
|
||||
{
|
||||
|
||||
iso9660_t *p_iso=NULL;
|
||||
iso_extension_mask_t iso_extension_mask = ISO_EXTENSION_ALL;
|
||||
|
||||
init();
|
||||
|
||||
@@ -283,7 +289,11 @@ main(int argc, const char *argv[])
|
||||
err_exit("No input device given/found\n");
|
||||
}
|
||||
|
||||
p_iso = iso9660_open_ext (source_name, ISO_EXTENSION_ALL);
|
||||
if (opts.no_joliet) {
|
||||
iso_extension_mask &= ~ISO_EXTENSION_JOLIET;
|
||||
}
|
||||
|
||||
p_iso = iso9660_open_ext (source_name, iso_extension_mask);
|
||||
|
||||
if (p_iso==NULL) {
|
||||
free(source_name);
|
||||
|
||||
Reference in New Issue
Block a user