Takashi Iwai
f60006a745
https://github.com/xiph/ogg/issues/99, where libogg does not place ogg.m4 when built using cmake. Celt though relies on this m4 to properly create its configure script. Patch a copy of ogg.m4 into our local source. OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/celt?expand=0&rev=41
122 lines
4.2 KiB
Diff
122 lines
4.2 KiB
Diff
Index: celt-0.11.3/m4/ogg.m4
|
|
===================================================================
|
|
--- /dev/null
|
|
+++ celt-0.11.3/m4/ogg.m4
|
|
@@ -0,0 +1,116 @@
|
|
+# Configure paths for libogg
|
|
+# Jack Moffitt <jack@icecast.org> 10-21-2000
|
|
+# Shamelessly stolen from Owen Taylor and Manish Singh
|
|
+
|
|
+dnl XIPH_PATH_OGG([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
|
|
+dnl Test for libogg, and define OGG_CFLAGS and OGG_LIBS
|
|
+dnl
|
|
+AC_DEFUN([XIPH_PATH_OGG],
|
|
+[dnl
|
|
+dnl Get the cflags and libraries
|
|
+dnl
|
|
+AC_ARG_WITH(ogg,AC_HELP_STRING([--with-ogg=PFX],[Prefix where libogg is installed (optional)]), ogg_prefix="$withval", ogg_prefix="")
|
|
+AC_ARG_WITH(ogg-libraries,AC_HELP_STRING([--with-ogg-libraries=DIR],[Directory where libogg library is installed (optional)]), ogg_libraries="$withval", ogg_libraries="")
|
|
+AC_ARG_WITH(ogg-includes,AC_HELP_STRING([--with-ogg-includes=DIR],[Directory where libogg header files are installed (optional)]), ogg_includes="$withval", ogg_includes="")
|
|
+AC_ARG_ENABLE(oggtest,AC_HELP_STRING([--disable-oggtest],[Do not try to compile and run a test Ogg program]),, enable_oggtest=yes)
|
|
+
|
|
+ if test "x$ogg_libraries" != "x" ; then
|
|
+ OGG_LIBS="-L$ogg_libraries"
|
|
+ elif test "x$ogg_prefix" = "xno" || test "x$ogg_prefix" = "xyes" ; then
|
|
+ OGG_LIBS=""
|
|
+ elif test "x$ogg_prefix" != "x" ; then
|
|
+ OGG_LIBS="-L$ogg_prefix/lib64"
|
|
+ elif test "x$prefix" != "xNONE" -a "x$prefix" != "x/usr"; then
|
|
+ OGG_LIBS="-L$prefix/lib64"
|
|
+ fi
|
|
+
|
|
+ if test "x$ogg_prefix" != "xno" ; then
|
|
+ OGG_LIBS="$OGG_LIBS -logg"
|
|
+ fi
|
|
+
|
|
+ if test "x$ogg_includes" != "x" ; then
|
|
+ OGG_CFLAGS="-I$ogg_includes"
|
|
+ elif test "x$ogg_prefix" = "xno" || test "x$ogg_prefix" = "xyes" ; then
|
|
+ OGG_CFLAGS=""
|
|
+ elif test "x$ogg_prefix" != "x" ; then
|
|
+ OGG_CFLAGS="-I$ogg_prefix/include"
|
|
+ elif test "x$prefix" != "xNONE" -a "x$prefix" != "x/usr"; then
|
|
+ OGG_CFLAGS="-I$prefix/include"
|
|
+ fi
|
|
+
|
|
+ AC_MSG_CHECKING(for Ogg)
|
|
+ if test "x$ogg_prefix" = "xno" ; then
|
|
+ no_ogg="disabled"
|
|
+ enable_oggtest="no"
|
|
+ else
|
|
+ no_ogg=""
|
|
+ fi
|
|
+
|
|
+
|
|
+ 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.
|
|
+dnl
|
|
+ rm -f conf.oggtest
|
|
+ AC_TRY_RUN([
|
|
+#include <stdio.h>
|
|
+#include <stdlib.h>
|
|
+#include <string.h>
|
|
+#include <ogg/ogg.h>
|
|
+
|
|
+int main (void)
|
|
+{
|
|
+ system("touch conf.oggtest");
|
|
+ return 0;
|
|
+}
|
|
+
|
|
+],, no_ogg=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
|
|
+ CFLAGS="$ac_save_CFLAGS"
|
|
+ LIBS="$ac_save_LIBS"
|
|
+ fi
|
|
+
|
|
+ if test "x$no_ogg" = "xdisabled" ; then
|
|
+ AC_MSG_RESULT(no)
|
|
+ ifelse([$2], , :, [$2])
|
|
+ elif test "x$no_ogg" = "x" ; then
|
|
+ AC_MSG_RESULT(yes)
|
|
+ ifelse([$1], , :, [$1])
|
|
+ else
|
|
+ AC_MSG_RESULT(no)
|
|
+ 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([
|
|
+#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." ])
|
|
+ CFLAGS="$ac_save_CFLAGS"
|
|
+ LIBS="$ac_save_LIBS"
|
|
+ fi
|
|
+ OGG_CFLAGS=""
|
|
+ OGG_LIBS=""
|
|
+ ifelse([$2], , :, [$2])
|
|
+ fi
|
|
+ AC_SUBST(OGG_CFLAGS)
|
|
+ AC_SUBST(OGG_LIBS)
|
|
+ rm -f conf.oggtest
|
|
+])
|