Re: svn commit: r37573 - in trunk: . build

I don't think that option name makes sense.

It seems that saying --disable-local-use will use the script editing
code to *ensure* the built-executables will work.

On Mon, May 4, 2009 at 19:21, Arfrever Frehtes Taifersar Arahesis
<Arfrever.FTA_at_gmail.com> wrote:
> Author: arfrever
> Date: Mon May  4 10:21:19 2009
> New Revision: 37573
>
> Log:
> Add the '--disable-local-use' option which allows to disable using of locally
> built executables.
>
> * configure.ac
>  (local-use): New.
>
> * Makefile.in
>  (local-all): Depend on '@TRANSFORM_LIBTOOL_SCRIPTS@'.
>
> * build/transform_libtool_scripts.sh: Delete the check for Mac OS which was
>   moved to configure.ac.
>
> Modified:
>   trunk/Makefile.in
>   trunk/build/transform_libtool_scripts.sh
>   trunk/configure.ac
>
> Modified: trunk/Makefile.in
> URL: http://svn.collab.net/viewvc/svn/trunk/Makefile.in?pathrev=37573&r1=37572&r2=37573
> ==============================================================================
> --- trunk/Makefile.in   Mon May  4 10:20:15 2009        (r37572)
> +++ trunk/Makefile.in   Mon May  4 10:21:19 2009        (r37573)
> @@ -313,7 +313,7 @@ install: external-install local-install
>
>  @INCLUDE_OUTPUTS@
>
> -local-all: @BUILD_RULES@ transform-libtool-scripts
> +local-all: @BUILD_RULES@ @TRANSFORM_LIBTOOL_SCRIPTS@
>
>  transform-libtool-scripts: @BUILD_RULES@
>        @$(top_srcdir)/build/transform_libtool_scripts.sh
>
> Modified: trunk/build/transform_libtool_scripts.sh
> URL: http://svn.collab.net/viewvc/svn/trunk/build/transform_libtool_scripts.sh?pathrev=37573&r1=37572&r2=37573
> ==============================================================================
> --- trunk/build/transform_libtool_scripts.sh    Mon May  4 10:20:15 2009        (r37572)
> +++ trunk/build/transform_libtool_scripts.sh    Mon May  4 10:21:19 2009        (r37573)
> @@ -1,9 +1,5 @@
>  #!/bin/sh
>
> -if test "$(uname)" = "Darwin"; then
> -  exit
> -fi
> -
>  # Dependencies of libraries
>  subr="subr"
>  auth_gnome_keyring="auth_gnome_keyring $subr"
>
> Modified: trunk/configure.ac
> URL: http://svn.collab.net/viewvc/svn/trunk/configure.ac?pathrev=37573&r1=37572&r2=37573
> ==============================================================================
> --- trunk/configure.ac  Mon May  4 10:20:15 2009        (r37572)
> +++ trunk/configure.ac  Mon May  4 10:21:19 2009        (r37573)
> @@ -244,6 +244,24 @@ AC_ARG_ENABLE(all-static,
>  AC_SUBST(LT_CFLAGS)
>  AC_SUBST(LT_LDFLAGS)
>
> +AC_ARG_ENABLE(local-use,
> +  AS_HELP_STRING([--disable-local-use],
> +                 [Disable use of locally built executables]),
> +  [
> +  if test "$enableval" != "no"; then
> +    TRANSFORM_LIBTOOL_SCRIPTS="transform-libtool-scripts"
> +  else
> +    TRANSFORM_LIBTOOL_SCRIPTS=""
> +  fi
> +  ], [
> +  if test "`uname`" != "Darwin"; then
> +    TRANSFORM_LIBTOOL_SCRIPTS="transform-libtool-scripts"
> +  else
> +    TRANSFORM_LIBTOOL_SCRIPTS=""
> +  fi
> +])
> +AC_SUBST(TRANSFORM_LIBTOOL_SCRIPTS)
> +
>  dnl Check if -no-undefined is needed for the platform.
>  dnl It should always work but with libtool 1.4.3 on OS X it breaks the build.
>  dnl So we only turn it on for platforms where we know we really need it.
>
> ------------------------------------------------------
> http://subversion.tigris.org/ds/viewMessage.do?dsForumId=495&dsMessageId=2058255
>

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2070573
Received on 2009-05-05 18:09:10 CEST