← Back to branch summary

~ubuntu-branches/ubuntu/saucy/flac/saucy-proposed

« back to all changes in this revision

Viewing changes to m4/ogg.m4

  • Committer: Package Import Robot
  • Author(s): Fabian Greffrath
  • Date: 2013-06-07 10:24:30 UTC
  • mfrom: (1.1.6)
  • Revision ID: package-import@ubuntu.com-20130607102430-x7e7zt462c0tuetp
Tags: 1.3.0-1
http://bugs.debian.org/527542
http://bugs.debian.org/705601
http://bugs.debian.org/710062
* Imported Upstream version 1.3.0 (Closes: #527542, #705601).
* Update debian/watch file, thanks Ulrich Klauer (Closes: #710062).
* Revert "Remove manpages from master branch."
* Imported Upstream version 1.3.0
* Convert package to "3.0 (quilt)" source format.
* Remove all patches, they have either been merged upstream or do not
  apply anymore (tested).
* Explicitly enable static libraries.
* Simplify debian/libflac-doc.install.
* Bump shlibs for added symbols.
* Remove needless Build-Depends: libid3-3.8.3-dev.
* Update Homepage field.
* Repair upstream manpage regeneration rule.
* Bump Build-Depends: debhelper (>= 9).
* Fix vcs-field-not-canonical.
* Import two patches from upstream GIT:
  + Add missing config.h includes.
  + Fix local_strcat() to terminate string correctly.
* Disable 3DNow! optimizations, enable SSE only on amd64, enable Altivec
  only on ppc64, disable ASM optimizations elsewhere.

Show diffs side-by-side

added added

removed removed

Lines of Context:
m4/ogg.m4
9
9
[dnl 
10
10
dnl Get the cflags and libraries
11
11
dnl
12
 
AC_ARG_WITH(ogg,[  --with-ogg=PFX   Prefix where libogg is installed (optional)], ogg_prefix="$withval", ogg_prefix="")
13
 
AC_ARG_WITH(ogg-libraries,[  --with-ogg-libraries=DIR   Directory where libogg library is installed (optional)], ogg_libraries="$withval", ogg_libraries="")
14
 
AC_ARG_WITH(ogg-includes,[  --with-ogg-includes=DIR   Directory where libogg header files are installed (optional)], ogg_includes="$withval", ogg_includes="")
15
 
AC_ARG_ENABLE(oggtest, [  --disable-oggtest       Do not try to compile and run a test Ogg program],, enable_oggtest=yes)
 
12
AC_ARG_WITH(ogg,AC_HELP_STRING([--with-ogg=PFX],[Prefix where libogg is installed (optional)]), ogg_prefix="$withval", ogg_prefix="")
 
13
AC_ARG_WITH(ogg-libraries,AC_HELP_STRING([--with-ogg-libraries=DIR],[Directory where libogg library is installed (optional)]), ogg_libraries="$withval", ogg_libraries="")
 
14
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="")
 
15
AC_ARG_ENABLE(oggtest,AC_HELP_STRING([--disable-oggtest],[Do not try to compile and run a test Ogg program]),, enable_oggtest=yes)
16
16
 
17
17
  if test "x$ogg_libraries" != "x" ; then
18
18
    OGG_LIBS="-L$ogg_libraries"
 
19
  elif test "x$ogg_prefix" = "xno" || test "x$ogg_prefix" = "xyes" ; then
 
20
    OGG_LIBS=""
19
21
  elif test "x$ogg_prefix" != "x" ; then
20
22
    OGG_LIBS="-L$ogg_prefix/lib"
21
23
  elif test "x$prefix" != "xNONE" ; then
22
24
    OGG_LIBS="-L$prefix/lib"
23
25
  fi
24
26
 
25
 
  OGG_LIBS="$OGG_LIBS -logg"
 
27
  if test "x$ogg_prefix" != "xno" ; then
 
28
    OGG_LIBS="$OGG_LIBS -logg"
 
29
  fi
26
30
 
27
31
  if test "x$ogg_includes" != "x" ; then
28
32
    OGG_CFLAGS="-I$ogg_includes"
 
33
  elif test "x$ogg_prefix" = "xno" || test "x$ogg_prefix" = "xyes" ; then
 
34
    OGG_CFLAGS=""
29
35
  elif test "x$ogg_prefix" != "x" ; then
30
36
    OGG_CFLAGS="-I$ogg_prefix/include"
31
37
  elif test "x$prefix" != "xNONE"; then
33
39
  fi
34
40
 
35
41
  AC_MSG_CHECKING(for Ogg)
36
 
  no_ogg=""
 
42
  if test "x$ogg_prefix" = "xno" ; then
 
43
    no_ogg="disabled"
 
44
    enable_oggtest="no"
 
45
  else
 
46
    no_ogg=""
 
47
  fi
37
48
 
38
49
 
39
50
  if test "x$enable_oggtest" = "xyes" ; then
62
73
       LIBS="$ac_save_LIBS"
63
74
  fi
64
75
 
65
 
  if test "x$no_ogg" = "x" ; then
 
76
  if test "x$no_ogg" = "xdisabled" ; then
 
77
     AC_MSG_RESULT(no)
 
78
     ifelse([$2], , :, [$2])
 
79
  elif test "x$no_ogg" = "x" ; then
66
80
     AC_MSG_RESULT(yes)
67
 
     ifelse([$1], , :, [$1])     
 
81
     ifelse([$1], , :, [$1])
68
82
  else
69
83
     AC_MSG_RESULT(no)
70
84
     if test -f conf.oggtest ; then