Serge van den Boom <svdb@xxxxxxxx> writes:
> The prefix specified with the --with-expat option of configure was not
> actually used.
I see configure.ac already has support for autodetection but I realized it
only after running "git grep EXPATDIR". "Even though the configure script
knows how to autodetect presence of the expat library and set EXPATDIR to
the prefix of the location it was found, the Makefile ignored it and only
honoured NO_EXPAT" might have been a better way to describe the breakage
the patch fixes.
If you look at the Makefile, you will notice a sequence of comments like
this:
# Define NO_CURL if you do not have libcurl installed. git-http-pull and
# git-http-push are not built, and you cannot use http:// and https://
# transports.
#
# Define CURLDIR=/foo/bar if your curl header and library files are in
# /foo/bar/include and /foo/bar/lib directories.
#
Please add one for EXPATDIR, just after "Define NO_EXPAT if ...". People
who do not run ./configure but add their own customizations in config.mak
should benefit from your patch as well.
You might want to add a logic to drop NO_EXPAT when EXPATDIR is specified
to the Makefile as well, but I didn't check.
Please do *not* send a patch in 'text/plain; format="flowed"' content-type.
You will get a whitespace mangled patch that I have to fix up by hand.
Thanks.
> Signed-off-by: Serge van den Boom <svdb@xxxxxxxx>
> ---
> diff --git a/Makefile b/Makefile
> index b4d9cb4..e7218cb 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -849,7 +849,12 @@ else
> endif
> endif
> ifndef NO_EXPAT
> - EXPAT_LIBEXPAT = -lexpat
> + ifdef EXPATDIR
> + BASIC_CFLAGS += -I$(EXPATDIR)/include
> + EXPAT_LIBEXPAT = -L$(EXPATDIR)/$(lib) $(CC_LD_DYNPATH)$(EXPATDIR)/$(lib) -lexpat
> + else
> + EXPAT_LIBEXPAT = -lexpat
> + endif
> endif
> endif
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
