--without-x and 'make check' will create broken symlink to gnuplot_x11

[Jun T. <tak...@kb...>]

If I build gnuplot by

$ ./configure --without-x ...
$ make

then gnuplot_x11 is not built, of course. But if I run

$ make DEMO=xxx.dem check

then a broken symlink src/gnuplot_x11 is created which points
to itself. If I run 'make check' again (with different value
for DEMO, for example), then it fails as:

Mac:
  ln: ../src/gnuplot_x11: File exists
Linux:
  ln: accessing `../src/gnuplot_x11': Too many levels of symbolic links

and I must manually remove the symlink. Not serious but annoying.
A possible fix is at the end of this post.

# I guess gnuplot_x11 should be gnuplot_x11$(EXEEXT) if anyone ever
# builds x11 terminal on Windows and installs it with a name other than
# gnuplot_x11.exe. But I can't test on Windows (cygwin with X11?).

Another minor problem is that this broken symlink src/gnuplot_x11 is
not removed by 'make clean' or 'make distclean' if qt terminal is not
built. src/Makefile.am has 

clean-demo:
       rm -f $(GNUPLOT_X11)

but it is in the block "if BUILD_QT ... endif". Why?

Jun



Index: demo/Makefile.am.in
===================================================================
RCS file: /cvsroot/gnuplot/gnuplot/demo/Makefile.am.in,v
retrieving revision 1.40
diff -u -r1.40 Makefile.am.in
--- demo/Makefile.am.in	2 Mar 2014 06:23:55 -0000	1.40
+++ demo/Makefile.am.in	16 Jul 2014 06:04:51 -0000
@@ -25,7 +25,8 @@
GNUPLOT_X11 = `echo gnuplot_x11 | sed '$(transform)'`$(EXEEXT)

check-prepare:
-	@if test ! -e "$(top_builddir)/src/$(GNUPLOT_X11)"; then\
+	@if test ! -e "$(top_builddir)/src/$(GNUPLOT_X11)" \
+	        -a -e "$(top_builddir)/src/gnuplot_x11"; then
 	   $(LN_S) gnuplot_x11 $(top_builddir)/src/$(GNUPLOT_X11); \
 	fi