diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2011-09-04 20:07:42 -0400 | 
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2011-09-04 20:07:42 -0400 | 
| commit | ed7eff89fd64021a2b4150c7d2caca488274c80b (patch) | |
| tree | 92697a9f185bb9ce9d85483a770c80a8b8ff5a4c | |
| parent | 0962182f01c1e29417b016a82c7947697daba82b (diff) | |
Guard against using plperl's Makefile without specifying --with-perl.
The $(PERL) macro will be set by configure if it finds perl at all,
but $(perl_privlibexp) isn't configured unless you said --with-perl.
This results in confusing error messages if someone cd's into
src/pl/plperl and tries to build there despite the configure omission,
as reported by Tomas Vondra in bug #6198.  Add simple checks to
provide a more useful report, while not disabling other use of the
makefile such as "make clean".
Back-patch to 9.0, which is as far as the patch applies easily.
| -rw-r--r-- | src/pl/plperl/GNUmakefile | 6 | 
1 files changed, 5 insertions, 1 deletions
| diff --git a/src/pl/plperl/GNUmakefile b/src/pl/plperl/GNUmakefile index d53811263a4..694a9b2189c 100644 --- a/src/pl/plperl/GNUmakefile +++ b/src/pl/plperl/GNUmakefile @@ -57,17 +57,21 @@ include $(top_srcdir)/src/Makefile.shlib  plperl.o: perlchunks.h plperl_opmask.h  plperl_opmask.h: plperl_opmask.pl +	@if [ x"$(perl_privlibexp)" = x"" ]; then echo "configure switch --with-perl was not specified."; exit 1; fi  	$(PERL) $< $@ -perlchunks.h: $(PERLCHUNKS)  +perlchunks.h: $(PERLCHUNKS) +	@if [ x"$(perl_privlibexp)" = x"" ]; then echo "configure switch --with-perl was not specified."; exit 1; fi  	$(PERL) $(srcdir)/text2macro.pl --strip='^(\#.*|\s*)$$' $^ > $@  all: all-lib  SPI.c: SPI.xs +	@if [ x"$(perl_privlibexp)" = x"" ]; then echo "configure switch --with-perl was not specified."; exit 1; fi  	$(PERL) $(perl_privlibexp)/ExtUtils/xsubpp -typemap $(perl_privlibexp)/ExtUtils/typemap $< >$@  Util.c: Util.xs +	@if [ x"$(perl_privlibexp)" = x"" ]; then echo "configure switch --with-perl was not specified."; exit 1; fi  	$(PERL) $(perl_privlibexp)/ExtUtils/xsubpp -typemap $(perl_privlibexp)/ExtUtils/typemap $< >$@  install: all installdirs install-lib | 
