From: John Darrington <john@darrington.wattle.id.au>
Date: Wed, 4 Feb 2009 05:33:54 +0000 (+0900)
Subject: Merge branch 'master' of ssh://jmd@git.sv.gnu.org/srv/git/pspp
X-Git-Tag: v0.7.2~1
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3b31ddc1183fe78119fe7c8d9f8a19204fb23aea;hp=3e32bd31d67b26aa26e10b788c6a2628adde75ea;p=pspp-builds.git

Merge branch 'master' of ssh://jmd@git.sv.gnu.org/srv/git/pspp
---

diff --git a/Makefile.am b/Makefile.am
index 4fb848d2..06ae2e00 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -60,7 +60,9 @@ if WITH_GUI_TOOLS
 include $(top_srcdir)/glade/automake.mk
 endif
 
+if WITH_PERL_MODULE
 include $(top_srcdir)/perl-module/automake.mk
+endif
 
 PHONY += $(DIST_HOOKS)
 dist-hook: $(DIST_HOOKS)
diff --git a/configure.ac b/configure.ac
index b8c44c7a..aa1cb6f5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -129,6 +129,8 @@ if test x"$with_gui_tools" = x"yes" ; then
 fi
 AM_CONDITIONAL(WITH_GUI_TOOLS, test x"$with_gui_tools" = x"yes")
 
+AM_CONDITIONAL(WITH_PERL_MODULE, test x"$cross_compiling" != x"yes")
+
 AC_SEARCH_LIBS([cblas_dsdot], [gslcblas],,[PSPP_REQUIRED_PREREQ([libgslcblas])])
 AC_SEARCH_LIBS([gsl_cdf_binomial_P], [gsl],,[PSPP_REQUIRED_PREREQ([libgsl (version 1.8 or later)])])
 PSPP_GSL_NEEDS_FGNU89_INLINE
diff --git a/perl-module/automake.mk b/perl-module/automake.mk
index 7fad5e42..f3bfdaf3 100644
--- a/perl-module/automake.mk
+++ b/perl-module/automake.mk
@@ -25,17 +25,14 @@ perl-module/pspp-module-config: Makefile
 	echo ');' >> $$target ;\
 	cp $$target $(top_builddir)/perl-module/pspp-module-config
 
-
-
 perl-module/Makefile: perl-module/Makefile.PL perl-module/pspp-module-config
 	cd perl-module && $(PERL) Makefile.PL PREFIX=$(prefix)
 
-
 perl-module/PSPP-Perl-$(VERSION).tar.gz: $(module_sources)
 	$(RM) $@
 	cd perl-module && $(MAKE) $(AM_MAKEFLAGS) tardist
 
-.PHONY: module-make
+PHONY += module-make
 module-make: perl-module/Makefile
 	cd perl-module && $(MAKE) $(AM_MAKEFLAGS)
 
@@ -64,7 +61,6 @@ clean-local:
 	fi
 	$(RM) perl-module/Makefile.old
 
-
 CLEANFILES += \
         perl-module/PSPP-Perl-$(VERSION).tar.gz \
 	perl-module/pspp-module-config \