external/cde
1
0
Fork 0
mirror of git://git.code.sf.net/p/cdesktopenv/code synced 2025-02-15 04:32:24 +00:00
Code Issues Releases Wiki Activity

DtHelp: make it build

Browse source 
Use configure's endian checks to determine whether to set LSB in il/.

Add locale.h check, include to Helpos.c

Both via including autotools_config.h.
This commit is contained in:
Jon Trulson 2019-10-26 16:05:48 -06:00
parent 63ba9bac39
commit b0cc0c8747
4 changed files with 16 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
cde/lib/DtHelp/Helpos.c
View file

@ -42,11 +42,16 @@
**************************************************************************** ****************************************************************************
************************************<+>*************************************/ ************************************<+>*************************************/
#include <sys/param.h> #include <sys/param.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <autotools_config.h>
#if defined(HAVE_LOCALE_H)
#include <locale.h>
#endif
#define X_INCLUDE_PWD_H #define X_INCLUDE_PWD_H
#define XOS_USE_XT_LOCKING #define XOS_USE_XT_LOCKING
#include <X11/Xos_r.h> #include <X11/Xos_r.h>

3
cde/lib/DtHelp/Makefile.am
View file

@ -6,7 +6,8 @@ lib_LTLIBRARIES = libDtHelp.la
libDtHelp_la_CFLAGS = -I./il -I./jpeg -I../DtSvc/DtUtil2 -DDTLIB \ libDtHelp_la_CFLAGS = -I./il -I./jpeg -I../DtSvc/DtUtil2 -DDTLIB \
-DCDE_INSTALLATION_TOP='"${prefix}"' \ -DCDE_INSTALLATION_TOP='"${prefix}"' \
-DCDE_CONFIGURATION_TOP='"$(CDE_CONFIGURATION_TOP)"' -DCDE_CONFIGURATION_TOP='"$(CDE_CONFIGURATION_TOP)"' \
@DT_INCDIR@ @DTI_INCDIR@
libDtHelp_la_LIBADD = -ljpeg il/libil.la libDtHelp_la_LIBADD = -ljpeg il/libil.la

15
cde/lib/DtHelp/il/Makefile.am
View file

@ -3,19 +3,8 @@ MAINTAINERCLEANFILES = Makefile.in
noinst_LTLIBRARIES = libil.la noinst_LTLIBRARIES = libil.la
libil_la_CFLAGS = -I.. -DDTLIB -DCDE_INSTALLATION_TOP='"${prefix}"' \ libil_la_CFLAGS = -I.. -DDTLIB -DCDE_INSTALLATION_TOP='"${prefix}"' \
-DCDE_CONFIGURATION_TOP='"$(CDE_CONFIGURATION_TOP)"' -DCDE_CONFIGURATION_TOP='"$(CDE_CONFIGURATION_TOP)"' \
@DT_INCDIR@ @DTI_INCDIR@
if BSD
libil_la_CFLAGS += -DLSB_BIT_ORDER
else
if LINUX
libil_la_CFLAGS += -DLSB_BIT_ORDER
else
if SUN
libil_la_CFLAGS += -DLSB_BIT_ORDER
endif
endif
endif
libil_la_SOURCES = ilX.c ilbigray.c ilcodec.c \ libil_la_SOURCES = ilX.c ilbigray.c ilcodec.c \
ilcontext.c ilconvert.c ilcrop.c \ ilcontext.c ilconvert.c ilcrop.c \

6
cde/lib/DtHelp/il/ilint.h
View file

@ -43,6 +43,12 @@
/* General internal definitions for Image Library (IL). /* General internal definitions for Image Library (IL).
*/ */
/* use autotools detection to determine endianess */
#include <autotools_config.h>
#ifndef WORDS_BIGENDIAN
# define LSB_BIT_ORDER
#endif
#include <stddef.h> /* for size_t declaration */ #include <stddef.h> /* for size_t declaration */
#ifndef IL_H #ifndef IL_H
#include "il.h" #include "il.h"