CVSROOT: /sources/gnash
Module name: gnash
Changes by: Sandro Santilli <strk> 07/08/03 20:25:30
Modified files:
. : ChangeLog configure.ac
Log message:
* configure.ac: make sure PKG_CONFIG is defined before calling
GNAH_PATH_XXX. Made the notice clearer about GNASH_PATH_XX
need to be put after it.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3937&r2=1.3938
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.395&r2=1.396
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3937
retrieving revision 1.3938
diff -u -b -r1.3937 -r1.3938
--- ChangeLog 3 Aug 2007 19:42:02 -0000 1.3937
+++ ChangeLog 3 Aug 2007 20:25:29 -0000 1.3938
@@ -1,5 +1,11 @@
2007-08-02 Sandro Santilli <[EMAIL PROTECTED]>
+ * configure.ac: make sure PKG_CONFIG is defined before calling
+ GNAH_PATH_XXX. Made the notice clearer about GNASH_PATH_XX
+ need to be put after it.
+
+2007-08-02 Sandro Santilli <[EMAIL PROTECTED]>
+
* configure.ac: move GTK detection code *after* the cross-compiling
section, so that $incllist is properly set. Add notice about
the fact that any GNASH_PATH_XX must be invoked after that one.
Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.395
retrieving revision 1.396
diff -u -b -r1.395 -r1.396
--- configure.ac 3 Aug 2007 19:45:26 -0000 1.395
+++ configure.ac 3 Aug 2007 20:25:30 -0000 1.396
@@ -15,7 +15,7 @@
dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
dnl
-dnl $Id: configure.ac,v 1.395 2007/08/03 19:45:26 strk Exp $
+dnl $Id: configure.ac,v 1.396 2007/08/03 20:25:30 strk Exp $
AC_PREREQ(2.50)
AC_INIT(gnash, cvs)
@@ -598,16 +598,6 @@
dnl To override thise, use the --with-*-incl= and --with-*-libs=
dnl options to configure.
dnl
-dnl !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-dnl !!
-dnl !! IMPORTANT NOTICE
-dnl !!
-dnl !! Any call to GNASH_PATH_XXX must be be given *after*
-dnl !! this snippet, or incllist would not be set resulting
-dnl !! in header detection to malfunction
-dnl !!
-dnl !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-dnl
dnl
if test x$cross_compiling = xyes; then
AC_MSG_NOTICE([Configuring Gnash for cross compilation])
@@ -623,6 +613,19 @@
export pathlist=$PATH
fi
+dnl Check for PKG_CONFIG before any GNASH_PATH call
+PKG_PROG_PKG_CONFIG
+
+dnl !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+dnl !!
+dnl !! IMPORTANT NOTICE
+dnl !!
+dnl !! Any call to GNASH_PATH_XXX must be be given *after* this snippet.
+dnl !! This is to ensure that PKG_CONFIG, cross_compiling and incllist are
+dnl !! properly set at the time of call.
+dnl !!
+dnl !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
dnl -----------------------------------------------------------
dnl Verify dependencies for requested GUIs are met, and
dnl disable build of the GUIS for which deps are NOT met
@@ -666,7 +669,6 @@
AM_CONDITIONAL(HAVE_DMALLOC, [ test x$has_dmalloc = xyes ])
AC_CHECK_FUNCS(mallinfo)
-PKG_PROG_PKG_CONFIG
AC_PATH_TOOL([AUTOTRACE], [autotrace])
AC_HEADER_DIRENT
_______________________________________________
Gnash-commit mailing list
Gnash-commit@gnu.org
http://lists.gnu.org/mailman/listinfo/gnash-commit
