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

[Rob Savoye]

CVSROOT:        /sources/gnash
Module name:    gnash
Branch:         
Changes by:     Rob Savoye <address@hidden>     06/02/02 16:39:05

Modified files:
        .              : ChangeLog configure.ac Makefile.am 
        macros         : png.m4 

Log message:
        * Makefile.am (STD_DIRS): Remove testsuite. Nothing actually needs
        to be done at "make all" time anyway. So now the testuites can
        only be run from the testsuite subdirctory.
        * macros/png.m4: Fix various typos and other stupid errors that
        kept the --with-png-incl and --with-png-lib options from working
        correctly.
        * configure.ac: Tweak test for PNG support.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/ChangeLog.diff?tr1=1.62&tr2=1.63&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/configure.ac.diff?tr1=1.27&tr2=1.28&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/Makefile.am.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/macros/png.m4.diff?tr1=1.6&tr2=1.7&r1=text&r2=text

Patches:
Index: gnash/ChangeLog
diff -u gnash/ChangeLog:1.62 gnash/ChangeLog:1.63
--- gnash/ChangeLog:1.62        Thu Feb  2 16:10:42 2006
+++ gnash/ChangeLog     Thu Feb  2 16:39:05 2006
@@ -1,3 +1,13 @@
+2006-02-02  Rob Savoye  <address@hidden>
+
+       * Makefile.am (STD_DIRS): Remove testsuite. Nothing actually needs
+       to be done at "make all" time anyway. So now the testuites can
+       only be run from the testsuite subdirctory.
+       * macros/png.m4: Fix various typos and other stupid errors that
+       kept the --with-png-incl and --with-png-lib options from working
+       correctly.
+       * configure.ac: Tweak test for PNG support.
+
 2006-02-03 Michael Carlson <address@hidden>
 
        * server/textformat.cpp: fix typo in textformat_new log message
Index: gnash/Makefile.am
diff -u gnash/Makefile.am:1.7 gnash/Makefile.am:1.8
--- gnash/Makefile.am:1.7       Thu Jan 26 21:21:44 2006
+++ gnash/Makefile.am   Thu Feb  2 16:39:05 2006
@@ -12,7 +12,7 @@
 ## Process this file with automake to produce Makefile.in
 AUTOMAKE_OPTIONS = dejagnu
 
-STD_DIRS = libbase libgeometry server backend utilities testsuite
+STD_DIRS = libbase libgeometry server backend utilities
 DIST_SUBDIRS = doc
 if PLUGIN
 SUBDIRS = $(STD_DIRS) plugin
Index: gnash/configure.ac
diff -u gnash/configure.ac:1.27 gnash/configure.ac:1.28
--- gnash/configure.ac:1.27     Wed Feb  1 23:58:31 2006
+++ gnash/configure.ac  Thu Feb  2 16:39:05 2006
@@ -237,7 +237,7 @@
   fi
 fi
 
-if test x"${PNG_LIBS}" != x ; then
+if test x"${png}" != x ; then
   if test x"${PNG_CFLAGS}" != x ; then
     echo "        PNG flags are: $PNG_CFLAGS"
   else
Index: gnash/macros/png.m4
diff -u gnash/macros/png.m4:1.6 gnash/macros/png.m4:1.7
--- gnash/macros/png.m4:1.6     Wed Feb  1 23:58:31 2006
+++ gnash/macros/png.m4 Thu Feb  2 16:39:05 2006
@@ -26,13 +26,16 @@
 
   if test x"$png" = x"yes"; then
     dnl Look for the header
-  AC_ARG_WITH(png_incl, [  --with-png_incl         directory where libpng 
header is], with_png_incl=${withval})
+  AC_ARG_WITH(png_incl, [  --with-png-incl         directory where libpng 
header is], with_png_incl=${withval})
     AC_CACHE_VAL(ac_cv_path_png_incl,[
+    AC_MSG_CHECKING([for png.h header in specified directory])
     if test x"${with_png_incl}" != x ; then
       if test -f ${with_png_incl}/png.h ; then
        ac_cv_path_png_incl=`(cd ${with_png_incl}; pwd)`
+       AC_MSG_RESULT([yes])
       else
        AC_MSG_ERROR([${with_png_incl} directory doesn't contain png.h])
+       AC_MSG_RESULT([no])
       fi
     fi
     ])
@@ -57,7 +60,6 @@
         done
       fi])
     else
-      AC_MSG_RESULT(-I${ac_cv_path_png_incl})
       if test x"${ac_cv_path_png_incl}" != x"/usr/include"; then
        ac_cv_path_png_incl="-I${ac_cv_path_png_incl}"
        else
@@ -67,7 +69,6 @@
 
     if test x"${ac_cv_path_png_incl}" != x ; then
       PNG_CFLAGS="${ac_cv_path_png_incl}"
-      AC_MSG_RESULT(${ac_cv_path_png_incl})
     else
       PNG_CFLAGS=""
     fi
@@ -76,10 +77,14 @@
       AC_ARG_WITH(png_lib, [  --with-png-lib          directory where png 
library is], with_png_lib=${withval})
       AC_CACHE_VAL(ac_cv_path_png_lib,[
       if test x"${with_png_lib}" != x ; then
+        AC_MSG_CHECKING([for libpng library in specified directory])
         if test -f ${with_png_lib}/libpng.a -o -f ${with_png_lib}/libpng.so; 
then
-         ac_cv_path_png_lib=`(cd ${with_png_incl}; pwd)`
+         tmp=`(cd ${with_png_lib}; pwd)`
+         ac_cv_path_png_lib="-L${tmp} -lpng"
+         AC_MSG_RESULT([yes])
         else
          AC_MSG_ERROR([${with_png_lib} directory doesn't contain libpng.])
+         AC_MSG_RESULT([no])
         fi
       fi
       ])
@@ -88,7 +93,7 @@
       if test x"${ac_cv_path_png_lib}" = x; then
         AC_CHECK_LIB(png, png_check_sig, [ac_cv_path_png_lib="-lpng"],[
           AC_MSG_CHECKING([for libpng library])
-          libslist="/sw/lib /usr/local/lib /home/latest/lib /opt/lib /usr/lib 
/usr/pkg/lib .. ../.."
+          libslist="/sw/lib /usr/local/lib /home/latest/lib /opt/lib /usr/lib 
/usr/pkg/lib /usr/X11R6/lib .. ../.."
           for i in $libslist; do
            if test -f $i/libpng.a -o -f $i/libpng.so; then
              if test x"$i" != x"/usr/lib"; then
@@ -102,15 +107,6 @@
              fi
            fi
           done])
-      else
-        if test -f ${ac_cv_path_png_lib}/libpng.a -o -f 
${ac_cv_path_png_lib}/libpng.so; then
-
-          if test x"${ac_cv_path_png_lib}" != x"/usr/lib"; then
-           ac_cv_path_png_lib="-L${ac_cv_path_png_lib}"
-           else
-           ac_cv_path_png_lib=""
-          fi
-        fi
       fi
     fi