postgres.git / summary / log / commit / refs

commit    eed7dcfceedeb314d17695f014754ac0f3e8f892
Author:   Tom Lane <tgl@sss.pgh.pa.us>
Date:     Mon Sep 05 00:07:38 2011 +0000
First released in: 9.2.0, 9.0.5, 9.1.0

    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.


 src/pl/plperl/GNUmakefile | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/pl/plperl/GNUmakefile b/src/pl/plperl/GNUmakefile
index 79a8d5d3fad..aa44827bfa7 100644
--- a/src/pl/plperl/GNUmakefile
+++ b/src/pl/plperl/GNUmakefile
@@ -60,17 +60,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)
+	@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 $< >$@
 
 


[parent: 1ae019f04b95]