From d79f11501d0bdd78a038df79521ce21bf7cd9825 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Sun, 28 Dec 2014 15:26:27 +0000 Subject: [PATCH] Don't delete checked in files with 'make distclean' Occurs when ruby is not detected. Fixes #290. --- Examples/Makefile.in | 2 +- configure.ac | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Examples/Makefile.in b/Examples/Makefile.in index ea4c65654..bd3ed6c90 100644 --- a/Examples/Makefile.in +++ b/Examples/Makefile.in @@ -1096,7 +1096,7 @@ ruby_version: # ----------------------------------------------------------------- ruby_clean: - rm -f *_wrap* *~ .~* myruby@EXEEXT@ *.pm + rm -f *_wrap* *~ .~* myruby@EXEEXT@ rm -f core @EXTRA_CLEAN@ rm -f *.@OBJEXT@ *$(RUBY_SO) diff --git a/configure.ac b/configure.ac index ff4ce0310..24d66dc13 100644 --- a/configure.ac +++ b/configure.ac @@ -1507,6 +1507,7 @@ AC_ARG_WITH(ruby, AS_HELP_STRING([--without-ruby], [Disable Ruby]) AS_HELP_STRING([--with-ruby=path], [Set location of Ruby executable]),[ RUBYBIN="$withval"], [RUBYBIN=yes]) # First, check for "--without-ruby" or "--with-ruby=no". +RUBYSO=$SO if test x"${RUBYBIN}" = xno -o x"${with_alllang}" = xno ; then AC_MSG_NOTICE([Disabling Ruby]) RUBY=