[xiph-commits] r9374 - trunk/theora

[thomasvs at motherfish-iii.xiph.org]

Author: thomasvs
Date: 2005-06-06 06:06:47 -0700 (Mon, 06 Jun 2005)
New Revision: 9374

Modified:
   trunk/theora/configure.ac
Log:
- move library checks before stuff that checks examples
- don't build encoder example if vorbis is not present
- random typos and fixes


Modified: trunk/theora/configure.ac
===================================================================
--- trunk/theora/configure.ac	2005-06-06 13:05:03 UTC (rev 9373)
+++ trunk/theora/configure.ac	2005-06-06 13:06:47 UTC (rev 9374)
@@ -75,59 +75,9 @@
 LDFLAGS="$LDFLAGS $ldflags_save"
 
 dnl --------------------------------------------------
-dnl Overall build configuration options
+dnl Checks for support libraries and headers
 dnl --------------------------------------------------
 
-dnl Configuration option for building of floating point code.
-
-ac_enable_float=yes
-AC_ARG_ENABLE(float,
-     [  --disable-float         disable use of floating point code ],
-     [ ac_enable_float=no ], [ ac_enable_float=yes] )
-
-if test "x${ac_enable_float}" = xyes ; then
-    AC_DEFINE(THEORA_SUPPORT_FLOAT, [1], [Build floating point code])
-else
-    AC_DEFINE(THEORA_SUPPORT_FLOAT, [0], [Do not build floating point code])
-fi
-AM_CONDITIONAL(THEORA_SUPPORT_FLOAT, [test "x${ac_enable_float}" = "xyes"])
-
-dnl Configuration option for building of encoding support.
-
-ac_enable_encode=yes
-AC_ARG_ENABLE(encode,
-     [  --disable-encode        disable encoding support ],
-     [ ac_enable_encode=no ], [ ac_enable_encode=yes] )
-
-if test "x${ac_enable_encode}" = xyes ; then
-    BUILDABLE_EXAMPLES="$BUILDABLE_EXAMPLES encoder_example"
-    AC_DEFINE(THEORA_SUPPORT_ENCODE, [1], [Build encoding support])
-else
-    AC_DEFINE(THEORA_SUPPORT_ENCODE, [0], [Do not build encoding support])
-fi
-AM_CONDITIONAL(THEORA_SUPPORT_ENCODE, [test "x${ac_enable_encode}" = "xyes"])
-
-dnl --------------------------------------------------
-dnl Check for headers
-dnl --------------------------------------------------
-
-dnl none here
-
-dnl --------------------------------------------------
-dnl Check for typedefs, structures, etc
-dnl --------------------------------------------------
-
-dnl none
-
-dnl --------------------------------------------------
-dnl Check for library functions
-dnl --------------------------------------------------
-
-dnl substitue the included getopt if the system doesn't support long options
-AC_CHECK_FUNC(getopt_long, [GETOPT_OBJS=''], [GETOPT_OBJS='getopt.$(OBJEXT) getopt1.$(OBJEXT)'])
-AC_SUBST(GETOPT_OBJS)
-
-
 dnl check for Ogg
 HAVE_OGG=no
 
@@ -158,7 +108,7 @@
   LIBS=$libs_save
 fi
 
-dnl the examples use Vorbis and SDL
+
 dnl check for Vorbis
 HAVE_VORBIS=no
 
@@ -179,12 +129,17 @@
   XIPH_PATH_VORBIS(HAVE_VORBIS=yes, HAVE_VORBIS=no)
 fi
 
+dnl check for SDL
+HAVE_SDL=no
 
 AM_PATH_SDL(,[
 	HAVE_SDL=yes
 	SDL_LIBS=`$SDL_CONFIG --libs`
 ],AC_MSG_WARN([*** Unable to find SDL -- Not compiling example players ***]))
 
+dnl check for OSS
+HAVE_OSS=no
+
 AC_CHECK_HEADERS([sys/soundcard.h soundcard.h machine/soundcard.h],[
   HAVE_OSS=yes
   break
@@ -193,7 +148,66 @@
   AC_MSG_WARN([OSS audio support not found -- not compiling player_example])
 fi
 
-if test x$HAVE_SDL = xyes -a x$HAVE_OSS = xyes; then
+dnl --------------------------------------------------
+dnl Overall build configuration options
+dnl --------------------------------------------------
+
+dnl Configuration option for building of floating point code.
+
+ac_enable_float=yes
+AC_ARG_ENABLE(float,
+     [  --disable-float         disable use of floating point code ],
+     [ ac_enable_float=no ], [ ac_enable_float=yes] )
+
+if test "x${ac_enable_float}" = xyes ; then
+    AC_DEFINE(THEORA_SUPPORT_FLOAT, [1], [Build floating point code])
+else
+    AC_DEFINE(THEORA_SUPPORT_FLOAT, [0], [Do not build floating point code])
+fi
+AM_CONDITIONAL(THEORA_SUPPORT_FLOAT, [test "x${ac_enable_float}" = "xyes"])
+
+dnl Configuration option for building of encoding support.
+
+ac_enable_encode=yes
+AC_ARG_ENABLE(encode,
+     [  --disable-encode        disable encoding support ],
+     [ ac_enable_encode=no ], [ ac_enable_encode=yes] )
+
+if test "x${ac_enable_encode}" = xyes ; then
+    if test x$HAVE_VORBIS = xyes; then
+      BUILDABLE_EXAMPLES="$BUILDABLE_EXAMPLES encoder_example"
+    else
+      AC_MSG_NOTICE([Vorbis missing, cannot build example encoder])
+    fi
+    AC_DEFINE(THEORA_SUPPORT_ENCODE, [1], [Build encoding support])
+else
+    AC_DEFINE(THEORA_SUPPORT_ENCODE, [0], [Do not build encoding support])
+fi
+AM_CONDITIONAL(THEORA_SUPPORT_ENCODE, [test "x${ac_enable_encode}" = "xyes"])
+
+dnl --------------------------------------------------
+dnl Check for headers
+dnl --------------------------------------------------
+
+dnl none here
+
+dnl --------------------------------------------------
+dnl Check for typedefs, structures, etc
+dnl --------------------------------------------------
+
+dnl none
+
+dnl --------------------------------------------------
+dnl Check for library functions
+dnl --------------------------------------------------
+
+dnl substitute the included getopt if the system doesn't support long options
+AC_CHECK_FUNC(getopt_long,
+              [GETOPT_OBJS=''],
+              [GETOPT_OBJS='getopt.$(OBJEXT) getopt1.$(OBJEXT)'])
+AC_SUBST(GETOPT_OBJS)
+
+if test x$HAVE_SDL = xyes -a x$HAVE_OSS = xyes -a x$HAVE_VORBIS = xyes; then
   BUILDABLE_EXAMPLES="$BUILDABLE_EXAMPLES player_example"
 fi
 AC_SUBST(BUILDABLE_EXAMPLES)