#2146 Cannot build current dev. (Last Commit [5b139f])

[Tatsuro MATSUOKA]

Last Commit [5b139f]
Platfrom : Ubuntu 18.04 on WSL, Cygwin 64

On windows build was successful.
Recent changes seem to break unixy build.

gcc -DHAVE_CONFIG_H -I. -I../../src -I..  -I../term -I../../term -DBINDIR=\"/opt/gp530/bin\" -DX11_DRIVER_DIR=\"/opt/gp530/libexec/gnuplot/5.3\" -DQT_DRIVER_DIR=\"/opt/gp530/libexec/gnuplot/5.3\" -DGNUPLOT_SHARE_DIR=\"/opt/gp530/share/gnuplot/5.3\" -DGNUPLOT_PS_DIR=\"/opt/gp530/share/gnuplot/5.3/PostScript\" -DGNUPLOT_JS_DIR=\"/opt/gp530/share/gnuplot/5.3/js\" -DGNUPLOT_LUA_DIR=\"/opt/gp530/share/gnuplot/5.3/lua\" -DCONTACT=\"gnuplot-bugs@lists.sourceforge.net\" -DHELPFILE=\"/opt/gp530/share/gnuplot/5.3/gnuplot.gih\" -DGNUPLOT_X11=\"`echo gnuplot_x11 | sed 's,x,x,'`\" -DXAPPLRESDIR=\"@X11_APPDEFAULTS_DIR@\" -DGNUPLOT_QT=\"`echo gnuplot_qt | sed 's,x,x,'`\" -DQTGNUPLOT_DATA_DIR=\"/opt/gp530/share/gnuplot/5.3/qt\" -I/usr/include/lua5.3 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/cairo -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -I/usr/include/x86_64-linux-gnu/qt5/QtNetwork -I/usr/include/x86_64-linux-gnu/qt5 -I/usr/include/x86_64-linux-gnu/qt5/QtSvg -I/usr/include/x86_64-linux-gnu/qt5 -I/usr/include/x86_64-linux-gnu/qt5/QtPrintSupport -I/usr/include/x86_64-linux-gnu/qt5 -I/usr/include/x86_64-linux-gnu/qt5/QtWidgets -I/usr/include/x86_64-linux-gnu/qt5 -I/usr/include/x86_64-linux-gnu/qt5/QtGui -I/usr/include/x86_64-linux-gnu/qt5 -I/usr/include/x86_64-linux-gnu/qt5/QtCore -I/usr/include/x86_64-linux-gnu/qt5  -g -O2 -MT show.o -MD -MP -MF $depbase.Tpo -c -o show.o ../../src/show.c &&\
mv -f $depbase.Tpo $depbase.Po
../../src/show.c: In function 'show_version':
../../src/show.c:1113:14: error: 'HelpFile' undeclared (first use in this function); did you mean 'helpfile'?
   helpfile = HelpFile;
              ^~~~~~~~
              helpfile
../../src/show.c:1113:14: note: each undeclared identifier is reported only once for each function it appears in
Makefile:916: recipe for target 'show.o' failed
make[4]: *** [show.o] Error 1
make[4]: Leaving directory '/mnt/d/usr/Tatsu/wslwork/gnuplot/gnuplotdev/gnuplot/builddir/src'

[Bastian Märkisch]

Sorry. Inverted logic in defines. Fixed in master.

[Tatsuro MATSUOKA]

I still have the same error on Ubuntu 16.04 (native linux) 18.04 on WSL and Cygwin64. Please confirm.

[Bastian Märkisch]

Solution was pushed to wrong remote. Now in official repository.

[Tatsuro MATSUOKA]

--- show.orig.c 2019-03-03 12:46:43.851449100 +0900
+++ show.c      2019-03-03 14:07:13.074588800 +0900
@@ -1107,7 +1107,7 @@
 #ifndef _WIN32
            char *helpfile = NULL;
            if ((helpfile = getenv("GNUHELP")) == NULL)
-# if defined(MSDOS) || defined(OS2)
+# if !defined(MSDOS) || !defined(OS2)
                helpfile = HELPFILE;
 # else
                helpfile = HelpFile;

fixes the issue.

[Bastian Märkisch]

The correct initial change would have been

+# if !defined(MSDOS) && !defined(OS2)

or

+# if !(defined(MSDOS) || defined(OS2))

Insead, we now exchange the two cases to make it more readable.

[Tatsuro MATSUOKA]

Sorry for my carelessness. I have confirmed currect git repo. can be built without problem.
Thanks!