sco5 -lgen

sco5 -lgen

[Ilya N. Golubev]

Version: 21.3

Currently "s/sco5.h" attempts to add `-lgen' to `LIBX11_SYSTEM' when
motif is enabled, but this does not work.  That is, `MOTIF' does not
get defined when "s/sco5.h" is included while generating `Makefile',
even when motif is enabled.  Perhaps something changed in c
preprocessor being used.  Anyway, can not reproduce getting `MOTIF'
defined in "s/sco5.h" even in 21.1.  So having `LIBX11_SYSTEM'
different when motif is enabled requires changes of `Makefile.in'.

	* Makefile.in (LIBX11_SYSTEM): Move definition after possible
	`MOTIF' definition.
	(MOTIF_LIBX11_SYSTEM): New, to be defined by system include files.

	* s/sco5.h (MOTIF_LIBX11_SYSTEM): Define.
	(NOT_C_CODE): use `#ifndef's to enclose code that may be harmful
	when generating `Makefile'.

===================================================================
RCS file: Makefile.in,v
retrieving revision 1.1
retrieving revision 1.1.1.1
diff -u -r1.1 -r1.1.1.1
--- Makefile.in	2003/11/04 20:29:42	1.1
+++ Makefile.in	2003/11/04 20:32:06	1.1.1.1
@@ -281,10 +281,6 @@
 #define LIBX10_SYSTEM
 #endif
 
-#ifndef LIBX11_SYSTEM
-#define LIBX11_SYSTEM
-#endif
-
 #ifndef LIB_X11_LIB
 #define LIB_X11_LIB -lX11
 #endif
@@ -338,6 +334,9 @@
 #else
 LIBW= -lXm LIB_MOTIF_EXTRA
 #endif
+#ifdef MOTIF_LIBX11_SYSTEM
+#define LIBX11_SYSTEM MOTIF_LIBX11_SYSTEM
+#endif /* def MOTIF_LIBX11_SYSTEM */
 #endif
 #ifdef OPEN_LOOK
 LIBW= -lXol
@@ -353,6 +352,10 @@
 
 #ifndef LIBXMU
 #define LIBXMU -lXmu
+#endif
+
+#ifndef LIBX11_SYSTEM
+#define LIBX11_SYSTEM
 #endif
 
 #ifdef LIBXT_STATIC
===================================================================
RCS file: s/sco5.h,v
retrieving revision 1.2
retrieving revision 1.2.1.2
diff -u -r1.2 -r1.2.1.2
--- s/sco5.h	2003/10/30 18:39:46	1.2
+++ s/sco5.h	2003/11/04 20:33:04	1.2.1.2
@@ -71,11 +71,8 @@
    if using X windows.  */
 #undef LIBX11_SYSTEM
 #define LIBX11_SYSTEM_COMMON -lpt -lnls -lnsl -lc -lsocket
-#ifdef MOTIF
-# define LIBX11_SYSTEM -lgen LIBX11_SYSTEM_COMMON
-#else /* ndef MOTIF */
-# define LIBX11_SYSTEM LIBX11_SYSTEM_COMMON
-#endif /* ndef MOTIF */
+#define MOTIF_LIBX11_SYSTEM -lgen LIBX11_SYSTEM_COMMON
+#define LIBX11_SYSTEM LIBX11_SYSTEM_COMMON
 
 #undef LIB_X11_LIB
 #define LIB_X11_LIB -lX11
@@ -114,6 +111,7 @@
 #define START_FILES pre-crt0.o /lib/crt1.o
 #define LIB_STANDARD -lc /lib/crtn.o
 
+#ifndef NOT_C_CODE
 /* Send signals to subprocesses by "typing" signal chars at them.  */
 #define SIGNALS_VIA_CHARACTERS
 
@@ -149,6 +147,7 @@
 #ifndef PENDING_OUTPUT_COUNT
 #define PENDING_OUTPUT_COUNT(FILE) ((FILE)->__ptr - (FILE)->__base)
 #endif
+#endif /* not NOT_C_CODE */
 
 /* Use ELF and get real shared libraries */