[Gnash-commit] gnash ChangeLog macros/jpeg.m4

[Markus Gothe]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Markus Gothe <nihilus>  06/10/23 11:03:58

Modified files:
        .              : ChangeLog 
        macros         : jpeg.m4 

Log message:
        Fixed a minor bug.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1358&r2=1.1359
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/jpeg.m4?cvsroot=gnash&r1=1.16&r2=1.17

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1358
retrieving revision 1.1359
diff -u -b -r1.1358 -r1.1359
--- ChangeLog   23 Oct 2006 10:53:38 -0000      1.1358
+++ ChangeLog   23 Oct 2006 11:03:58 -0000      1.1359
@@ -1,3 +1,7 @@
+2006-10-23 Markus Gothe <address@hidden>
+
+       * macro/jpeg.m4: Fixed a bug.
+
 2006-10-23 Sandro Santilli <address@hidden>
 
        * testsuite/actionscript.all/Number.as: removed expected failures
@@ -14,6 +18,7 @@
          difference between AS_FUNCTION and OBJECT types.
        * server/swf.h: comment on semantic of ACTION_NEWEQUALS.
 
+>>>>>>> 1.1358
 2006-10-22 Sandro Santilli <address@hidden>
 
        * server/asobj/: Global.cpp, Makefile.am, Number.cpp, Number.h:

Index: macros/jpeg.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/jpeg.m4,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- macros/jpeg.m4      15 Oct 2006 14:26:05 -0000      1.16
+++ macros/jpeg.m4      23 Oct 2006 11:03:58 -0000      1.17
@@ -35,7 +35,7 @@
 dnl  
 dnl 
 
-dnl $Id: jpeg.m4,v 1.16 2006/10/15 14:26:05 bjacques Exp $
+dnl $Id: jpeg.m4,v 1.17 2006/10/23 11:03:58 nihilus Exp $
 
 AC_DEFUN([GNASH_PATH_JPEG],
 [
@@ -56,13 +56,13 @@
       else
        AC_MSG_ERROR([${with_jpeg_incl} directory doesn't contain jpeglib.h])
     fi
+    fi
     ])
 
     dnl If the path hasn't been specified, go look for it.
     if test x"${ac_cv_path_jpeg_incl}" = x; then
       AC_CHECK_HEADERS(jpeglib.h, [ac_cv_path_jpeg_incl=""],[
       if test x"${ac_cv_path_jpeg_incl}" = x; then
-        AC_MSG_CHECKING([for libjpeg header])
         incllist="${prefix}/include /sw/include /opt/local/include 
/usr/local/include /home/latest/include /opt/include /usr/include 
/usr/pkg/include .. ../.."
 
         for i in $incllist; do
@@ -78,7 +78,6 @@
         done
       fi])
     else
-      AC_MSG_RESULT(-I${ac_cv_path_jpeg_incl})
       if test x"${ac_cv_path_jpeg_incl}" != x"/usr/include"; then
        ac_cv_path_jpeg_incl="-I${ac_cv_path_jpeg_incl}"
        else
@@ -86,6 +85,9 @@
       fi
     fi
 
+    AC_MSG_CHECKING([for libjpeg header])
+    AC_MSG_RESULT(${ac_cv_path_jpeg_incl})
+
     if test x"${ac_cv_path_jpeg_incl}" != x ; then
       JPEG_CFLAGS="${ac_cv_path_jpeg_incl}"
       AC_MSG_RESULT(${ac_cv_path_jpeg_incl})
@@ -108,17 +110,14 @@
       dnl If the header doesn't exist, there is no point looking for the 
library.
       if test x"${ac_cv_path_jpeg_incl}" = x; then
         AC_CHECK_LIB(jpeg, jpeg_mem_init, [ac_cv_path_jpeg_lib=""],[
-          AC_MSG_CHECKING([for libjpeg library])
           libslist="${prefix}/lib64 ${prefix}/lib32 ${prefix}/lib /usr/lib64 
/usr/lib32 /usr/lib /sw/lib /usr/local/lib /home/latest/lib /opt/lib 
/usr/pkg/lib .. ../.."
           for i in $libslist; do
            if test -f $i/libjpeg.a -o -f $i/libjpeg.so; then
              if test x"$i" != x"/usr/lib"; then
                ac_cv_path_jpeg_lib="-L$i"
-                AC_MSG_RESULT(${ac_cv_path_jpeg_lib})
                break
               else
                ac_cv_path_jpeg_lib=""
-                AC_MSG_RESULT(yes)
                break
              fi
            fi
@@ -133,6 +132,8 @@
           fi
         fi
       fi
+       AC_MSG_CHECKING([for libjpeg library])
+       AC_MSG_RESULT(${ac_cv_path_jpeg_lib})
 
       if test x"${ac_cv_path_jpeg_lib}" != x ; then
         JPEG_LIBS="${ac_cv_path_jpeg_lib}"
@@ -140,7 +141,6 @@
         JPEG_LIBS=""
       fi
     fi
-  fi
 
   if test x"${ac_cv_path_jpeg_lib}" != x ; then
       JPEG_LIBS="${ac_cv_path_jpeg_lib} -ljpeg"