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

+ added --with-xft

This commit is contained in:
eknauel 2003-10-24 15:56:09 +00:00
parent c6dcfb9fbc
commit 2c0ade2b7d
3 changed files with 50 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
c/main.c
View File

@ -1,6 +1,8 @@
#include "scheme48.h"
#include "c/config.h"
extern void scx_init_xlib();
#ifdef WITH_XFT
extern void scx_xft_init();
extern void scx_xrender_init();

2
c/xlib/xlib.h
View File

@ -3,6 +3,8 @@
#ifndef _SCX_XLIB_H
#define _SCX_XLIB_H
#include "c/config.h"
#include <X11/X.h>
#include <X11/Xlib.h>
#include <X11/Xutil.h>

62
configure.in
View File

@ -1,21 +1,48 @@
#AC_DEFUN(
#AC_DEFUN(
define([SCX_PREPEND], [[$2]="$[$2] [$1]"])
AC_INIT
AC_CONFIG_HEADER(c/config.h)
AC_PROG_CC
AC_PATH_X
AC_ARG_WITH(scsh-includes,
AC_HELP_STRING([--with-scsh-includes=DIR],
[scsh include files are in DIR [/usr/local/include]]),
scsh_includes=$withval,
scsh_includes=/usr/local/include)
AC_SUBST(scsh_includes)
AC_ARG_WITH(scsh-libraries,
AC_HELP_STRING([--with-scsh-libraries=DIR],
[scsh libraries are in DIR [/usr/local/lib/scsh]]),
scsh_libraries=$withval,
scsh_libraries=/usr/local/lib/scsh)
AC_SUBST(scsh_libraries)
AC_ARG_WITH(scsh-modules,
AC_HELP_STRING([--with-scsh-modules=DIR],
[scsh modules are in DIR [/usr/local/lib/scsh/modules]]),
scsh_modules=$withval,
scsh_modules=/usr/local/lib/scsh/modules)
AC_SUBST(scsh_modules)
AC_INIT
AC_PROG_CC
AC_ARG_WITH(xft,
AC_HELP_STRING([--with-xft],
[Compile with Xft support]),
with_xft="yes",
with_xft="no")
AC_PATH_X
AC_SUBST(x_includes)
AC_SUBST(x_libraries)
AC_ARG_WITH(scsh-includes, [ --with-scsh-includes=DIR scsh include files are in DIR [/usr/local/include]],
scsh_includes=$withval , scsh_includes=/usr/local/include)
AC_SUBST(scsh_includes)
AC_ARG_WITH(scsh-libraries, [ --with-scsh-libraries=DIR scsh libraries are in DIR [/usr/local/lib/scsh]],
scsh_libraries=$withval , scsh_libraries=/usr/local/lib/scsh)
AC_SUBST(scsh_libraries)
AC_ARG_WITH(scsh-modules, [ --with-scsh-modules=DIR scsh modules are in DIR [/usr/local/lib/scsh/modules]],
scsh_modules=$withval , scsh_modules=/usr/local/lib/scsh/modules)
AC_SUBST(scsh_modules)
dnl Compile with Xft support?
if test "$with_xft" = "yes"; then
LIBS="$LIBS -L${x_libraries}"
AC_CHECK_LIB(Xrender, XRenderQueryExtension, SCX_PREPEND(-lXrender, x_libraries))
AC_CHECK_LIB(Xft, XftFontOpen, SCX_PREPEND(-lXft, x_libraries))
AC_DEFINE([WITH_XFT], 1, [Define 1 if compiling with Xft support])
SCX_PREPEND(\$(XFT_OBJECTS), extra_objects)
fi
#AC_MSG_CHECKING(scsh installation)
#AC_CHECK_HEADER(scheme48.h)
@ -28,5 +55,8 @@ AC_INIT
#if no_x == 'yes' fail ...
AC_SUBST(LIBS)
AC_SUBST(x_includes)
AC_SUBST(x_libraries)
AC_SUBST(extra_objects)
AC_OUTPUT(Makefile)