[xiph-cvs] cvs commit: ao Makefile.am ao.m4 configure.in libao.spec ao-config.in
Jack Moffitt
jack at xiph.org
Tue Nov 7 20:22:32 PST 2000
jack 00/11/07 20:22:31
Modified: . Makefile.am ao.m4 configure.in libao.spec
Removed: . ao-config.in
Log:
no more ao-config
Revision Changes Path
1.3 +0 -2 ao/Makefile.am
Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/ao/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile.am 2000/10/30 00:46:39 1.2
+++ Makefile.am 2000/11/08 04:22:31 1.3
@@ -4,8 +4,6 @@
SUBDIRS = src include doc
-bin_SCRIPTS = ao-config
-
m4datadir = $(datadir)/aclocal
m4data_DATA = ao.m4
1.2 +39 -59 ao/ao.m4
Index: ao.m4
===================================================================
RCS file: /usr/local/cvsroot/ao/ao.m4,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ao.m4 2000/10/30 00:46:39 1.1
+++ ao.m4 2000/11/08 04:22:31 1.2
@@ -2,47 +2,35 @@
# Jack Moffitt <jack at icecast.org> 10-21-2000
# Shamelessly stolen from Owen Taylor and Manish Singh
-dnl AM_PATH_AO([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
+dnl AM_PATH_AO([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
dnl Test for libao, and define AO_CFLAGS and AO_LIBS
dnl
AC_DEFUN(AM_PATH_AO,
[dnl
-dnl Get the cflags and libraries from the ao-config script
+dnl Get the cflags and libraries
dnl
AC_ARG_WITH(ao-prefix,[ --with-ao-prefix=PFX Prefix where libao is installed (optional)], ao_prefix="$withval", ao_prefix="")
AC_ARG_ENABLE(aotest, [ --disable-aotest Do not try to compile and run a test ao program],, enable_aotest=yes)
if test x$ao_prefix != x ; then
- ao_args="$ao_args --prefix=$ao_prefix"
- if test x${AO_CONFIG+set} != xset ; then
- AO_CONFIG=$ao_prefix/bin/ao-config
- fi
+ ao_args="$ao_args --prefix=$ao_prefix"
+ AO_CFLAGS="-I$ao_prefix/include"
+ AO_LIBS="-L$ao_prefix/lib"
fi
+
+ AO_LIBS="$AO_LIBS -lao"
- AC_PATH_PROG(AO_CONFIG, ao-config, no)
- min_ao_version=ifelse([$1], ,1.0.0,$1)
- AC_MSG_CHECKING(for ao - version >= $min_ao_version)
+ AC_MSG_CHECKING(for ao)
no_ao=""
- if test "$AO_CONFIG" = "no" ; then
- no_ao=yes
- else
- AO_CFLAGS=`$AO_CONFIG $aoconf_args --cflags`
- AO_LIBS=`$AO_CONFIG $aoconf_args --libs`
+
- ao_major_version=`$AO_CONFIG $ao_args --version | \
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
- ao_minor_version=`$AO_CONFIG $ao_args --version | \
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
- ao_micro_version=`$AO_CONFIG $ao_config_args --version | \
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
- if test "x$enable_aotest" = "xyes" ; then
- ac_save_CFLAGS="$CFLAGS"
- ac_save_LIBS="$LIBS"
- CFLAGS="$CFLAGS $AO_CFLAGS"
- LIBS="$LIBS $AO_LIBS"
+ if test "x$enable_aotest" = "xyes" ; then
+ ac_save_CFLAGS="$CFLAGS"
+ ac_save_LIBS="$LIBS"
+ CFLAGS="$CFLAGS $AO_CFLAGS"
+ LIBS="$LIBS $AO_LIBS"
dnl
-dnl Now check if the installed ao is sufficiently new. (Also sanity
-dnl checks the results of ao-config to some extent
+dnl Now check if the installed ao is sufficiently new.
dnl
rm -f conf.aotest
AC_TRY_RUN([
@@ -60,49 +48,41 @@
],, no_ao=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
CFLAGS="$ac_save_CFLAGS"
LIBS="$ac_save_LIBS"
- fi
fi
+
if test "x$no_ao" = x ; then
AC_MSG_RESULT(yes)
- ifelse([$2], , :, [$2])
+ ifelse([$1], , :, [$1])
else
AC_MSG_RESULT(no)
- if test "$AO_CONFIG" = "no" ; then
- echo "*** The ao-config script installed by ao could not be found"
- echo "*** If ao was installed in PREFIX, make sure PREFIX/bin is in"
- echo "*** your path, or set the AO_CONFIG environment variable to the"
- echo "*** full path to ao-config."
+ if test -f conf.aotest ; then
+ :
else
- if test -f conf.aotest ; then
- :
- else
- echo "*** Could not run ao test program, checking why..."
- CFLAGS="$CFLAGS $AO_CFLAGS"
- LIBS="$LIBS $AO_LIBS"
- AC_TRY_LINK([
+ echo "*** Could not run ao test program, checking why..."
+ CFLAGS="$CFLAGS $AO_CFLAGS"
+ LIBS="$LIBS $AO_LIBS"
+ AC_TRY_LINK([
#include <stdio.h>
#include <ao/ao.h>
-], [ return 0; ],
- [ echo "*** The test program compiled, but did not run. This usually means"
- echo "*** that the run-time linker is not finding ao or finding the wrong"
- echo "*** version of ao. If it is not finding ao, you'll need to set your"
- echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
- echo "*** to the installed location Also, make sure you have run ldconfig if that"
- echo "*** is required on your system"
- echo "***"
- echo "*** If you have an old version installed, it is best to remove it, although"
- echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
- [ echo "*** The test program failed to compile or link. See the file config.log for the"
- echo "*** exact error that occured. This usually means ao was incorrectly installed"
- echo "*** or that you have moved ao since it was installed. In the latter case, you"
- echo "*** may want to edit the ao-config script: $AO_CONFIG" ])
- CFLAGS="$ac_save_CFLAGS"
- LIBS="$ac_save_LIBS"
- fi
+], [ return 0; ],
+ [ echo "*** The test program compiled, but did not run. This usually means"
+ echo "*** that the run-time linker is not finding ao or finding the wrong"
+ echo "*** version of ao. If it is not finding ao, you'll need to set your"
+ echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
+ echo "*** to the installed location Also, make sure you have run ldconfig if that"
+ echo "*** is required on your system"
+ echo "***"
+ echo "*** If you have an old version installed, it is best to remove it, although"
+ echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
+ [ echo "*** The test program failed to compile or link. See the file config.log for the"
+ echo "*** exact error that occured. This usually means ao was incorrectly installed"
+ echo "*** or that you have moved ao since it was installed." ])
+ CFLAGS="$ac_save_CFLAGS"
+ LIBS="$ac_save_LIBS"
fi
AO_CFLAGS=""
AO_LIBS=""
- ifelse([$3], , :, [$3])
+ ifelse([$2], , :, [$2])
fi
AC_SUBST(AO_CFLAGS)
AC_SUBST(AO_LIBS)
1.10 +1 -1 ao/configure.in
Index: configure.in
===================================================================
RCS file: /usr/local/cvsroot/ao/configure.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- configure.in 2000/11/04 05:42:29 1.9
+++ configure.in 2000/11/08 04:22:31 1.10
@@ -146,4 +146,4 @@
CFLAGS="$CFLAGS -DAO_PLUGIN_PATH=\\\"$plugindir\\\""
-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 ao-config)
+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)
1.7 +0 -1 ao/libao.spec
Index: libao.spec
===================================================================
RCS file: /usr/local/cvsroot/ao/libao.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- libao.spec 2000/10/31 07:15:44 1.6
+++ libao.spec 2000/11/08 04:22:31 1.7
@@ -58,7 +58,6 @@
/usr/include/ao/ao.h
/usr/include/ao/os_types.h
/usr/lib/libao.so
-/usr/bin/ao-config
/usr/share/aclocal/ao.m4
%clean
--- >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