Re: GNUPLOT_PS_DIR problem [was Re: the next release]

[<tim...@en...>]

Ethan Merritt wrote:
> (2) Whatever build environment you are using fails to=20
>     #include "PostScript/prologues.h"
>     when building the postscript terminal.
>
> Please find the following line in post.trm:
>
>   #if defined(_Windows)
>   # include "win/winmain.h"
>   #elif defined(OS2)
>   # define INCL_DOSPROCESS
>   # define INCL_DOSMODULEMGR
>   # include <os2.h>
>  =20
>>> #elif !defined(GNUPLOT_PS_DIR)
>>>      =20
>   #  include "PostScript/prologues.h"
>   #endif
>
> And try changing it to
>
>   #if defined(_Windows)
>   # include "win/winmain.h"
>   #elif defined(OS2)
>   # define INCL_DOSPROCESS
>   # define INCL_DOSMODULEMGR
>   # include <os2.h>
>  =20
>>> #endif
>>> #if !defined(GNUPLOT_PS_DIR)
>>>      =20
>   #  include "PostScript/prologues.h"
>   #endif
>
> I think that will work, but whether or not it is truly
> the correct fix is another question.
>  =20
Oh yes, you're right, there was a problem here. Your fix is correct, but=20
we can also avoid to include the headers altogether when using the=20
internal headers :

#if defined(GNUPLOT_PS_DIR)
# if defined(_Windows)
#  include "win/winmain.h"
# elif defined(OS2)
#  define INCL_DOSPROCESS
#  define INCL_DOSMODULEMGR
#  include <os2.h>
# endif
#else
# include "PostScript/prologues.h"
#endif


Best regards,

Timoth=E9e