[xiph-cvs] cvs commit: /ao/src/plugins/sun Makefile.am
Stan Seibert
volsung at xiph.org
Thu Nov 28 19:34:44 PST 2002
volsung 02/11/28 22:34:44
Modified: ao configure.in
ao/src/plugins/alsa Makefile.am
ao/src/plugins/alsa09 Makefile.am
ao/src/plugins/arts Makefile.am
ao/src/plugins/esd Makefile.am
ao/src/plugins/irix Makefile.am
ao/src/plugins/macosx Makefile.am
ao/src/plugins/oss Makefile.am
ao/src/plugins/sun Makefile.am
Log:
Incorporate patches from fink to enable libao to work properly on OS X.
It still requires dlcompat, but now plugins have their own LDFLAGS variable
which is platform dependent. Also disabled aRts by default on OS X because
it just hangs mysteriously. macosx native plugin builds and installs but
libao can't seem to load it. Not sure why yet. ESD output works with
fink, however.
Revision Changes Path
1.41 +27 -7 /ao/configure.in
Index: configure.in
===================================================================
RCS file: /usr/local/cvsroot//ao/configure.in,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- configure.in 19 Jul 2002 06:40:30 -0000 1.40
+++ configure.in 29 Nov 2002 03:34:43 -0000 1.41
@@ -41,14 +41,17 @@
if test -z "$CC"; then
CC=cc
fi
+ PLUGIN_LDFLAGS="-export-dynamic -avoid-version"
DEBUG="-g -signed"
CFLAGS="-O2 -w -signed"
PROFILE="-p -g3 -O2 -signed" ;;
sparc-sun-solaris*)
+ PLUGIN_LDFLAGS="-export-dynamic -avoid-version"
DEBUG="-v -g"
CFLAGS="-xO4 -fast -w -fsimple -native -xcg92"
PROFILE="-v -xpg -g -xO4 -fast -native -fsimple -xcg92 -Dsuncc" ;;
*)
+ PLUGIN_LDFLAGS="-export-dynamic -avoid-version"
DEBUG="-g"
CFLAGS="-O"
PROFILE="-g -p" ;;
@@ -57,19 +60,23 @@
case $host in
*-*-linux*)
+ PLUGIN_LDFLAGS="-export-dynamic -avoid-version"
DEBUG="-g -Wall -D_REENTRANT -D__NO_MATH_INLINES -fsigned-char"
CFLAGS="-O20 -ffast-math -D_REENTRANT -fsigned-char"
PROFILE="-pg -g -O20 -ffast-math -D_REENTRANT -fsigned-char";;
sparc-sun-*)
+ PLUGIN_LDFLAGS="-export-dynamic -avoid-version"
DEBUG="-g -Wall -D__NO_MATH_INLINES -fsigned-char -mv8"
CFLAGS="-O20 -ffast-math -D__NO_MATH_INLINES -fsigned-char -mv8"
PROFILE="-pg -g -O20 -D__NO_MATH_INLINES -fsigned-char -mv8" ;;
*-darwin*)
- SILLY_CARBON_PATH="-I/System/Library/Frameworks/Carbon.framework/Versions/A/Headers"
- DEBUG="-g -Wall -D__NO_MATH_INLINES -fsigned-char $SILLY_CARBON_PATH"
- CFLAGS="-O20 -D__NO_MATH_INLINES -fsigned-char $SILLY_CARBON_PATH"
- PROFILE="-O20 -g -pg -D__NO_MATH_INLINES -fsigned-char $SILLY_CARBON_PATH" ;;
+ LDFLAGS="-framework CoreAudio"
+ PLUGIN_LDFLAGS="-module -avoid-version"
+ DEBUG="-g -Wall -D__NO_MATH_INLINES -fsigned-char -Ddlsym=dlsym_auto_underscore"
+ CFLAGS="-D__NO_MATH_INLINES -fsigned-char -Ddlsym=dlsym_auto_underscore"
+ PROFILE="-g -pg -D__NO_MATH_INLINES -fsigned-char -Ddlsym=dlsym_auto_underscore" ;;
*)
+ PLUGIN_LDFLAGS="-export-dynamic -avoid-version"
DEBUG="-g -Wall -D__NO_MATH_INLINES -fsigned-char"
CFLAGS="-O20 -D__NO_MATH_INLINES -fsigned-char"
PROFILE="-O20 -g -pg -D__NO_MATH_INLINES -fsigned-char" ;;
@@ -218,11 +225,21 @@
dnl Check for aRts
AC_ARG_ENABLE(arts, [ --enable-arts include aRts output plugin ],
-[ BUILD_ARTS="$enableval" ],[ BUILD_ARTS="yes" ])
+[ BUILD_ARTS="$enableval" ],[ BUILD_ARTS="maybe" ])
+
+dnl aRts support is whacked on OS X, so don't build it by default
+if test "$BUILD_ARTS" = "maybe"; then
+ case $host in
+ *-darwin*)
+ BUILD_ARTS=no;;
+ *)
+ BUILD_ARTS=yes;;
+ esac
+fi
+
if test "$BUILD_ARTS" = "yes"; then
AC_PATH_PROG(ARTSC_CONFIG, artsc-config)
- AM_CONDITIONAL(HAVE_ARTS,test "x$ac_cv_path_ARTSC_CONFIG" != x)
if test "x$ac_cv_path_ARTSC_CONFIG" != x
then
@@ -230,6 +247,7 @@
ARTS_LIBS=`$ac_cv_path_ARTSC_CONFIG --libs`
fi
fi
+AM_CONDITIONAL(HAVE_ARTS,test "x$ac_cv_path_ARTSC_CONFIG" != x)
AC_SUBST(ARTS_CFLAGS)
AC_SUBST(ARTS_LIBS)
@@ -258,5 +276,7 @@
dnl Orphaned driver. We'll probably dump it soon.
AM_CONDITIONAL(HAVE_SOLARIS,test "x$have_solaris" = xyes)
-AC_OUTPUT(Makefile src/Makefile doc/Makefile include/Makefile include/ao/Makefile include/ao/os_types.h src/plugins/Makefile src/plugins/esd/Makefile src/plugins/oss/Makefile src/plugins/alsa/Makefile src/plugins/alsa09/Makefile src/plugins/sun/Makefile src/plugins/irix/Makefile src/plugins/arts/Makefile src/plugins/macosx/Makefile debian/Makefile)
+dnl Plugins get special LDFLAGS
+AC_SUBST(PLUGIN_LDFLAGS)
+AC_OUTPUT(Makefile src/Makefile doc/Makefile include/Makefile include/ao/Makefile include/ao/os_types.h src/plugins/Makefile src/plugins/esd/Makefile src/plugins/oss/Makefile src/plugins/alsa/Makefile src/plugins/alsa09/Makefile src/plugins/sun/Makefile src/plugins/irix/Makefile src/plugins/arts/Makefile src/plugins/macosx/Makefile debian/Makefile)
<p><p>1.4 +1 -3 /ao/src/plugins/alsa/Makefile.am
Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot//ao/src/plugins/alsa/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Makefile.am 21 Nov 2001 04:53:12 -0000 1.3
+++ Makefile.am 29 Nov 2002 03:34:43 -0000 1.4
@@ -5,13 +5,11 @@
if HAVE_ALSA
alsaltlibs = libalsa.la
-alsaldflags = -export-dynamic -avoid-version
alsasources = ao_alsa.c
else
alsaltlibs =
-alsaldflags =
alsasources =
endif
@@ -21,7 +19,7 @@
libdir = $(plugindir)
lib_LTLIBRARIES = $(alsaltlibs)
-libalsa_la_LDFLAGS = $(alsaldflags)
+libalsa_la_LDFLAGS = @PLUGIN_LDFLAGS@
libalsa_la_LIBADD = @ALSA_LIBS@
libalsa_la_SOURCES = $(alsasources)
<p><p>1.3 +1 -3 /ao/src/plugins/alsa09/Makefile.am
Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot//ao/src/plugins/alsa09/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile.am 21 Nov 2001 04:53:12 -0000 1.2
+++ Makefile.am 29 Nov 2002 03:34:43 -0000 1.3
@@ -5,13 +5,11 @@
if HAVE_ALSA09
alsa09ltlibs = libalsa09.la
-alsa09ldflags = -export-dynamic -avoid-version
alsa09sources = ao_alsa09.c
else
alsa09ltlibs =
-alsa09ldflags =
alsa09sources =
endif
@@ -21,7 +19,7 @@
libdir = $(plugindir)
lib_LTLIBRARIES = $(alsa09ltlibs)
-libalsa09_la_LDFLAGS = $(alsa09ldflags)
+libalsa09_la_LDFLAGS = @PLUGIN_LDFLAGS@
libalsa09_la_LIBADD = @ALSA09_LIBS@
libalsa09_la_SOURCES = $(alsa09sources)
<p><p>1.4 +1 -3 /ao/src/plugins/arts/Makefile.am
Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot//ao/src/plugins/arts/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Makefile.am 21 Nov 2001 04:53:13 -0000 1.3
+++ Makefile.am 29 Nov 2002 03:34:44 -0000 1.4
@@ -5,13 +5,11 @@
if HAVE_ARTS
artsltlibs = libarts.la
-artsldflags = -export-dynamic -avoid-version
artssources = ao_arts.c
else
artsltlibs =
-artsldflags =
artssources =
endif
@@ -21,7 +19,7 @@
libdir = $(plugindir)
lib_LTLIBRARIES = $(artsltlibs)
-libarts_la_LDFLAGS = $(artsldflags)
+libarts_la_LDFLAGS = @PLUGIN_LDFLAGS@
libarts_la_LIBADD = @ARTS_LIBS@
libarts_la_SOURCES = $(artssources)
<p><p>1.3 +1 -3 /ao/src/plugins/esd/Makefile.am
Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot//ao/src/plugins/esd/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile.am 21 Nov 2001 04:53:13 -0000 1.2
+++ Makefile.am 29 Nov 2002 03:34:44 -0000 1.3
@@ -5,13 +5,11 @@
if HAVE_ESD
esdltlibs = libesd.la
-esdldflags = -export-dynamic -avoid-version
esdsources = ao_esd.c
else
esdltlibs =
-esdldflags =
esdsources =
endif
@@ -21,7 +19,7 @@
libdir = $(plugindir)
lib_LTLIBRARIES = $(esdltlibs)
-libesd_la_LDFLAGS = $(esdldflags)
+libesd_la_LDFLAGS = @PLUGIN_LDFLAGS@
libesd_la_LIBADD = @ESD_LIBS@
libesd_la_SOURCES = $(esdsources)
<p><p>1.4 +1 -3 /ao/src/plugins/irix/Makefile.am
Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot//ao/src/plugins/irix/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Makefile.am 21 Nov 2001 04:53:13 -0000 1.3
+++ Makefile.am 29 Nov 2002 03:34:44 -0000 1.4
@@ -5,13 +5,11 @@
if HAVE_IRIX
irixltlibs = libirix.la
-irixldflags = -export-dynamic -avoid-version
irixsources = ao_irix.c
else
irixltlibs =
-irixldflags =
irixsources =
endif
@@ -21,7 +19,7 @@
libdir = $(plugindir)
lib_LTLIBRARIES = $(irixltlibs)
-libirix_la_LDFLAGS = $(irixldflags)
+libirix_la_LDFLAGS = @PLUGIN_LDFLAGS@
libirix_la_SOURCES = $(irixsources)
EXTRA_DIST = ao_irix.c
<p><p>1.4 +1 -3 /ao/src/plugins/macosx/Makefile.am
Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot//ao/src/plugins/macosx/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Makefile.am 21 Nov 2001 04:53:14 -0000 1.3
+++ Makefile.am 29 Nov 2002 03:34:44 -0000 1.4
@@ -5,13 +5,11 @@
if HAVE_MACOSX
macosxltlibs = libmacosx.la
-macosxldflags = -export-dynamic -avoid-version
macosxsources = ao_macosx.c
else
macosxltlibs =
-macosxldflags =
macosxsources =
endif
@@ -21,7 +19,7 @@
libdir = $(plugindir)
lib_LTLIBRARIES = $(macosxltlibs)
-libmacosx_la_LDFLAGS = $(macosxldflags)
+libmacosx_la_LDFLAGS = @PLUGIN_LDFLAGS@
libmacosx_la_SOURCES = $(macosxsources)
EXTRA_DIST = ao_macosx.c
<p><p>1.3 +1 -3 /ao/src/plugins/oss/Makefile.am
Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot//ao/src/plugins/oss/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile.am 21 Nov 2001 04:53:14 -0000 1.2
+++ Makefile.am 29 Nov 2002 03:34:44 -0000 1.3
@@ -5,13 +5,11 @@
if HAVE_OSS
ossltlibs = liboss.la
-ossldflags = -export-dynamic -avoid-version
osssources = ao_oss.c
else
ossltlibs =
-ossldflags =
osssources =
endif
@@ -21,7 +19,7 @@
libdir = $(plugindir)
lib_LTLIBRARIES = $(ossltlibs)
-liboss_la_LDFLAGS = $(ossldflags)
+liboss_la_LDFLAGS = @PLUGIN_LDFLAGS@
liboss_la_SOURCES = $(osssources)
EXTRA_DIST = ao_oss.c
<p><p>1.3 +1 -3 /ao/src/plugins/sun/Makefile.am
Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot//ao/src/plugins/sun/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile.am 21 Nov 2001 04:53:14 -0000 1.2
+++ Makefile.am 29 Nov 2002 03:34:44 -0000 1.3
@@ -5,13 +5,11 @@
if HAVE_SUN_AUDIO
sunltlibs = libsun.la
-sunldflags = -export-dynamic -avoid-version
sunsources = ao_sun.c
else
sunltlibs =
-sunldflags =
sunsources =
endif
@@ -21,7 +19,7 @@
libdir = $(plugindir)
lib_LTLIBRARIES = $(sunltlibs)
-libsun_la_LDFLAGS = $(sunldflags)
+libsun_la_LDFLAGS = @PLUGIN_LDFLAGS@
libsun_la_SOURCES = $(sunsources)
EXTRA_DIST = ao_sun.c
<p><p>--- >8 ----
List archives: http://www.xiph.org/archives/
Ogg project homepage: http://www.xiph.org/ogg/
To unsubscribe from this list, send a message to 'cvs-request at xiph.org'
containing only the word 'unsubscribe' in the body. No subject is needed.
Unsubscribe messages sent to the list will be ignored/filtered.
More information about the commits
mailing list