Merge branch 'master' into dtdocbook

cde/lib/DtHelp/Makefile.am

@@ -16,18 +16,9 @@ libDtHelp_la_CFLAGS = -I./il -I./jpeg -I../DtSvc/DtUtil2 -DDTLIB \
 libDtHelp_la_LIBADD = $(JPEGLIB) il/libil.la $(LTLIBICONV)
 
 if SOLARIS
-libDtHelp_la_CFLAGS += -DLSB_BIT_ORDER
 libDtHelp_la_LIBADD += -lw -lgen -lm -lc
 endif
 
-if LINUX
-libDtHelp_la_CFLAGS += -DLSB_BIT_ORDER
-endif
-
-if BSD
-libDtHelp_la_CFLAGS += -DLSB_BIT_ORDER
-endif
-
 
 libDtHelp_la_SOURCES = Actions.c       AsciiSpc.c      Callbacks.c \
 		       Destroy.c       Environ_c.c     FileListUtils.c \

cde/lib/DtSearch/raima/Makefile.am

@@ -5,20 +5,20 @@ noinst_LTLIBRARIES = libraima.la
 libraima_la_LIBADD = -lc -lm
 
 libraima_la_CFLAGS = -DCDE_INSTALLATION_TOP=\"$(CDE_INSTALLATION_TOP)\" \
-		     @DT_INCDIR@ \
+		     @DT_INCDIR@ -I$(top_srcdir)/include \
 		     -DCDE_CONFIGURATION_TOP=\"$(CDE_CONFIGURATION_TOP)\" \
 		     -DNO_TRANS -DUNIX -D_POSIX_SOURCE -DMULTIBYTE
 
 if LINUX
-libraima_la_CFLAGS += -DBYTE_SWAP -D_XOPEN_SOURCE=700
+libraima_la_CFLAGS += -D_XOPEN_SOURCE=700
 endif
 
 if BSD
-libraima_la_CFLAGS += -DBYTE_SWAP -D_XOPEN_SOURCE=700
+libraima_la_CFLAGS += -D_XOPEN_SOURCE=700
 endif
 
 if SOLARIS
-libraima_la_CFLAGS += -DBYTE_SWAP -D_XOPEN_SOURCE=500 -DNO_REGCOMP
+libraima_la_CFLAGS += -D_XOPEN_SOURCE=500 -DNO_REGCOMP
 endif
 
 if HPUX

cde/lib/DtSearch/raima/dbswab.c

@@ -85,7 +85,7 @@ int	debugging_key_swabs = FALSE;
  */
 void	swab_page (char *pgbuf, FILE_ENTRY *file_ptr, SWABDIR direction)
 {
-#ifndef BYTE_SWAP
+#if defined(WORDS_BIGENDIAN)
     return;
 #else
     INT		slotno;

cde/lib/DtSearch/raima/dbswab.h

@@ -68,6 +68,7 @@
 
 #include <sys/types.h>
 #include <netinet/in.h>
+#include <autotools_config.h>
 
 /* Record number for OR_MISCREC DtSearch record */
 #define MISCREC_RECNO	3
@@ -80,7 +81,7 @@ typedef enum {HTON=1, NTOH} SWABDIR;
 
 extern void	swab_page (char *pgbuf, FILE_ENTRY *file_ptr, SWABDIR direction);
 
-#ifdef BYTE_SWAP  /* ie (BYTE_ORDER != BIG_ENDIAN) */
+#if !defined(WORDS_BIGENDIAN) /* ie (BYTE_ORDER != BIG_ENDIAN) */
 
 #define HTONL(x)	x = htonl(x)
 #define HTONS(x)	x = htons(x)

cde/programs/dtappbuilder/src/ab/attch_ed_stubs.c

@@ -1771,7 +1771,7 @@ populate_obj_menu(
      * Set the label of the menu items to be the names of the ABObj's
      */
     for (i = 0, trav_open(&trav, parent, AB_TRAV_SALIENT_CHILDREN); 
-	i < num_items_needed, (cur_obj = trav_next(&trav)) != NULL; )
+	i < num_items_needed && (cur_obj = trav_next(&trav)) != NULL; )
     {
 	char	*label;
 

cde/programs/dtcm/server/reclotick.c

@@ -141,7 +141,7 @@ ClosestTick(
 	 * to see if the duration needs to be updated.
 	 */
 	if (re->re_duration == RE_NOTSET)
-		(*res)->res_duration == RE_NOTSET;
+		(*res)->res_duration = RE_NOTSET;
 
 	return closest_tick;
 }

cde/programs/dtmail/dtmailpr/Makefile.am

@@ -7,28 +7,4 @@ dtmailpr_CXXFLAGS = -I../include -I../../dtcompat -I../../../. \
 
 dtmailpr_LDADD = ../libDtMail/libDtMail.a $(DTCLIENTLIBS) $(XTOOLLIB) $(LTLIBICONV)
 
-# FIXME - solaris
-#if SOLARIS
-# if SUNPRODIR
-# SUNPRO_DIR = /opt/SUNWspro
-# else
-# SUNPRO_DIR = SUNPRODIR
-#endif
-#if I386
-# JET -- i386 is NOT big endian...
-#dtmailpr_CXXFLAGS += -DBIG_ENDIAN
-#endif
-#if USE_SPRO_V3
-#dtmailpr_CXXFLAGS += -noex -USPRO_V2
-#if DEBUGTREE
-#dtmailpr_CXXFLAGS += -xsb
-#endif
-#endif
-#
-#dtmailpr_CXXFLAGS += -L$(SUNPRO_DIR)/lib -xstrconst -Xc -v -DMMAP_NORESERVE \
-#                    -DSPRO_V2 +p +w
-#dtmailpr_LDADD += -Bstatic -lC -Bdynamic -lc -Bstatic -ldl -lgen -lm -lw \
-#		  -lintl -lnsl
-#endif
-
 dtmailpr_SOURCES = main.C message.C mailbox.C utils.C

cde/programs/dtprintinfo/libUI/MotifUI/Dialog.C

@@ -338,7 +338,11 @@ Dialog::Dialog(MotifUI *parent, char *title, char *base_directory,
    StringFree(pattern_string);
    if (help)
     {
-      _help_callback_data = _help_callback_data;
+      // JET - this does nothing - should probably be assigned from
+      // help_callback_data, but that argument seems to have been
+      // removed from the arg list (commented out for some reason).
+      // So, I'll just comment this out for now:
+      // _help_callback_data = _help_callback_data;
       XtAddCallback(_w, XmNhelpCallback, &Dialog::DialogCB, (XtPointer) this);
     }
    else