1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
|
Index: configure.ac
===================================================================
RCS file: /sources/libcdio/libcdio/configure.ac,v
retrieving revision 1.192
diff -u -B -r1.192 configure.ac
--- configure.ac 25 Mar 2006 00:22:47 -0000 1.192
+++ configure.ac 30 Mar 2006 10:43:25 -0000
@@ -79,16 +79,17 @@
[ --without-versioned-libs build versioned library symbols (default enabled if you have GNU ld)],
enable_versioned_libs="${withval}", enable_versioned_libs=yes)
-AC_ARG_ENABLE(cpp_progs,
- [ --enable-cpp-progs make C++ example programs (default enabled)],
- enable_cpp_progs=no,
- enable_cpp_progs=yes)
+AC_ARG_ENABLE([cxx],
+ AC_HELP_STRING([--disable-cxx], [Disable C++ bindings (default enabled)]))
+AM_CONDITIONAL([ENABLE_CXX_BINDINGS], [test "x$enable_cxx" != "xno"])
+AC_ARG_ENABLE(cpp_progs,
+ [ --enable-cpp-progs make C++ example programs (default enabled)])
AM_CONDITIONAL(ENABLE_CPP, test x"$enable_cpp_progs" = "xyes")
dnl We use C
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
dnl Checks for programs.
Index: include/Makefile.am
===================================================================
RCS file: /sources/libcdio/libcdio/include/Makefile.am,v
retrieving revision 1.2
diff -u -B -r1.2 Makefile.am
--- include/Makefile.am 10 Nov 2005 11:11:16 -0000 1.2
+++ include/Makefile.am 30 Mar 2006 10:43:25 -0000
@@ -1,2 +1,5 @@
+if ENABLE_CXX_BINDINGS
+cxxdirs = cdio++
+endif
-SUBDIRS = cdio cdio++
+SUBDIRS = cdio $(cxxdirs)
Index: lib/Makefile.am
===================================================================
RCS file: /sources/libcdio/libcdio/lib/Makefile.am,v
retrieving revision 1.68
diff -u -B -r1.68 Makefile.am
--- lib/Makefile.am 10 Nov 2005 11:11:15 -0000 1.68
+++ lib/Makefile.am 30 Mar 2006 10:43:25 -0000
@@ -21,7 +21,11 @@
########################################################
if BUILD_CD_PARANOIA
-SUBDIRS = cdio++ driver iso9660 cdda_interface paranoia udf
-else
-SUBDIRS = cdio++ driver iso9660 udf
+paranoiadirs = cdda_interface paranoia
endif
+
+if ENABLE_CXX_BINDINGS
+cxxdirs = cdio++
+endif
+
+SUBDIRS = driver iso9660 udf $(paranoiadirs) $(cxxdirs)
|
GitWeb
