← Back to branch summary

~ubuntu-branches/ubuntu/trusty/libtheora/trusty-proposed

« back to all changes in this revision

Viewing changes to m4/ogg.m4

  • Committer: Bazaar Package Importer
  • Author(s): Clint Adams
  • Date: 2008-04-23 14:08:37 UTC
  • mfrom: (1.1.6 upstream) (3.1.2 lenny)
  • Revision ID: james.westby@ubuntu.com-20080423140837-t981xtgv43carzk8
Tags: 1.0~beta3-1
New upstream release.

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$libdir"
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