Commit Graph

1882 Commits

Author SHA1 Message Date
Jon Trulson 7f4889f348 freetype: redo the way we detect and use
We (configure) relies on freetype-config existing and telling us what
the proper includes and libs are.
2020-01-05 18:11:52 -07:00
Jon Trulson 4d12673147 configure: detect and use jpeg library 2020-01-05 16:27:17 -07:00
Jon Trulson 00dcd9c63d FreeBSD 12: get CDE to build and run
With this patch, CDE (autotools) builds and runs on fbsd 12 now.
fbsd11 should work too, but not yet tested.

You must use gmake - ie:

./configure MAKE=gmake
gmake

Seems all of the BSD's will need to use gmake for now.
2020-01-04 16:26:46 -07:00
Jon Trulson 2f8a2ec066 FreeBSD 12/libDtHelp: fix link errors with missing libjpeg 2020-01-04 14:36:06 -07:00
Jon Trulson da6f570381 configure: get the language enable options working 2020-01-02 22:14:23 -07:00
Jon Trulson f246e25e55 configure: fix some bsd issues
1. On OpenBSD, and check is made for only bison or byacc.  yacc is
present, but not usable apparently.  So - need to install bison on the
BSD's.

2. the libjpeg.h check fails as it is located in a non-standard
location (/usr/local) on BSD systems.  Just remove the check for now
until we have a better way to check that stuff (like X11 and Xm
headers too).
2020-01-02 19:20:53 -07:00
Jon Trulson 3b1a54ca81 configure: add some more error checking/reporting for required programs
A list of major things like ksh, cpp, etc are saved in a list if they
are not found.  If this list is non-empty when configure is nearly
done, an error message is displayed listing the missing programs.
This is less annoying than stopping after every missing programs.

Also, removed the X11/Xm header checks for now.  Those need to take
into account X_CFLAGS in some way since these files are located in
dirfferent areas on different OS's (obsd puts them in
/usr/X11R6/include for example).
2020-01-02 18:35:36 -07:00
Jon Trulson f634c682df configure: make sure X_EXTRA_LIBS and X_PRE_LIBS are accounted for 2020-01-02 18:35:36 -07:00
Peter Howkins 8ae6933a15 Add a few configure checks to make sure various programs and headers
needed for build are available.
2020-01-02 23:59:53 +00:00
Jon Trulson 005c72b917 Merge branch 'master' into autotools-conversion 2019-12-15 15:18:41 -07:00
Chase 008512c777 extra.h: remove unused prototypes 2019-12-15 14:07:52 -07:00
Chase f28abfe8dd dtksh: remove needless OS defines 2019-12-15 14:07:52 -07:00
Chase cc73d03e49 dtkcmds.c: avoid c99 collision 2019-12-15 14:07:52 -07:00
Chase 3152b0bc4e dtksh: remove unused files and functions 2019-12-15 14:07:52 -07:00
Jon Trulson 6c0c619df3 configure: set a compiler search option
... and move the PROG_CC and PROG_CXX checks toward the beginning.
Without the move the compiler search arguments are ignored.  We search
for 'cc gcc clang' and 'c++ g++ clang++', in that order for CC and CXX
respectively.

This means there should be no need to override the CC
and CXX variables on the configure command line for BSD systems.

On OpenBSD for example, cc links to clang.  On Linux, cc links to
gcc.  You can still override these if you like with CC=... and
CXX=... on the configure command line.

gmake (MAKE=gmake) still needs to be used on the BSD's though.

With these and previous changes, CDE builds, installs, and runs
correctly on OpenBSD 6.5 now.
2019-12-15 12:47:57 -07:00
Jon Trulson dd729a7be9 _common.dt.tmsg: remove unportable quote hackery 2019-12-15 12:34:00 -07:00
Jon Trulson e4e8b323c7 localized: use proper mkcatdefs for the Motif catalogs 2019-12-15 11:20:36 -07:00
Jon Trulson 9b2534efab dtsession: do not hardcode -lcrypt on link 2019-12-14 19:14:52 -07:00
Jon Trulson 617865da94 gencat: get rid of -o option, not needed and not supported on some systems 2019-12-14 19:05:35 -07:00
Jon Trulson c0a6f6c6e3 configure: fix another bsd related typo 2019-12-14 19:04:22 -07:00
Jon Trulson c1078e464a dtlogin: build on openbsd 2019-12-14 18:22:49 -07:00
Jon Trulson d0ce42db9e dtopen/Makefile.am: fix typo in link for pdf handler 2019-12-14 14:21:41 -07:00
Jon Trulson c0da389d46 configure: first stab at a BSD (openbsd 6.5) build 2019-12-14 14:17:07 -07:00
Jon Trulson b19aa1b21f dtopen: install symlinked helpers
With this commit, CDE can install and run now.  There are still some
programs/ that are not yet built:

dthelp dtksh dtappbuilder dtdocbook dtinfo nsgmls ttsnoop

and of course documentation (doc/).  But this is a great start.  For
the first time, things build, install, AND run correctly :)
2019-12-04 18:26:32 -07:00
Jon Trulson 973ebf9ed0 library versioning: use proper format and specify for ALL libraries 2019-12-04 18:09:22 -07:00
Jon Trulson 7c81d9d19d programs/Makefile.am: add missing palettes/ dir 2019-12-04 16:36:09 -07:00
Jon Trulson 1b5d18f604 fontaliases: redo the way these are built, and actually install them
Use a common make include file to do most of the work and set the
appropriate LANG from localized/templates/ .  This should simplify it
quite a bit and reduce duplication.

Also we were not even installing them, so now we are.
2019-12-04 15:47:28 -07:00
Jon Trulson 25035724af cpp revisited: look for a cpp binary in various locations for use at runtime
Certain programs like dtlogin and tt_type_comp need access to the
system's cpp command to process certain files at runtime.  tradcpp is
not installed on most systems, and is intended for use as a imake-cpp
replacement which is all we are using it for.  We still need an
honest cpp for the CDE components to use.

Now, we look in various places for a 'cpp' command and set CPP_COMMAND
to it's value.  This way tt_type_comp and other CDE programs can do
required processing at runtime.
2019-12-04 14:28:44 -07:00
Jon Trulson 65ce14c419 dtwm: don't install Dtwm.defs - that is processed/handled by localization 2019-12-04 13:43:18 -07:00
Jon Trulson 7364f62ce8 icons: install in proper C/ subdir 2019-12-04 13:22:11 -07:00
Jon Trulson 21cf53c0d0 Fix palette and backdrops installation in dt/shared with proper symlinks 2019-12-04 13:21:31 -07:00
Jon Trulson ec8f4b7464 tradcpp: upgrade to 0.5.3 2019-12-03 18:13:27 -07:00
Jon Trulson 15dfdf231a dtsession/SrvPalette.c: delete trailing whitespace 2019-12-03 17:14:32 -07:00
Jon Trulson eb986d8018 dtsession/SrvPalette.c: fix bogus error handling when selection is lost 2019-12-03 17:10:35 -07:00
Jon Trulson 48dd0a54f3 dtlogin/dtsession: fix up some script perms, add proper OS defines 2019-12-03 14:06:18 -07:00
Jon Trulson 005c328779 dtlogin: set correct OS defines for Xsession, fix linux maildir 2019-12-03 13:07:19 -07:00
Jon Trulson 0d69a14ab3 videoTypes.dt: remove duplicate LABEL in Print action 2019-12-03 13:06:21 -07:00
Jon Trulson 8c19b67032 dtsession: add missing dtsession_res script 2019-12-02 23:02:08 -07:00
Jon Trulson 6f27da77d9 dtwm: fix installation 2019-12-02 23:01:08 -07:00
Jon Trulson 751e85d877 dtlogin: fixup some of the options 2019-12-02 23:00:16 -07:00
Jon Trulson ce02cc49d6 dtlogin: install Xsession properly 2019-12-02 22:13:39 -07:00
Jon Trulson cdc9eae583 Get tttypes installed correctly.
There is a problem with CPP_PROGRAM - using $CPP or $GENCPP (tradcpp)
always fails in tt_type_comp with the error:

"nclude ", line 8: syntax error

If I define it to /lib/cpp (previous hardcoded value) then it seems to
work fine.  Only the dtinfo and dtinfo_start ptypes use #include, and
therefore show this error.  Needs investigation.
2019-12-02 19:59:44 -07:00
Jon Trulson 0cc0766cbd Get the dt types installed properly on make install 2019-12-02 19:31:02 -07:00
Jon Trulson c6b31ebd5f Get the palettes installed properly on make install 2019-12-02 19:20:36 -07:00
Jon Trulson e479b2082b Get the message catalogs installed properly on make install 2019-12-02 19:06:31 -07:00
Jon Trulson c40f0c9f08 Get /usr/dt/config populated correctly on make install 2019-12-02 14:33:05 -07:00
Jon Trulson 5823e95e03 Install backdrops in proper location, install localization for them 2019-12-02 13:08:52 -07:00
Jon Trulson 435ca4553f app-defaults.am: tweak installation 2019-12-02 13:08:06 -07:00
Jon Trulson d7a734c171 Get app-defaults installing correctly 2019-12-01 22:37:59 -07:00
Jon Trulson 6c07a2ae69 linux.cf: always use bison
For some reason, whenever OSMajorVersion was >= 2 (this equates to a
2.x kernel or above), yacc would be used instead of bison.

On Ubuntu, and probably other linux systems, yacc is just a shell
wrapper around bison, so let's just use that directly.
2019-12-01 19:18:00 -07:00
Jon Trulson e577e8102c tt_type_comp: incorporate master CPP_PROGRAM fix into Makefile.am 2019-12-01 13:44:02 -07:00
Jon Trulson e481f4cb93 Merge branch 'master' into autotools-conversion 2019-12-01 13:31:21 -07:00
Jon Trulson 081b6c8765 programs/dtimsstart/Makefile.am: fix typo 2019-11-30 22:21:48 -07:00
Jon Trulson ab393fbef1 localization: disable parallel builds for app-defaults, types, and config
These use the 'merge' utility which hardcodes temp files and the like
- it cannot be run with other instances without generating bogus
errors and occasionally coredumping. :(
2019-11-30 20:49:10 -07:00
Jon Trulson d8e218c865 localization: finish up with getting message catalogs building
There are still some issues here - specifically with the C
dtbuilder/dtcodegen catalogs.  They may be broken due to dtbuilder not
being built yet.

Also, once dtinfo can be built, the msgs and app-defaults for it
should be re-enabled.

I also see gencat coredumping in localization/ while doing a multicore
(-jX) make.  Regular single core builds seem to work fine.
2019-11-30 20:26:59 -07:00
Jon Trulson 52cc31b203 root Makefile.am: disable doc/ for now 2019-11-30 20:07:03 -07:00
Jon Trulson d9749f5c9c localized: temporarily disable dtinfo appdefaults 2019-11-30 20:04:06 -07:00
Jon Trulson 805d22c5a8 localized: make palettes build 2019-11-30 17:12:15 -07:00
Jon Trulson bfc5b2eef1 localized: make types build 2019-11-30 17:00:34 -07:00
Jon Trulson d89d47bded localized: make backdrops build 2019-11-30 17:00:00 -07:00
Jon Trulson 376f1e15ee localized: make configs build 2019-11-30 16:59:14 -07:00
Marcin Cieślak 5cebd7c4da dtdocbook/instant: fix buffer overlow on German umlaut in latin-1
One-off error:

Old buffer length was 6 for one character (3 * 1 + 3)
We need one more byte par character in the buffer for
the hex representation of it.

+0 '"'
+1 '\\'
+2 'x'
+3 'f'
+4 'c'
+5 '"'
+6 0x0 << overflow

tcl combined with RCHECK will abort because memory blocks
are allocated contiguously and we overwrite the magic marker
of the next block.
2019-11-30 10:13:43 -07:00
Nina Didenko 9221c55a5f tt_type_comp: use CppCmd definition
Hi.

This patch makes tt_type_comp respect CppCmd

Thanks!
2019-11-29 18:12:20 -07:00
Jon Trulson e42c0cc1be localization: make FR, DE, IT, and ES app-defaults/ build 2019-11-24 18:55:11 -07:00
Jon Trulson 3ee747ac6b localized/C/app-defaults: make it build 2019-11-24 17:54:52 -07:00
Jon Trulson 0aec3c159f merge, mkcatdefs: add missing includes, clean up trailing whitespace 2019-11-24 17:50:18 -07:00
Jon Trulson 0a62def9bd dthello: build the resource file Dthello 2019-11-24 17:01:57 -07:00
Jon Trulson a5a5d83cbd dtprintinfo: fix a mulit-core build race, for realz this time 2019-11-22 17:35:29 -07:00
Jon Trulson 56fb574793 dtopen: make it build
Also, move localized subdir to last in current list of programs/ SUBDIRS
2019-11-22 17:18:51 -07:00
Jon Trulson aa0bfe0471 dttypes: make it build 2019-11-22 17:07:34 -07:00
Jon Trulson ad2ad2b66b tttypes: make it build 2019-11-22 16:58:58 -07:00
Jon Trulson c8c1f986f8 types: make it build 2019-11-22 16:57:47 -07:00
Jon Trulson 264871cefb Fix up a couple issues with multi-core builds and 2 race conditions 2019-11-22 13:42:02 -07:00
Jon Trulson 89f91f0091 dtpdmd: make it build 2019-11-22 13:13:41 -07:00
Jon Trulson a63016758e dtsr: make it build; configure: fix cpu detection 2019-11-22 13:01:36 -07:00
Jon Trulson 53d3304ebe dtpdm: make it build 2019-11-22 12:12:23 -07:00
Jon Trulson bcc1ca537e dtimsstart: make it build 2019-11-21 20:06:29 -07:00
Jon Trulson 97b14a9efc programs: disable ttsnoop for now 2019-11-21 19:54:09 -07:00
Jon Trulson 2832a1eb6d dtdspmsg: make it build 2019-11-21 19:53:30 -07:00
Jon Trulson 70c07a7b68 fontaliases: make it build, and rework somewhat 2019-11-21 19:47:38 -07:00
Jon Trulson 5bb7b74efd dtprintinfo: make it build
Also, it was easier just to use a single Makefile.am rather than one for
every subdir, so thats what we did here.
2019-11-21 17:51:35 -07:00
Jon Trulson afabfd8bd7 configure: rework libXinerama detection a bit, remove hardcoded -lXinerama's
Make -lXinerama a dep on libDtXinerama so it doen't need to be
specified in Makefile.am files or in LIBS as it was being done
previously.

This still needs a little work, ideally Xinerama should be completely
optional and only enabled if present.  But we can save that for
later.
2019-11-21 14:14:59 -07:00
Jon Trulson b71a319133 dtmailpr: fix vla warning 2019-11-21 14:13:48 -07:00
Nina Didenko 8db8a22906 installCDE: don't hardcode path to whoami
Hi.

Patch removes hardcoded paths to echo and whoami in installation scripts.

Thanks.
2019-11-20 19:08:22 -07:00
Jon Trulson c329d5cfd7 Remove $(TIRPCINC) from all Makefile.am files - it no longer exists
Also, restructure some of the dependencies in the lib/tt binaries.  We
will link with libtt (which will include libtirpc as a dependency),
and XTOOLLIB - all the right X11 stuff without needing to add it to
every OS.  Removed several uneeded OS specializations ("if LINUX",
etc) as a result.
2019-11-20 18:52:29 -07:00
Jon Trulson 0f1223a07e configure: rework the way TIRPC is detected and handled
Previously we would detect whether TIRPC is installed or not, and set
TIRPCINC to the include directory with the -DOPT_TIRPC macro defined.
Then, pretty much every Makefile.am needs to be sure that $(TIRPCINC) is
specified in the cpp/c/cxx flags.

Since we can never be sure that an RPC header file might be indirectly
included, a better approach is to simply add TIRPCINC to the global
list of CXXFLAGS and CFLAGS in configure.ac for everybody.  This way,
it is always specified properly on tirpc systems, and we don't need to
always add it to every individual Makefile.am since everyone will get
it by default.

TIRPCLIB is still marked as a dep in libtt, so as long as libtt is
linked, you should automatically get the tirpc library too.  This is
still unchanged.
2019-11-20 18:26:59 -07:00
Jon Trulson 10eb9a6975 dtcreate: make it build 2019-11-20 17:54:12 -07:00
Jon Trulson 58505b904d dtconfig: make it build 2019-11-20 17:46:20 -07:00
Jon Trulson 660be1c5cc dtconfig: get rid of obsolete imb/ and hp/ configs 2019-11-20 17:37:34 -07:00
Jon Trulson 9c70437ee7 dtprintegrate: make it build 2019-11-20 17:31:53 -07:00
Jon Trulson a2c18db66b dtappintegrate: make it build 2019-11-20 17:31:53 -07:00
Jon Trulson e831b06896 dtsearchpath: make it build 2019-11-20 17:31:53 -07:00
Jon Trulson 444aa700c0 dtcm: make it build 2019-11-20 17:31:53 -07:00
Jon Trulson 763cac54e4 dtspcd/dtterm: use proper DT_INCDIR rather than hardcoding the location 2019-11-20 17:31:53 -07:00
Jon Trulson 427a0611cd dtscreen: make it build 2019-11-19 19:59:20 -07:00
Jon Trulson 9d6dbad63f dtscreen/Dtscreen.src: remove __hpux specialization 2019-11-19 19:58:55 -07:00
Jon Trulson e675e06dd1 dtspcd: make it build 2019-11-19 19:43:34 -07:00
Jon Trulson a8085dca9b dtaction: make it build 2019-11-19 19:30:20 -07:00
Jon Trulson 61506685a4 dtcalc: make it build 2019-11-19 19:27:47 -07:00
Jon Trulson 0e2dc55e9e dtterm/util: delete this non-used stuff 2019-11-19 19:15:17 -07:00