scsh-conservatory
/
scx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix --with-xft=no

This commit is contained in:
mainzelm 2004-02-11 22:03:12 +00:00
parent 573a31f9ea
commit ad84aa5c87
3 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
c/libs/Makefile.am
View File

@ -3,8 +3,13 @@ INCLUDES = -I@top_srcdir@/c/xlib -I@top_srcdir@/c/libs -I@x_includes@ \
noinst_LTLIBRARIES = libscxxft.la noinst_LTLIBRARIES = libscxxft.la
libscxxft_la_SOURCES = \ if WITH_XFT
xft.c xrender.c xft_sources = xft.c xrender.c
xft_libadd = -lXft
endif
libscxxft_la_LIBADD = $(X_LIBS) -lXft libscxxft_la_SOURCES = \
$(xft_sources)
libscxxft_la_LIBADD = $(X_LIBS) $(xft_libadd)
libscxxft_la_LDFLAGS= -avoid-version -module libscxxft_la_LDFLAGS= -avoid-version -module

8
configure.in
View File

@ -23,12 +23,10 @@
AC_ARG_WITH(xft, AC_ARG_WITH(xft,
AC_HELP_STRING([--with-xft], AC_HELP_STRING([--with-xft],
[Compile with Xft support]), [Compile with Xft support]))
with_xft="yes",
with_xft="no")
dnl Compile with Xft support? dnl Compile with Xft support?
if test "$with_xft" = "yes"; then if test "x$with_xft" = "xyes"; then
AC_CHECKING([xft-config program]) AC_CHECKING([xft-config program])
AC_CHECK_PROG([XFT_CONFIG], [xft-config], "yes", "no", $PATH, []) AC_CHECK_PROG([XFT_CONFIG], [xft-config], "yes", "no", $PATH, [])
@ -45,7 +43,7 @@
SCX_PREPEND(\$(XFT_OBJECTS), extra_objects) SCX_PREPEND(\$(XFT_OBJECTS), extra_objects)
AC_SUBST(load_xft_packages, yes) AC_SUBST(load_xft_packages, yes)
fi fi
AM_CONDITIONAL(WITH_XFT, test "x$with_xft" = "xyes")
schemedir='${prefix}'"/scheme" schemedir='${prefix}'"/scheme"
libdir='${prefix}'"/lib" libdir='${prefix}'"/lib"
libsysdir='${prefix}' libsysdir='${prefix}'

2
pkg-def.scm
View File

@ -10,7 +10,7 @@
(xft? (get-option-value 'with-xft)) (xft? (get-option-value 'with-xft))
(configure `("./configure" (configure `("./configure"
,(string-append "--prefix=" prefix) ,(string-append "--prefix=" prefix)
,(if xft? "--with-xft" "--without-xft") ,(if xft? "--with-xft=yes" "--with-xft=no")
,(string-append "--with-scsh-includes=" scsh-includes) ,(string-append "--with-scsh-includes=" scsh-includes)
,(string-append "--build=" build-host))) ,(string-append "--build=" build-host)))