From c7c0d1714c9b6f60347fbc87b231383e4026b58c Mon Sep 17 00:00:00 2001 From: darthgandalf Date: Wed, 22 Dec 2010 14:51:49 +0000 Subject: [PATCH] Change internal way of making Makefile to know if need to compile modperl or not. git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@2195 726aef4b-f618-498e-8847-2d620e286838 --- configure.in | 1 + modules/Makefile.in | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/configure.in b/configure.in index 0d670aa2..27c28897 100644 --- a/configure.in +++ b/configure.in @@ -416,6 +416,7 @@ AC_SUBST([CHARSET]) AC_SUBST([LIBICONV]) AC_SUBST([MODDIR]) AC_SUBST([DATADIR]) +AC_SUBST([PERL]) AC_CONFIG_FILES([Makefile]) AC_CONFIG_FILES([znc-config]) AC_CONFIG_FILES([znc-buildmod]) diff --git a/modules/Makefile.in b/modules/Makefile.in index 2e4e5fbc..c43305be 100644 --- a/modules/Makefile.in +++ b/modules/Makefile.in @@ -21,6 +21,7 @@ LDFLAGS := @LDFLAGS@ # LIBS are not and should not be used in here. # The znc binary links already against those. # LIBS := @LIBS@ +PERL_ON := @PERL@ PERL := @PERL_BINARY@ SWIG := @SWIG_BINARY@ MODDIR := @MODDIR@ @@ -65,7 +66,7 @@ FILES := $(foreach file, $(FILES), \ )) endif -ifneq "$(PERL)" "" +ifeq "$(PERL_ON)" "yes" # We execute this now so that we see the 'beauty' of these flags in make's output PERLCOMMON := $(shell $(PERL) -MExtUtils::Embed -e perl_inc -e ldopts) # Perl API is ugly, casting string literals to char* and redeclaring functions :(