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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Branch:         
Changes by:     Sandro Santilli <address@hidden>        06/05/16 17:06:01

Modified files:
        .              : ChangeLog 
        macros         : gtk2.m4 

Log message:
        * macros/gtk2.m4 compute ${version} even when --with-gtk2-incl is used 
(needed to find gdkconfig.h).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/ChangeLog.diff?tr1=1.338&tr2=1.339&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/macros/gtk2.m4.diff?tr1=1.18&tr2=1.19&r1=text&r2=text

Patches:
Index: gnash/ChangeLog
diff -u gnash/ChangeLog:1.338 gnash/ChangeLog:1.339
--- gnash/ChangeLog:1.338       Tue May 16 16:47:37 2006
+++ gnash/ChangeLog     Tue May 16 17:06:01 2006
@@ -2,7 +2,8 @@
 
        * server/action.cpp: use GUI_GTK rather then HAVE_GTK2
        * macros/gtk2.m4: fixed ac_cv_path_gtk2_incl setting to
-       always include -I.
+       always include -I, compute ${version} even when
+       --with-gtk2-incl is used (needed to find gdkconfig.h).
 
 2006-05-16 Rob Savoye <address@hidden>
 
Index: gnash/macros/gtk2.m4
diff -u gnash/macros/gtk2.m4:1.18 gnash/macros/gtk2.m4:1.19
--- gnash/macros/gtk2.m4:1.18   Tue May 16 15:57:29 2006
+++ gnash/macros/gtk2.m4        Tue May 16 17:06:01 2006
@@ -43,6 +43,8 @@
     if test x"${with_gtk2_incl}" != x ; then
       if test -f ${with_gtk2_incl}/gtk/gtk.h; then
        ac_cv_path_gtk2_incl=-I`(cd ${with_gtk2_incl}; pwd)`
+        topdir=`basename ${with_gtk2_incl}`
+        version=`echo ${topdir} | sed -e 's:gtk-::'`
       else
        AC_MSG_ERROR([${with_gtk2_incl} directory doesn't contain gtk/gtk.h])
       fi
@@ -52,7 +54,7 @@
   dnl Attempt to find the top level directory, which unfortunately has a
   dnl version number attached. At least on Debain based systems, this
   dnl doesn't seem to get a directory that is unversioned.
-  if test x"${ac_cv_path_gtk2_incl}" = x; then
+  if test x"${version}" = x; then
     AC_MSG_CHECKING([for the Gtk Version])
     pathlist="${prefix}/include /sw/include /usr/local/include 
/usr/X11R6/include /home/latest/include /opt/include /usr/include 
/usr/pkg/include .. ../.."
 
@@ -67,13 +69,14 @@
         fi
       done
     done
+
+    if test x"${topdir}" = x; then
+      AC_MSG_RESULT(none)
+    else
+      AC_MSG_RESULT([${version}])
+    fi
   fi
 
-dnl     if test x"${topdir}" = x; then
-dnl       AC_MSG_RESULT(none)
-dnl     else
-dnl       AC_MSG_RESULT([${version}])
-dnl     fi
 
   dnl If the path hasn't been specified, go look for it.
   if test x"${ac_cv_path_gtk2_incl}" = x; then
@@ -92,15 +95,15 @@
             fi
           fi
         done
+        if test x"${ac_cv_path_gtk2_incl}" != x ; then
+          AC_MSG_RESULT(yes)
+        else
+          AC_MSG_RESULT(no)
+        fi
       fi
     ])
   fi
 
-  if test x"${ac_cv_path_gtk2_incl}" != x ; then
-    AC_MSG_RESULT(yes)
-  else
-    AC_MSG_RESULT(no)
-  fi
 
     dnl Look for the library
   AC_ARG_WITH(gtk2_lib,