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

diff --git a/Makefile.am b/Makefile.am
index 4fb848d2621ab33e748a4d5538f700736874eb0f..06ae2e00973749d9ef17a094bb88662c37906634 100644 (file)
--- 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 b8c44c7a628ef1333c3f8d942d3ce12fea771106..aa1cb6f5fdc10965fec6892bd454462abcc4ebcc 100644 (file)
--- 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 7fad5e425c3930ea4ba256cb4cf889ce4e452fbf..f3bfdaf33711137b6a884c4a90b7e1f57e579216 100644 (file)
--- 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 \