claunia/libcdio-osx
Archived
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

OSX and BSD use -E for extended re's rather than GNU -r

Browse Source
This commit is contained in:
R. Bernstein
2012-04-28 21:06:50 -04:00
parent 16f2cc0b17
commit 07711418d0
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
configure.ac
View File

@@ -314,6 +314,7 @@ AC_SUBST(LIBCDIO_DEPS)
AC_SUBST(LIBISO9660_LIBS) AC_SUBST(LIBISO9660_LIBS)
AC_SUBST(LIBUDF_LIBS) AC_SUBST(LIBUDF_LIBS)
SED_EXTENDED_RE_FLAG='-r'
dnl Libtool flag for strict linkage dnl Libtool flag for strict linkage
LT_NO_UNDEFINED= LT_NO_UNDEFINED=
@@ -325,6 +326,7 @@ case $host_os in
## [Define 1 if you have AIX CD-ROM support]) ## [Define 1 if you have AIX CD-ROM support])
;; ;;
darwin[[6-9]].*|darwin1[[0-2]].*) darwin[[6-9]].*|darwin1[[0-2]].*)
SED_EXTENDED_RE_FLAG='-E'
AC_CHECK_HEADERS(IOKit/IOKitLib.h CoreFoundation/CFBase.h, AC_CHECK_HEADERS(IOKit/IOKitLib.h CoreFoundation/CFBase.h,
[have_iokit_h="yes"]) [have_iokit_h="yes"])
if test "x$have_iokit_h" = "xyes" ; then if test "x$have_iokit_h" = "xyes" ; then
@@ -414,12 +416,14 @@ int has_timeout=sizeof(test.timeout);],
enable_cdda_player="no" enable_cdda_player="no"
;; ;;
freebsd4.*|freebsd5.*|freebsd[[6-9]].*|dragonfly*|kfreebsd*) freebsd4.*|freebsd5.*|freebsd[[6-9]].*|dragonfly*|kfreebsd*)
SED_EXTENDED_RE_FLAG='-E'
AC_DEFINE([HAVE_FREEBSD_CDROM], [1], AC_DEFINE([HAVE_FREEBSD_CDROM], [1],
[Define 1 if you have FreeBSD CD-ROM support]) [Define 1 if you have FreeBSD CD-ROM support])
LIBS="$LIBS -lcam" LIBS="$LIBS -lcam"
cd_drivers="${cd_drivers}, FreeBSD " cd_drivers="${cd_drivers}, FreeBSD "
;; ;;
netbsd*) netbsd*)
SED_EXTENDED_RE_FLAG='-E'
AC_DEFINE([HAVE_NETBSD_CDROM], [1], AC_DEFINE([HAVE_NETBSD_CDROM], [1],
[Define 1 if you have NetBSD CD-ROM support]) [Define 1 if you have NetBSD CD-ROM support])
# LIBS="$LIBS -lcam" # LIBS="$LIBS -lcam"
@@ -438,6 +442,7 @@ int has_timeout=sizeof(test.timeout);],
;; ;;
esac esac
AC_SUBST(SED_EXTENDED_RE_FLAG)
AC_SUBST(LIBCDIO_CFLAGS) AC_SUBST(LIBCDIO_CFLAGS)
AC_SUBST(LIBISO9660_CFLAGS) AC_SUBST(LIBISO9660_CFLAGS)
AC_SUBST(LT_NO_UNDEFINED) AC_SUBST(LT_NO_UNDEFINED)

2
include/cdio/Makefile.am
View File

@@ -22,7 +22,7 @@
cdio_config.h: $(top_builddir)/config.h cdio_config.h: $(top_builddir)/config.h
@echo '#ifndef __CDIO_CONFIG_H__' > cdio_config.h @echo '#ifndef __CDIO_CONFIG_H__' > cdio_config.h
@echo '#define __CDIO_CONFIG_H__' >> cdio_config.h @echo '#define __CDIO_CONFIG_H__' >> cdio_config.h
@@SED@ -re 's/^(#[ \t]*define) /\1 CDIO_/' $(top_builddir)/config.h >>cdio_config.h @@SED@ @SED_EXTENDED_RE_FLAG@ -e 's/^(#[ \t]*define) /\1 CDIO_/' $(top_builddir)/config.h >>cdio_config.h
@echo '#endif /* #ifndef CDIO_CONFIG_H */' >>cdio_config.h @echo '#endif /* #ifndef CDIO_CONFIG_H */' >>cdio_config.h
libcdioincludedir=$(includedir)/cdio libcdioincludedir=$(includedir)/cdio