Commit fd8c3e84 authored by Sam Hocevar's avatar Sam Hocevar

* ./configure.ac, ./bootstrap: used libdvbpsi's bootstrap, moved config.h

    to ., renamed configure.in into configure.ac, removed useless files that
    are autogenerated.
  * ./src/Makefile.am: instead of using -no-undefined "only under BeOS" we
    use it "never with MSVC".
parent f91c54a9
......@@ -8,11 +8,16 @@ config.cache
config.status
config.guess
config.sub
config.h
config.h.in
Makefile
Makefile.in
build-stamp
stamp-h*
aclocal.m4
autom4te.cache
compile
depcomp
install-sh
libtool
ltmain.sh
......
SUBDIRS = src test debian doc
EXTRA_DIST = libdvdcss.spec
SUBDIRS = src test
DIST_SUBDIRS = $(SUBDIRS) debian doc
EXTRA_DIST = libdvdcss.spec bootstrap
AUTOMAKE_OPTIONS = foreign dist-bzip2 subdir-objects
doc-dummy:
......
#! /bin/sh
set -x
aclocal || exit 1
rm -f aclocal.m4 configure config.guess config.log config.sub ltmain.sh libtool ltconfig missing mkinstalldirs depcomp install-sh
# Check for automake
amvers="none"
if automake-1.6 --version >/dev/null 2>&1
then
amvers="-1.6"
else
if automake-1.5 --version >/dev/null 2>&1
then
amvers="-1.5"
else
if automake --version > /dev/null 2>&1
then
amvers=`automake --version | sed -e '1s/[^0-9]*//' -e q`
if expr "$amvers" "<" "1.5" > /dev/null 2>&1
then amvers="none"
else amvers=""
fi
fi
fi
fi
if test x$amvers = xnone
then
set +x
echo "you need automake version 1.5 or later"
exit 1
fi
aclocal${amvers} || exit 1
libtoolize --force --copy || exit 1
autoheader || exit 1
#add --include-deps if you want to bootstrap with any other compiler than gcc
#automake --add-missing --copy --include-deps || exit 1
automake --add-missing --copy || exit 1
#automake${amvers} --add-missing --copy --include-deps || exit 1
automake${amvers} --add-missing --copy || exit 1
autoconf || exit 1
rm -f config.cache
......@@ -3,11 +3,12 @@ AC_INIT(src/libdvdcss.c)
AC_CANONICAL_SYSTEM
AM_INIT_AUTOMAKE(libdvdcss, 1.2.3)
AM_CONFIG_HEADER(src/config.h)
AM_CONFIG_HEADER(config.h)
AC_PROG_CC
AC_STDC_HEADERS
AC_LIBTOOL_WIN32_DLL
AM_PROG_LIBTOOL
AC_C_CONST
......@@ -25,7 +26,9 @@ case x"${target_os}" in
;;
xbeos*)
AC_DEFINE(SYS_BEOS, 1, Have a BeOS system.)
SYS_BEOS=1
;;
x*msvc*)
SYS_MSVC=1
;;
x*)
;;
......@@ -137,7 +140,7 @@ AC_CHECK_HEADERS(sys/ioctl.h,[
CFLAGS="-D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -DDVDCSS_DIST $CFLAGS"
AM_CONDITIONAL(SYS_BSDI, test "x$SYS_BSDI" = "x1")
AM_CONDITIONAL(SYS_BEOS, test "x$SYS_BEOS" = "x1")
AM_CONDITIONAL(SYS_MSVC, test "x$SYS_MSVC" = "x1")
AC_OUTPUT([Makefile src/Makefile src/dvdcss/Makefile test/Makefile debian/Makefile doc/Makefile])
......@@ -3,5 +3,4 @@ Makefile
Makefile.in
*.lo
*.la
config.h
stamp-h*
......@@ -15,7 +15,7 @@ EXTRA_libdvdcss_la_SOURCES = \
$(bsdi_extras)
libdvdcss_la_LIBADD = $(bsdi_libadd)
libdvdcss_la_LDFLAGS = -version-info 2:2:0 $(beos_ldflags)
libdvdcss_la_LDFLAGS = -version-info 2:3:0 $(libtool_flags)
bsdi_extras = bsdi_ioctl.c bsdi_dvd.h
......@@ -24,7 +24,8 @@ bsdi_sources = $(bsdi_extras)
bsdi_libadd = -ldvd
endif
if SYS_BEOS
beos_ldflags = -no-undefined
if SYS_MSVC
else
libtool_flags = -no-undefined
endif
/* src/config.h.in. Generated automatically from configure.in by autoheader. */
/* Have IOKit DVD IOCTL headers */
#undef DARWIN_DVD_IOCTL
/* Define if <extras/BSDI_dvdioctl/dvd.h> defines DVD_STRUCT. */
#undef DVD_STRUCT_IN_BSDI_DVDIOCTL_DVD_H
/* Define if <dvd.h> defines DVD_STRUCT. */
#undef DVD_STRUCT_IN_DVD_H
/* Define if <linux/cdrom.h> defines DVD_STRUCT. */
#undef DVD_STRUCT_IN_LINUX_CDROM_H
/* Define if <sys/cdio.h> defines dvd_struct. */
#undef DVD_STRUCT_IN_SYS_CDIO_H
/* Define if <sys/dvdio.h> defines dvd_struct. */
#undef DVD_STRUCT_IN_SYS_DVDIO_H
/* Define if FreeBSD-like dvd_struct is defined. */
#undef HAVE_BSD_DVD_STRUCT
/* Define if you have the <dvd.h> header file. */
#undef HAVE_DVD_H
/* Define if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H
/* Define if you have the <linux/cdrom.h> header file. */
#undef HAVE_LINUX_CDROM_H
/* Define if Linux-like dvd_struct is defined. */
#undef HAVE_LINUX_DVD_STRUCT
/* Define if you have the <memory.h> header file. */
#undef HAVE_MEMORY_H
/* Define if OpenBSD-like dvd_struct is defined. */
#undef HAVE_OPENBSD_DVD_STRUCT
/* Define if you have the <stdint.h> header file. */
#undef HAVE_STDINT_H
/* Define if you have the <stdlib.h> header file. */
#undef HAVE_STDLIB_H
/* Define if you have the <strings.h> header file. */
#undef HAVE_STRINGS_H
/* Define if you have the <string.h> header file. */
#undef HAVE_STRING_H
/* Define if you have the <sys/cdio.h> header file. */
#undef HAVE_SYS_CDIO_H
/* Define if you have the <sys/dvdio.h> header file. */
#undef HAVE_SYS_DVDIO_H
/* Define if you have the <sys/ioctl.h> header file. */
#undef HAVE_SYS_IOCTL_H
/* Define if you have the <sys/stat.h> header file. */
#undef HAVE_SYS_STAT_H
/* Define if you have the <sys/types.h> header file. */
#undef HAVE_SYS_TYPES_H
/* Define if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H
/* Define if you have the <winioctl.h> header file. */
#undef HAVE_WINIOCTL_H
/* Define if you have the </sys/dev/scsi/scsi_ioctl.h> header file. */
#undef HAVE__SYS_DEV_SCSI_SCSI_IOCTL_H
/* Define if <sys/scsi.h> defines sctl_io. */
#undef HPUX_SCTL_IO
/* Name of package */
#undef PACKAGE
/* Have userspace SCSI headers. */
#undef SOLARIS_USCSI
/* Define if you have the ANSI C header files. */
#undef STDC_HEADERS
/* Have a BeOS system. */
#undef SYS_BEOS
/* Version number of package */
#undef VERSION
/* Define to empty if `const' does not conform to ANSI C. */
#undef const
/* Define as `__inline' if that's what the C compiler calls it, or to nothing
if it is not supported. */
#undef inline
/* Define to `unsigned' if <sys/types.h> does not define. */
#undef size_t
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