summaryrefslogtreecommitdiff
path: root/media-libs/flac/files/flac-1.2.1-ogg-m4.patch
diff options
context:
space:
mode:
Diffstat (limited to 'media-libs/flac/files/flac-1.2.1-ogg-m4.patch')
-rw-r--r--media-libs/flac/files/flac-1.2.1-ogg-m4.patch67
1 files changed, 0 insertions, 67 deletions
diff --git a/media-libs/flac/files/flac-1.2.1-ogg-m4.patch b/media-libs/flac/files/flac-1.2.1-ogg-m4.patch
deleted file mode 100644
index ed551d5f..00000000
--- a/media-libs/flac/files/flac-1.2.1-ogg-m4.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-diff -urNp flac-1.2.1-old/m4/ogg.m4 flac-1.2.1/m4/ogg.m4
---- flac-1.2.1-old/m4/ogg.m4 2011-03-28 09:54:44.355000011 +0530
-+++ flac-1.2.1/m4/ogg.m4 2011-03-28 09:54:55.721000010 +0530
-@@ -9,23 +9,29 @@ AC_DEFUN([XIPH_PATH_OGG],
- [dnl
- dnl Get the cflags and libraries
- dnl
--AC_ARG_WITH(ogg,[ --with-ogg=PFX Prefix where libogg is installed (optional)], ogg_prefix="$withval", ogg_prefix="")
--AC_ARG_WITH(ogg-libraries,[ --with-ogg-libraries=DIR Directory where libogg library is installed (optional)], ogg_libraries="$withval", ogg_libraries="")
--AC_ARG_WITH(ogg-includes,[ --with-ogg-includes=DIR Directory where libogg header files are installed (optional)], ogg_includes="$withval", ogg_includes="")
--AC_ARG_ENABLE(oggtest, [ --disable-oggtest Do not try to compile and run a test Ogg program],, enable_oggtest=yes)
-+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/lib"
- elif test "x$prefix" != "xNONE" ; then
- OGG_LIBS="-L$prefix/lib"
- fi
-
-- OGG_LIBS="$OGG_LIBS -logg"
-+ 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"; then
-@@ -33,7 +39,12 @@ AC_ARG_ENABLE(oggtest, [ --disable-oggt
- fi
-
- AC_MSG_CHECKING(for Ogg)
-- no_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
-@@ -62,9 +73,12 @@ int main ()
- LIBS="$ac_save_LIBS"
- fi
-
-- if test "x$no_ogg" = "x" ; then
-+ 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])
-+ ifelse([$1], , :, [$1])
- else
- AC_MSG_RESULT(no)
- if test -f conf.oggtest ; then