[Gnash-commit] gnash ChangeLog configure.ac

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/10/09 08:52:12

Modified files:
        .              : ChangeLog configure.ac 

Log message:
        * configure.ac: fixed refs to the obsoleted --enable-mp3 switch and 
$mp3 variable.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1078&r2=1.1079
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.133&r2=1.134

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1078
retrieving revision 1.1079
diff -u -b -r1.1078 -r1.1079
--- ChangeLog   9 Oct 2006 08:24:29 -0000       1.1078
+++ ChangeLog   9 Oct 2006 08:52:12 -0000       1.1079
@@ -1,5 +1,7 @@
 2006-10-09 Sandro Santilli <address@hidden>
 
+       * configure.ac: fixed refs to the obsoleted --enable-mp3 switch
+         and $mp3 variable.
        * configure.ac: GLIB is needed also for GST sound, not only
          for GTK gui (anything else?)
        * macros/ogg.m4: use PKG_CONFIG *after* having manually looked.

Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -b -r1.133 -r1.134
--- configure.ac        9 Oct 2006 08:24:29 -0000       1.133
+++ configure.ac        9 Oct 2006 08:52:12 -0000       1.134
@@ -33,7 +33,7 @@
 dnl also makes it possible to release a modified version which carries
 dnl forward this exception.
 
-dnl $Id: configure.ac,v 1.133 2006/10/09 08:24:29 strk Exp $
+dnl $Id: configure.ac,v 1.134 2006/10/09 08:52:12 strk Exp $
 
 AC_PREREQ(2.50)
 AC_INIT(gnash, 0.7.1-cvs)
@@ -391,7 +391,9 @@
 AC_PATH_PROG(DOXYGEN, doxygen)
 AM_CONDITIONAL(ENABLE_DOXYGEN, [ test x"$DOXYGEN" != x ])
 
+dnl Will handle --enable-mad and set $mad
 GNASH_PATH_MAD
+
 GNASH_PATH_OGG
 if test x$gui = xsdl -o x$sound_handler = xsdl; then
 GNASH_PATH_SDL
@@ -625,10 +627,25 @@
 
 if test x"$mad" = x"yes"; then
   echo "        MP3 (libmad) support enabled"
+  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 project. You can either reconfigure without --enable-mad,\
+ or install libmad0-dev (using apt-get) or libmad (using yum)."
+
+  fi
 else
   echo "        MP3 (libmad) support disabled (default). Use --enable-mad to 
enable"
 fi
 
+
 if test x"$pthreads" = x"yes"; then
   echo "        POSIX Threads support enabled (default)"
 else
@@ -736,23 +753,6 @@
   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 project. 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"