[Gnash-commit] /srv/bzr/gnash/trunk r11088: Move all left-over GNASH_PATH_XXX and GNASH_PKG_FIND calls after the IMPORTANT notice, move the alp gui option handling where it belongs (there's a GUI selection section in the configure.ac file);

[Sandro Santilli]

------------------------------------------------------------
revno: 11088
committer: Sandro Santilli <address@hidden>
branch nick: trunk
timestamp: Fri 2009-06-12 12:07:13 +0200
message:
  Move all left-over GNASH_PATH_XXX and GNASH_PKG_FIND calls after the 
IMPORTANT notice, move the alp gui option handling where it belongs (there's a 
GUI selection section in the configure.ac file); 
modified:
  configure.ac

=== modified file 'configure.ac'
--- a/configure.ac      2009-06-12 09:51:22 +0000
+++ b/configure.ac      2009-06-12 10:07:13 +0000
@@ -1150,9 +1150,26 @@
 
 AM_CONDITIONAL(CROSS_COMPILING, [ test x$cross_compiling = xyes ])
 
+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 !!  Also GNASH_PKG_FIND has to be called later. Not sure
+dnl !!  why but calling before breaks detection of CPP (see
+dnl !!  gnash-dev mailing archives for June 12 2009
+dnl !!  http://lists.gnu.org/archive/html/gnash-dev/2009-06/index.html
+dnl !! 
+dnl !! 
+dnl !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
 dnl Check for PKG_CONFIG before any GNASH_PATH call
 PKG_PROG_PKG_CONFIG
 
+
 dnl Look for python, which is optional. If enabled, a python loadable
 dnl module of Gnash is created.
 GNASH_PATH_PYTHON
@@ -1165,42 +1182,6 @@
 AC_PATH_PROG(CSOUND, csound)
 AM_CONDITIONAL(HAVE_CSOUND, test x"$CSOUND" != x)
 
-dnl Look for scratchbox
-sbox=no
-if test x"${SBOX_REDIRECT_FROM_DIRS}" != x; then
-  sbox=yes
-fi
-if test x"${build_alp}" = xyes; then
-  GNASH_PATH_ALP
-  if test x"${have_alp}" = x"yes"; then
-    AC_DEFINE([HAVE_ALP], 1, [Access Linux Platform framework])
-  fi
-  dnl @@ It makes NO sense to set cross_compiling here,
-  dnl @@ *after* it is used in conditionals above
-  dnl @@ (AM_CONDITIONAL and directories search)
-  dnl cross_compiling=yes
-dnl  build_gtk=yes
-  build_kde3=no
-  build_ogl=no
-  build_agg=yes
-fi
-
-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 !!  Also GNASH_PKG_FIND has to be called later. Not sure
-dnl !!  why but calling before breaks detection of CPP (see
-dnl !!  gnash-dev mailing archives for June 12 2009
-dnl !!  http://lists.gnu.org/archive/html/gnash-dev/2009-06/index.html
-dnl !! 
-dnl !! 
-dnl !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-
 if test x$ext_dbus = xyes; then
   GNASH_PATH_DBUS
 fi
@@ -1244,6 +1225,28 @@
 dnl   disable build of the GUIS for which deps are NOT met
 dnl ------------------------------------------------------------
 
+dnl Look for scratchbox (used in GNASH_PATH_ALP)
+dnl FIXME: move it in macros/alp.m4 or at least after
+dnl        the build_alp conditional ?
+sbox=no
+if test x"${SBOX_REDIRECT_FROM_DIRS}" != x; then
+  sbox=yes
+fi
+if test x"${build_alp}" = xyes; then
+  GNASH_PATH_ALP
+  if test x"${have_alp}" = x"yes"; then
+    AC_DEFINE([HAVE_ALP], 1, [Access Linux Platform framework])
+  fi
+  dnl @@ It makes NO sense to set cross_compiling here,
+  dnl @@ *after* it is used in conditionals above
+  dnl @@ (AM_CONDITIONAL and directories search)
+  dnl cross_compiling=yes
+dnl  build_gtk=yes
+  build_kde3=no
+  build_ogl=no
+  build_agg=yes
+fi
+
 if test x$build_gtk = xyes -o $build_alp = xyes -o x$build_hildon = xyes; then
    GNASH_PATH_GTK2
    GNASH_PATH_PANGO