[Gnash-commit] gnash ./configure.ac backend/Makefile.am plugin...

[Rob Savoye]

CVSROOT:        /sources/gnash
Module name:    gnash
Branch:         
Changes by:     Rob Savoye <address@hidden>     06/01/23 05:30:57

Modified files:
        .              : configure.ac 
        backend        : Makefile.am 
        plugin         : Makefile.am 
        server         : Makefile.am 
        utilities      : Makefile.am 
Added files:
        macros         : mad.m4 

Log message:
        * configure.ac: Make text at end of configure more detailed about
        dependency errors.
        * macros/mad.m4: New macro to find libmad for mp3 support.
        * utilities/Makefile.am: Make MP3 support truly optional.
        * server/Makefile.am: Make MP3 support truly optional.
        * backend/Makefile.am: Make MP3 support truly optional.
        * plugin/Makefile.am: Make MP3 support truly optional.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/configure.ac.diff?tr1=1.14&tr2=1.15&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/backend/Makefile.am.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/plugin/Makefile.am.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/Makefile.am.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/utilities/Makefile.am.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/macros/mad.m4?rev=1.1

Patches:
Index: gnash/backend/Makefile.am
diff -u gnash/backend/Makefile.am:1.6 gnash/backend/Makefile.am:1.7
--- gnash/backend/Makefile.am:1.6       Sat Jan 21 17:08:40 2006
+++ gnash/backend/Makefile.am   Mon Jan 23 05:30:57 2006
@@ -20,7 +20,13 @@
 
 AUTOMAKE_OPTIONS = # dejagnu
 
+if MP3
+MP3_CFLAGS = $(MAD_CFLAGS)
+MP3_LIBS = $(MAD_LIBS)
+endif
+
 AM_CPPFLAGS = -Wall
+
 AM_LDFLAGS =  ../libbase/libbase.la \
        ../libgeometry/libgeometry.la \
        ../server/libserver.la \
@@ -31,6 +37,7 @@
         $(SDL_CFLAGS)          \
         $(SDL_MIXER_LIBS)      \
         $(OPENGL_LIBS)         \
+       $(MP3_LIBS)             \
         $(OGG_LIBS)            \
         $(VORBIS_LIBS)
 
@@ -42,6 +49,7 @@
         $(SDL_MIXER_CFLAGS)    \
        $(LIBXML_CFLAGS)        \
        $(OPENGL_CFLAGS)        \
+       $(MP3_CFLAGS)           \
        $(OGG_CFLAGS)           \
        $(VORBIS_CFLAGS)
 
Index: gnash/configure.ac
diff -u gnash/configure.ac:1.14 gnash/configure.ac:1.15
--- gnash/configure.ac:1.14     Sat Jan 21 17:08:40 2006
+++ gnash/configure.ac  Mon Jan 23 05:30:57 2006
@@ -136,14 +136,6 @@
   *)   docbook_styles=${withval};;
 esac])
 
-dnl Use the POSIX Threads library, if specified.
-AC_ARG_ENABLE(mp3, [  --enable-mp3       Enable support for playing mp3s],
-[case "${enableval}" in
-  yes) mp3=yes ;;
-  no)  mp3=no ;;
-  *)   AC_MSG_ERROR([bad value ${enableval} for enable-mp3 option]) ;;
-esac], mp3=no)
-
 AC_PATH_FIREFOX
 
 AC_PROG_CC
@@ -156,7 +148,7 @@
 AM_PATH_ZLIB
 AM_PATH_JPEG
 AM_PATH_PNG
-
+AM_PATH_MP3
 AC_PATH_XTRA
 
 AC_CHECK_HEADER(X11/Xmu/Xmu.h)
@@ -187,12 +179,6 @@
   AC_CHECK_LIB(pthread, main)
 fi
 
-dnl Look for mp3 (libmad) support
-if test x"$mp3" = x"yes"; then
-  AC_CHECK_HEADER(mad.h,)
-  AC_CHECK_LIB(mad, main)
-fi
-
 AC_OUTPUT(Makefile
 libbase/Makefile
 libgeometry/Makefile
@@ -214,25 +200,25 @@
 if test x"$i810lodbias" = x"yes"; then
   echo "        Intel 810 LOD bias hack enabled"
 else
-  echo "        Intel 810 LOD bias hack disabled"
+  echo "        Intel 810 LOD bias hack disabled (default)"
 fi
 
 if test x"$mp3" = x"yes"; then
-  echo "        MP3 support enabled"
+  echo "        MP3 (libmad) support enabled"
 else
-  echo "        MP3 support disabled"
+  echo "        MP3 (libmad) support disabled (default). Use --enable-mp3 to 
enable"
 fi
 
-if test x"$pthreads" = x"yes"; then
-  echo "        POSIX Threads support enabled"
-else
-  echo "        POSIX Thread support disabled"
-fi
+dnl if test x"$pthreads" = x"yes"; then
+dnl   echo "        POSIX Threads support enabled"
+dnl else
+dnl   echo "        POSIX Thread support disabled"
+dnl fi
 
 if test x"$http" = x"yes"; then
   echo "        Web server support enabled"
 else
-  echo "        Web server support disabled"
+  echo "        Web server support disabled (default)"
 fi
 
 if test x"$dmalloc" = x"yes"; then
@@ -240,17 +226,17 @@
   echo "        For a list of the command-line options enter: dmalloc --usa"
   dnl dmalloc
 else
-  echo "        DMalloc support disabled"
+  echo "        DMalloc support disabled (default)"
 fi
 
 if test x$enable_xml = xno; then
   echo "        XML and XMLSocket disabled"
 else
-  echo "        XML and XMLSocket enabled"
+  echo "        XML and XMLSocket enabled (default)"
 fi
 
 if test x"$plugin" = x"yes"; then
-  echo "        Firefox plugin enabled"
+  echo "        Firefox plugin enabled (default)"
 else
   echo "        Firefox plugin disabled"
 fi
@@ -300,6 +286,23 @@
   nogo=true
 fi
 
+if test x"$mp3" = xyes; then
+  if test x"$MAD_LIBS" != x; then
+    if test x"$MAD_CFLAGS" != x; then
+      echo "        MAD flags are: $MAD_CFLAGS"
+    else
+      echo "        MAD flags are: default include path"
+    fi
+    echo "        MAD libs are: $MAD_LIBS"
+  else
+    echo "        ERROR: No libmad (mp3) development package installed!\
+ You need to have the libmad development package installed\
+ to compile this file. You can either reconfigure without --enable-mp3,\
+ or install libmad0-dev (using apt-get) or libmad (using yum)."
+
+  fi
+fi
+
 if test x"$OGG_LIBS" != x; then
   if test x"$OGG_CFLAGS" != x; then
     echo "        OGG flags are: $OGG_CFLAGS"
@@ -358,15 +361,6 @@
     echo "        ERROR: No Firefox or Mozilla development package installed!"
     nogo=true
   fi
-
-dnl   if test x"$GLUT_LIBS" != x; then
-dnl     echo "        GLUT flags are: $GLUT_CFLAGS"
-dnl     echo "        GLUT libs are: $GLUT_LIBS"
-dnl   else
-dnl     echo "        ERROR: No GLUT development package installed."
-dnl     echo "               This is needed for the browser plugin."
-dnl     nogo=true
-dnl   fi
 fi
 
 # If anything critical is missing, don't bother to continue
@@ -374,3 +368,7 @@
 echo ""
   AC_MSG_ERROR([Please install required packages])
 fi
+
+
+# libmad
+# add sections on missing dependancies
Index: gnash/plugin/Makefile.am
diff -u gnash/plugin/Makefile.am:1.3 gnash/plugin/Makefile.am:1.4
--- gnash/plugin/Makefile.am:1.3        Sat Jan 21 17:08:40 2006
+++ gnash/plugin/Makefile.am    Mon Jan 23 05:30:57 2006
@@ -21,6 +21,11 @@
 
 SUBDIRS = mozilla-sdk # test
 
+if MP3
+MP3_CFLAGS = $(MAD_CFLAGS)
+MP3_LIBS = $(MAD_LIBS)
+endif
+
 plugindir   = $(FIREFOX_PLUGINS)
 
 INCLUDES = -I.. \
@@ -34,6 +39,7 @@
        $(SDL_CFLAGS)           \
        $(SDL_MIXER_CFLAGS)     \
        $(X_CFLAGS)             \
+       $(MP3_CFLAGS)           \
        $(OGG_CFLAGS)           \
        $(VORBIS_CFLAGS)
 
@@ -51,15 +57,16 @@
        $(LIBXML_LIBS)          \
        $(JPEG_LIBS)            \
        $(PNG_LIBS)             \
+       $(MP3_LIBS)             \
        $(OGG_LIBS)             \
         $(VORBIS_LIBS)
 
 
 plugin_LTLIBRARIES = libgnash.la
 
-noinst_HEADERS = plugin.h player.h
+noinst_HEADERS = plugin.h
 
-libgnash_la_SOURCES  = plugin.cpp player.cpp
+libgnash_la_SOURCES  = plugin.cpp
 libgnash_la_LIBADD   =         $(AM_LDFLAGS) \
        mozilla-sdk/libmozsdk.la \
        ../libbase/libbase.la \
Index: gnash/server/Makefile.am
diff -u gnash/server/Makefile.am:1.5 gnash/server/Makefile.am:1.6
--- gnash/server/Makefile.am:1.5        Thu Jan 19 23:50:11 2006
+++ gnash/server/Makefile.am    Mon Jan 23 05:30:57 2006
@@ -24,6 +24,7 @@
 
 lib_LTLIBRARIES = libserver.la
 
+# Only enable if we're configured with --enable-mp3
 INCLUDES = -I.. \
         -I$(top_srcdir) \
         -I$(top_srcdir)/libbase \
@@ -31,9 +32,14 @@
         $(ENGINE_INCLUDE) \
         $(ZLIB_CFLAGS) \
         $(SDL_MIXER_CFLAGS) \
-        $(LIBMAD_INCLUDE) \
         $(LIBXML_CFLAGS)
 
+if MP3
+MP3_CFLAGS = $(MAD_CFLAGS)
+MP3_LIBS = $(MAD_LIBS)
+MP3_HANDLER = sound_handler_mp3.cpp
+endif
+
 libserver_la_SOURCES = \
         textformat.cpp   \
         timers.cpp       \
@@ -52,12 +58,11 @@
         render.cpp       \
         shape.cpp        \
         sound.cpp        \
-       sound_handler_mp3.cpp \
         stream.cpp       \
         styles.cpp       \
         tesselate.cpp    \
         text.cpp         \
-        types.cpp
+        types.cpp $(MP3_HANDLER)
 
 noinst_HEADERS = \
        action.h        \
Index: gnash/utilities/Makefile.am
diff -u gnash/utilities/Makefile.am:1.3 gnash/utilities/Makefile.am:1.4
--- gnash/utilities/Makefile.am:1.3     Sat Jan 21 17:08:40 2006
+++ gnash/utilities/Makefile.am Mon Jan 23 05:30:57 2006
@@ -20,6 +20,11 @@
 
 AUTOMAKE_OPTIONS = # dejagnu
 
+if MP3
+MP3_CFLAGS = $(MAD_CFLAGS)
+MP3_LIBS = $(MAD_LIBS)
+endif
+
 AM_CPPFLAGS = -Wall
 AM_LDFLAGS =  ../libbase/libbase.la \
        ../libgeometry/libgeometry.la \
@@ -30,6 +35,7 @@
        $(JPEG_LIBS)        \
        $(PNG_LIBS)         \
         $(LIBXML_LIBS)      \
+       $(MP3_LIBS)         \
        $(OGG_LIBS)         \
         $(VORBIS_LIBS)
 
@@ -40,6 +46,7 @@
         -I$(top_srcdir)/libgeometry \
        $(LIBXML_CFLAGS)        \
        $(OPENGL_CFLAGS)        \
+       $(MP3_CFLAGS)           \
        $(OGG_CFLAGS)           \
        $(VORBIS_CFLAGS)        \
         $(SDL_CFLAGS)          \