Re: [AD] 4.3.10plus build system

[Peter Wang <novalazy@xxxxxxxxxx>]

On 2007-12-23, Milan Mimica <milan.mimica@xxxxxxxxxx> wrote:
>  Here is the new patch. Along with the changes you proposed I also changed a 
>  few things:
> 
>  1. There is no "auto" argument for --enable-allegrogl, only "yes" and "no". 
>  "yes" is default. This is how all other configure options in allegro work. 
>  Autodetection is still there.
> 
>  2. Removed any checks for OpenGL presence from Allegro's configure.in. This 
>  is performed in AllegroGL's configure anyway.
> 
>  3. The --prefix option is passed to AllegroGL's configure script.
>  I did it only for --prefix because it is the most used one IMO. If the user 
>  wants to pass any custom (and no so custom, like --enable-shared) options to 
>  AllegroGL's configure script he can do it by running it manually.
> 
>  I'd appreciate if someone tests it (I did) before I commit it.

Before I forget, I just noticed that include/alleggl_config.hin needs
the same namespace pollution cleanup as alunixac.hin.  Nothing to do
with your change of course.

> +dnl Build up configure options for AllegroGL
> +agl_config_opt="$agl_config_opt --prefix=$prefix"
> +
> +if test "$allegro_with_allegrogl" = "yes"; then
> +  echo ""
> +  echo "Running AllegroGL configure script..."
> +  echo "./configure $agl_config_opt"
> +  if (cd addons/allegrogl && ./configure $agl_config_opt && cd ../../); then

Firstly, the subshell means you don't need the "cd ../..".  The cd in
the subshell won't be reflected in the parent shell.

The recursive configure call should pass more options than just
--prefix.  The attached interdiff works for me.

Peter

diff -u configure.in configure.in
--- configure.in	(working copy)
+++ configure.in	(local)
@@ -741,13 +741,37 @@
 allegro_with_allegrogl=yes)
 
 dnl Build up configure options for AllegroGL
-agl_config_opt="$agl_config_opt --prefix=$prefix"
+agl_config_opt="$agl_config_opt
+  --build=$build
+  --host=$host
+  --target=$target
+  --prefix=$prefix
+  --exec-prefix=$exec_prefix
+  --bindir=$bindir
+  --sbindir=$sbindir
+  --libexecdir=$libexecdir
+  --sysconfdir=$sysconfdir
+  --sharedstatedir=$sharedstatedir
+  --localstatedir=$localstatedir
+  --libdir=$libdir
+  --includedir=$includedir
+  --oldincludedir=$oldincludedir
+  --datarootdir=$datarootdir
+  --datadir=$datadir
+  --infodir=$infodir
+  --localedir=$localedir
+  --mandir=$mandir
+  --docdir=$docdir
+  --htmldir=$htmldir
+  --dvidir=$dvidir
+  --pdfdir=$pdfdir
+  --psdir=$psdir"
 
 if test "$allegro_with_allegrogl" = "yes"; then
   echo ""
   echo "Running AllegroGL configure script..."
   echo "./configure $agl_config_opt"
-  if (cd addons/allegrogl && ./configure $agl_config_opt && cd ../../); then
+  if ( cd addons/allegrogl && ./configure $agl_config_opt ); then
     _addons="AllegroGL, $_addons"
     WITH_ALLEGROGL=yes
   else
diff -u fix.sh fix.sh
--- fix.sh	(working copy)
+++ fix.sh	(local)
@@ -169,9 +169,7 @@
 
 # run fix.sh for addons
-cd addons/allegrogl/
-if !(./fix.sh $1); then
-	echo "Error occured while executing AllegroGL's fix.sh!"
+if ! ( cd addons/allegrogl && ./fix.sh $1 ); then
+   echo "Error occured while executing AllegroGL's fix.sh!"
 fi
-cd ../../
 
 echo "Done!"