[xiph-cvs] cvs commit: vorbis Makefile.am acinclude.m4 configure.in libvorbis.spec vorbis.m4 vorbis-config.in
Jack Moffitt
jack at xiph.org
Sun Oct 29 22:59:54 PST 2000
jack 00/10/29 22:59:53
Modified: . Tag: branch_beta3 Makefile.am acinclude.m4
configure.in libvorbis.spec vorbis.m4
Removed: . Tag: branch_beta3 vorbis-config.in
Log:
more .m4 changes... no more *-config scripts
Revision Changes Path
No revision
No revision
1.2.2.2 +0 -1 vorbis/Makefile.am
Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/vorbis/Makefile.am,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -r1.2.2.1 -r1.2.2.2
--- Makefile.am 2000/10/22 03:28:03 1.2.2.1
+++ Makefile.am 2000/10/30 06:59:52 1.2.2.2
@@ -4,7 +4,6 @@
SUBDIRS = lib include doc examples
-bin_SCRIPTS = vorbis-config
m4datadir = $(datadir)/aclocal
m4data_DATA = vorbis.m4
1.1.2.2 +40 -59 vorbis/Attic/acinclude.m4
Index: acinclude.m4
===================================================================
RCS file: /usr/local/cvsroot/vorbis/Attic/acinclude.m4,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- acinclude.m4 2000/10/26 22:50:52 1.1.2.1
+++ acinclude.m4 2000/10/30 06:59:52 1.1.2.2
@@ -6,47 +6,35 @@
# Jack Moffitt <jack at icecast.org> 10-21-2000
# Shamelessly stolen from Owen Taylor and Manish Singh
-dnl AM_PATH_OGG([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
+dnl AM_PATH_OGG([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
dnl Test for libogg, and define OGG_CFLAGS and OGG_LIBS
dnl
AC_DEFUN(AM_PATH_OGG,
[dnl
-dnl Get the cflags and libraries from the ogg-config script
+dnl Get the cflags and libraries
dnl
AC_ARG_WITH(ogg-prefix,[ --with-ogg-prefix=PFX Prefix where libogg is installed (optional)], ogg_prefix="$withval", ogg_prefix="")
AC_ARG_ENABLE(oggtest, [ --disable-oggtest Do not try to compile and run a test Ogg program],, enable_oggtest=yes)
if test x$ogg_prefix != x ; then
- ogg_args="$ogg_args --prefix=$ogg_prefix"
- if test x${OGG_CONFIG+set} != xset ; then
- OGG_CONFIG=$ogg_prefix/bin/ogg-config
- fi
+ ogg_args="$ogg_args --prefix=$ogg_prefix"
+ OGG_CFLAGS="-I$ogg_prefix/include"
+ OGG_LIBS="-L$ogg_prefix/lib"
fi
+
+ OGG_LIBS="$OGG_LIBS -logg"
- AC_PATH_PROG(OGG_CONFIG, ogg-config, no)
- min_ogg_version=ifelse([$1], ,1.0.0,$1)
- AC_MSG_CHECKING(for Ogg - version >= $min_ogg_version)
+ AC_MSG_CHECKING(for Ogg)
no_ogg=""
- if test "$OGG_CONFIG" = "no" ; then
- no_esd=yes
- else
- OGG_CFLAGS=`$OGG_CONFIG $oggconf_args --cflags`
- OGG_LIBS=`$OGG_CONFIG $oggconf_args --libs`
+
- ogg_major_version=`$OGG_CONFIG $ogg_args --version | \
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
- ogg_minor_version=`$OGG_CONFIG $ogg_args --version | \
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
- ogg_micro_version=`$OGG_CONFIG $ogg_config_args --version | \
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
- if test "x$enable_oggtest" = "xyes" ; then
- ac_save_CFLAGS="$CFLAGS"
- ac_save_LIBS="$LIBS"
- CFLAGS="$CFLAGS $OGG_CFLAGS"
- LIBS="$LIBS $OGG_LIBS"
+ if test "x$enable_oggtest" = "xyes" ; then
+ ac_save_CFLAGS="$CFLAGS"
+ ac_save_LIBS="$LIBS"
+ CFLAGS="$CFLAGS $OGG_CFLAGS"
+ LIBS="$LIBS $OGG_LIBS"
dnl
-dnl Now check if the installed Ogg is sufficiently new. (Also sanity
-dnl checks the results of ogg-config to some extent
+dnl Now check if the installed Ogg is sufficiently new.
dnl
rm -f conf.oggtest
AC_TRY_RUN([
@@ -64,49 +52,42 @@
],, no_ogg=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
CFLAGS="$ac_save_CFLAGS"
LIBS="$ac_save_LIBS"
- fi
fi
+
if test "x$no_ogg" = x ; then
AC_MSG_RESULT(yes)
- ifelse([$2], , :, [$2])
+ ifelse([$1], , :, [$1])
else
AC_MSG_RESULT(no)
- if test "$OGG_CONFIG" = "no" ; then
- echo "*** The ogg-config script installed by Ogg could not be found"
- echo "*** If Ogg was installed in PREFIX, make sure PREFIX/bin is in"
- echo "*** your path, or set the OGG_CONFIG environment variable to the"
- echo "*** full path to ogg-config."
+ if test -f conf.oggtest ; then
+ :
else
- if test -f conf.oggtest ; then
- :
- else
- echo "*** Could not run Ogg test program, checking why..."
- CFLAGS="$CFLAGS $OGG_CFLAGS"
- LIBS="$LIBS $OGG_LIBS"
- AC_TRY_LINK([
+ echo "*** Could not run Ogg test program, checking why..."
+ CFLAGS="$CFLAGS $OGG_CFLAGS"
+ LIBS="$LIBS $OGG_LIBS"
+ AC_TRY_LINK([
#include <stdio.h>
#include <ogg/ogg.h>
-], [ return 0; ],
- [ echo "*** The test program compiled, but did not run. This usually means"
- echo "*** that the run-time linker is not finding Ogg or finding the wrong"
- echo "*** version of Ogg. If it is not finding Ogg, 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 Ogg was incorrectly installed"
- echo "*** or that you have moved Ogg since it was installed. In the latter case, you"
- echo "*** may want to edit the ogg-config script: $OGG_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 Ogg or finding the wrong"
+ echo "*** version of Ogg. If it is not finding Ogg, 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 Ogg was incorrectly installed"
+ echo "*** or that you have moved Ogg since it was installed. In the latter case, you"
+ echo "*** may want to edit the ogg-config script: $OGG_CONFIG" ])
+ CFLAGS="$ac_save_CFLAGS"
+ LIBS="$ac_save_LIBS"
fi
OGG_CFLAGS=""
OGG_LIBS=""
- ifelse([$3], , :, [$3])
+ ifelse([$2], , :, [$2])
fi
AC_SUBST(OGG_CFLAGS)
AC_SUBST(OGG_LIBS)
1.24.2.5 +2 -2 vorbis/configure.in
Index: configure.in
===================================================================
RCS file: /usr/local/cvsroot/vorbis/configure.in,v
retrieving revision 1.24.2.4
retrieving revision 1.24.2.5
diff -u -r1.24.2.4 -r1.24.2.5
--- configure.in 2000/10/22 03:28:03 1.24.2.4
+++ configure.in 2000/10/30 06:59:52 1.24.2.5
@@ -143,7 +143,7 @@
AC_CHECK_LIB(m, cos, LIBS="-lm", LIBS="")
AC_CHECK_LIB(pthread, pthread_create, pthread_lib="-lpthread", :)
-AM_PATH_OGG(1.0.0, have_ogg=yes, have_ogg=no)
+AM_PATH_OGG(have_ogg=yes, have_ogg=no)
dnl --------------------------------------------------
dnl Check for library functions
@@ -162,4 +162,4 @@
AC_SUBST(CC)
AC_SUBST(pthread_lib)
-AC_OUTPUT(Makefile vorbis-config lib/Makefile doc/Makefile include/Makefile include/vorbis/Makefile include/vorbis/book/Makefile examples/Makefile)
+AC_OUTPUT(Makefile lib/Makefile doc/Makefile include/Makefile include/vorbis/Makefile include/vorbis/book/Makefile examples/Makefile)
1.2.2.3 +0 -1 vorbis/libvorbis.spec
Index: libvorbis.spec
===================================================================
RCS file: /usr/local/cvsroot/vorbis/libvorbis.spec,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -u -r1.2.2.2 -r1.2.2.3
--- libvorbis.spec 2000/10/26 22:50:52 1.2.2.2
+++ libvorbis.spec 2000/10/30 06:59:52 1.2.2.3
@@ -73,7 +73,6 @@
/usr/include/vorbis/book/resaux0_*.vqh
/usr/lib/libvorbis.a
/usr/lib/libvorbis.so
-/usr/bin/vorbis-config
%clean
[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
1.1.2.2 +39 -59 vorbis/Attic/vorbis.m4
Index: vorbis.m4
===================================================================
RCS file: /usr/local/cvsroot/vorbis/Attic/vorbis.m4,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- vorbis.m4 2000/10/22 03:28:03 1.1.2.1
+++ vorbis.m4 2000/10/30 06:59:53 1.1.2.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_VORBIS([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
+dnl AM_PATH_VORBIS([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
dnl Test for libvorbis, and define VORBIS_CFLAGS and VORBIS_LIBS
dnl
AC_DEFUN(AM_PATH_VORBIS,
[dnl
-dnl Get the cflags and libraries from the vorbis-config script
+dnl Get the cflags and libraries
dnl
AC_ARG_WITH(vorbis-prefix,[ --with-vorbis-prefix=PFX Prefix where libvorbis is installed (optional)], vorbis_prefix="$withval", vorbis_prefix="")
AC_ARG_ENABLE(vorbistest, [ --disable-vorbistest Do not try to compile and run a test Vorbis program],, enable_vorbistest=yes)
if test x$vorbis_prefix != x ; then
- vorbis_args="$vorbis_args --prefix=$vorbis_prefix"
- if test x${VORBIS_CONFIG+set} != xset ; then
- VORBIS_CONFIG=$vorbis_prefix/bin/vorbis-config
- fi
+ vorbis_args="$vorbis_args --prefix=$vorbis_prefix"
+ VORBIS_CFLAGS="-I$vorbis_prefix/include"
+ VORBIS_LIBS="-L$vorbis_prefix/lib"
fi
+
+ VORBIS_LIBS="$VORBIS_LIBS -lvorbisfile -lvorbis"
- AC_PATH_PROG(VORBIS_CONFIG, vorbis-config, no)
- min_vorbis_version=ifelse([$1], ,1.0.0,$1)
- AC_MSG_CHECKING(for Vorbis - version >= $min_vorbis_version)
+ AC_MSG_CHECKING(for Vorbis)
no_vorbis=""
- if test "$VORBIS_CONFIG" = "no" ; then
- no_esd=yes
- else
- VORBIS_CFLAGS=`$VORBIS_CONFIG $vorbisconf_args --cflags`
- VORBIS_LIBS=`$VORBIS_CONFIG $vorbisconf_args --libs`
+
- vorbis_major_version=`$VORBIS_CONFIG $vorbis_args --version | \
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
- vorbis_minor_version=`$VORBIS_CONFIG $vorbis_args --version | \
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
- vorbis_micro_version=`$VORBIS_CONFIG $vorbis_config_args --version | \
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
- if test "x$enable_vorbistest" = "xyes" ; then
- ac_save_CFLAGS="$CFLAGS"
- ac_save_LIBS="$LIBS"
- CFLAGS="$CFLAGS $VORBIS_CFLAGS"
- LIBS="$LIBS $VORBIS_LIBS"
+ if test "x$enable_vorbistest" = "xyes" ; then
+ ac_save_CFLAGS="$CFLAGS"
+ ac_save_LIBS="$LIBS"
+ CFLAGS="$CFLAGS $VORBIS_CFLAGS"
+ LIBS="$LIBS $VORBIS_LIBS"
dnl
-dnl Now check if the installed Vorbis is sufficiently new. (Also sanity
-dnl checks the results of vorbis-config to some extent
+dnl Now check if the installed Vorbis is sufficiently new.
dnl
rm -f conf.vorbistest
AC_TRY_RUN([
@@ -60,49 +48,41 @@
],, no_vorbis=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
CFLAGS="$ac_save_CFLAGS"
LIBS="$ac_save_LIBS"
- fi
fi
+
if test "x$no_vorbis" = x ; then
AC_MSG_RESULT(yes)
- ifelse([$2], , :, [$2])
+ ifelse([$1], , :, [$1])
else
AC_MSG_RESULT(no)
- if test "$VORBIS_CONFIG" = "no" ; then
- echo "*** The vorbis-config script installed by Vorbis could not be found"
- echo "*** If Vorbis was installed in PREFIX, make sure PREFIX/bin is in"
- echo "*** your path, or set the VORBIS_CONFIG environment variable to the"
- echo "*** full path to vorbis-config."
+ if test -f conf.vorbistest ; then
+ :
else
- if test -f conf.vorbistest ; then
- :
- else
- echo "*** Could not run Vorbis test program, checking why..."
- CFLAGS="$CFLAGS $VORBIS_CFLAGS"
- LIBS="$LIBS $VORBIS_LIBS"
- AC_TRY_LINK([
+ echo "*** Could not run Vorbis test program, checking why..."
+ CFLAGS="$CFLAGS $VORBIS_CFLAGS"
+ LIBS="$LIBS $VORBIS_LIBS"
+ AC_TRY_LINK([
#include <stdio.h>
#include <vorbis/codec.h>
-], [ return 0; ],
- [ echo "*** The test program compiled, but did not run. This usually means"
- echo "*** that the run-time linker is not finding Vorbis or finding the wrong"
- echo "*** version of Vorbis. If it is not finding Vorbis, 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 Vorbis was incorrectly installed"
- echo "*** or that you have moved Vorbis since it was installed. In the latter case, you"
- echo "*** may want to edit the vorbis-config script: $VORBIS_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 Vorbis or finding the wrong"
+ echo "*** version of Vorbis. If it is not finding Vorbis, 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 Vorbis was incorrectly installed"
+ echo "*** or that you have moved Vorbis since it was installed." ])
+ CFLAGS="$ac_save_CFLAGS"
+ LIBS="$ac_save_LIBS"
fi
VORBIS_CFLAGS=""
VORBIS_LIBS=""
- ifelse([$3], , :, [$3])
+ ifelse([$2], , :, [$2])
fi
AC_SUBST(VORBIS_CFLAGS)
AC_SUBST(VORBIS_LIBS)
--- >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