Add a --disable-cxx configure parameter so that the C++ bindings can be skipped.
This commit is contained in:
13
configure.ac
13
configure.ac
@@ -19,7 +19,7 @@ define(RELEASE_NUM, 77)
|
|||||||
define(CDIO_VERSION_STR, 0.$1)
|
define(CDIO_VERSION_STR, 0.$1)
|
||||||
|
|
||||||
AC_PREREQ(2.52)
|
AC_PREREQ(2.52)
|
||||||
AC_REVISION([$Id: configure.ac,v 1.192 2006/03/25 00:22:47 rocky Exp $])dnl
|
AC_REVISION([$Id: configure.ac,v 1.193 2006/03/30 10:47:51 flameeyes Exp $])dnl
|
||||||
AC_INIT(libcdio, CDIO_VERSION_STR(RELEASE_NUM))
|
AC_INIT(libcdio, CDIO_VERSION_STR(RELEASE_NUM))
|
||||||
AC_CONFIG_SRCDIR(src/cd-info.c)
|
AC_CONFIG_SRCDIR(src/cd-info.c)
|
||||||
|
|
||||||
@@ -79,16 +79,17 @@ AC_ARG_WITH(versioned_libs,
|
|||||||
[ --without-versioned-libs build versioned library symbols (default enabled if you have GNU ld)],
|
[ --without-versioned-libs build versioned library symbols (default enabled if you have GNU ld)],
|
||||||
enable_versioned_libs="${withval}", enable_versioned_libs=yes)
|
enable_versioned_libs="${withval}", enable_versioned_libs=yes)
|
||||||
|
|
||||||
AC_ARG_ENABLE(cpp_progs,
|
AC_ARG_ENABLE([cxx],
|
||||||
[ --enable-cpp-progs make C++ example programs (default enabled)],
|
AC_HELP_STRING([--disable-cxx], [Disable C++ bindings (default enabled)]))
|
||||||
enable_cpp_progs=no,
|
AM_CONDITIONAL([ENABLE_CXX_BINDINGS], [test "x$enable_cxx" != "xno"])
|
||||||
enable_cpp_progs=yes)
|
|
||||||
|
|
||||||
|
AC_ARG_ENABLE(cpp_progs,
|
||||||
|
[ --enable-cpp-progs make C++ example programs (default enabled)])
|
||||||
AM_CONDITIONAL(ENABLE_CPP, test x"$enable_cpp_progs" = "xyes")
|
AM_CONDITIONAL(ENABLE_CPP, test x"$enable_cpp_progs" = "xyes")
|
||||||
|
|
||||||
dnl We use C
|
dnl We use C
|
||||||
AC_PROG_CC
|
AC_PROG_CC
|
||||||
dnl We also use C++ in example programs
|
dnl We also use C++ in example programs and for CXX bindings
|
||||||
AC_PROG_CXX
|
AC_PROG_CXX
|
||||||
|
|
||||||
dnl Checks for programs.
|
dnl Checks for programs.
|
||||||
|
|||||||
@@ -1,2 +1,5 @@
|
|||||||
|
if ENABLE_CXX_BINDINGS
|
||||||
|
cxxdirs = cdio++
|
||||||
|
endif
|
||||||
|
|
||||||
SUBDIRS = cdio cdio++
|
SUBDIRS = cdio $(cxxdirs)
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
# $Id: Makefile.am,v 1.68 2005/11/10 11:11:15 rocky Exp $
|
# $Id: Makefile.am,v 1.69 2006/03/30 10:47:51 flameeyes Exp $
|
||||||
#
|
#
|
||||||
# Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com>
|
# Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com>
|
||||||
#
|
#
|
||||||
@@ -21,7 +21,11 @@
|
|||||||
########################################################
|
########################################################
|
||||||
|
|
||||||
if BUILD_CD_PARANOIA
|
if BUILD_CD_PARANOIA
|
||||||
SUBDIRS = cdio++ driver iso9660 cdda_interface paranoia udf
|
paranoiadirs = cdda_interface paranoia
|
||||||
else
|
|
||||||
SUBDIRS = cdio++ driver iso9660 udf
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
if ENABLE_CXX_BINDINGS
|
||||||
|
cxxdirs = cdio++
|
||||||
|
endif
|
||||||
|
|
||||||
|
SUBDIRS = driver iso9660 udf $(paranoiadirs) $(cxxdirs)
|
||||||
|
|||||||
Reference in New Issue
Block a user