external/cde
1
0
Fork 0
mirror of git://git.code.sf.net/p/cdesktopenv/code synced 2025-02-13 11:42:21 +00:00
Code Issues Releases Wiki Activity

configure: remove freetype checks, we do not need freetype anymore

Browse source
This commit is contained in:
Jon Trulson 2021-07-08 16:35:51 -06:00
parent 10eb1ef8e0
commit cc60fb8241
4 changed files with 8 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
cde/configure.ac
View file

@ -418,32 +418,6 @@ AC_CHECK_LIB(Xm, XmTextSetString, [XTOOLLIB="-lXm ${XTOOLLIB}"], ,
XTOOLLIB="${EXTRA_INCS} ${EXTRA_LIBS} ${X_EXTRA_LIBS} ${XTOOLLIB}"
AC_SUBST([XTOOLLIB])
dnl Check for freetype libraries/headers
AC_CHECK_TOOLS([FREETYPE_CONFIG], [freetype-config])
if test -z "$FREETYPE_CONFIG"; then
dnl freetype-config not available try pkg-config
AC_CHECK_TOOLS([FREETYPE_CONFIG], [pkg-config])
if test -z "$FREETYPE_CONFIG"; then
AC_MSG_ERROR([Missing freetype-config or pkg-config. Install freetype development headers and library.])
fi
dnl check specific package is available
PKG_CHECK_MODULES([FREETYPE_CHECK], [freetype2])
FREETYPE_CFLAGS=`$FREETYPE_CONFIG freetype2 --cflags`
AC_SUBST(FREETYPE_CFLAGS)
FREETYPE_LIBS=`$FREETYPE_CONFIG freetype2 --libs`
AC_SUBST(FREETYPE_LIBS)
else
dnl freetype-config is available
FREETYPE_CFLAGS=`$FREETYPE_CONFIG --cflags`
AC_SUBST(FREETYPE_CFLAGS)
FREETYPE_LIBS=`$FREETYPE_CONFIG --libs`
AC_SUBST(FREETYPE_LIBS)
fi
dnl figure out pam support
AC_CHECK_LIB(pam, pam_start,

6
cde/lib/DtWidget/Makefile.am
View file

@ -6,15 +6,13 @@ lib_LTLIBRARIES = libDtWidget.la
AM_CPPFLAGS = -DCDE_INSTALLATION_TOP=$(CDE_INSTALLATION_TOP) $(DT_INCDIR)
libDtWidget_la_CFLAGS = -DI18N_MSG -DMULTIBYTE $(FREETYPE_CFLAGS)
libDtWidget_la_CFLAGS = -DI18N_MSG -DMULTIBYTE
libDtWidget_la_LDFLAGS = -version-info 2:1:0
libDtWidget_la_LIBADD = $(FREETYPE_LIBS)
if SOLARIS
libDtWidget_la_CFLAGS += -DNO_REGCOMP
libDtWidget_la_LIBADD += -lc -lw -lintl
libDtWidget_la_LIBADD = -lc -lw -lintl
endif

5
cde/programs/dtfile/Makefile.am
View file

@ -14,12 +14,11 @@ dist_bin_SCRIPTS = dtfile_error
dtfile_CPPFLAGS = -I./dtcopy -DSHAPE -D_ILS_MACROS -DSUN_PERF \
-DCDE_INSTALLATION_TOP=\"$(CDE_INSTALLATION_TOP)\" \
-DCDE_CONFIGURATION_TOP=\"$(CDE_CONFIGURATION_TOP)\" \
-DKORNSHELL=\"$(KSH)\" $(FREETYPE_CFLAGS)
-DKORNSHELL=\"$(KSH)\"
dtfile_LDADD = dtcopy/sharedFuncs.o \
dtcopy/fsrtns.o \
$(DTCLIENTLIBS) $(TIRPCLIB) -lXm -lXext $(FREETYPE_LIBS) \
$(XTOOLLIB)
$(DTCLIENTLIBS) $(TIRPCLIB) -lXm -lXext $(XTOOLLIB)
if OPENBSD
dtfile_CPPFLAGS += -DFILE_MAP_OPTIMIZE

8
cde/programs/dtlogin/Makefile.am
View file

@ -22,7 +22,7 @@ DEF_PM_PATH = $(CDE_CONFIGURATION_TOP)/appconfig/icons/%L/%B%M.pm:$(CDE_CONFIGUR
AM_CFLAGS = -DCDE_CONFIGURATION_TOP=\"$(CDE_CONFIGURATION_TOP)\" \
-DCDE_INSTALLATION_TOP=\"$(CDE_INSTALLATION_TOP)\" \
-DCDE_LOGFILES_TOP=\"$(CDE_LOGFILES_TOP)\" \
$(FREETYPE_CFLAGS) -DBINDIR=\"$(XBINDIR)\" \
-DBINDIR=\"$(XBINDIR)\" \
-DXDMDIR=\"$(XDMDIR)\" \
-DKORNSHELL=$(KSH) -DUNIXCONN -DTCPCONN -DXDMCP
@ -57,11 +57,11 @@ dtchooser_SOURCES = chooser.c dtchooser.c vglogo.c vgutil.c vgcallback.c \
vglang.c
dtlogin_LDADD = libresource.a @DTCLIENTLIBS@ -lXau -lXmu -lXext -lXdmcp \
$(FREETYPE_LIBS) $(XTOOLLIB) $(TIRPCLIB) $(DTPAMSVCLIB) $(PAM_LIB)
$(XTOOLLIB) $(TIRPCLIB) $(DTPAMSVCLIB) $(PAM_LIB)
dtgreet_LDADD = $(DTCLIENTLIBS) $(FREETYPE_LIBS) $(XTOOLLIB)
dtgreet_LDADD = $(DTCLIENTLIBS) $(XTOOLLIB)
dtchooser_LDADD = $(DTCLIENTLIBS) $(FREETYPE_LIBS) -lXmu -lXext -lXdmcp $(XTOOLLIB)
dtchooser_LDADD = $(DTCLIENTLIBS) -lXmu -lXext -lXdmcp $(XTOOLLIB)
if LINUX