diff options
| author | mjflick <mjflick> | 2004-05-15 05:44:42 +0000 |
|---|---|---|
| committer | mjflick <mjflick> | 2004-05-15 05:44:42 +0000 |
| commit | e81fc7f0fc1e84438da5fca54fc4448880aee5c9 (patch) | |
| tree | af5d42f5f121b9a008a4d337564bf97977e3c9d9 | |
| parent | 7af5fd0fe2d930e0686dc989c239479bf23d01e2 (diff) | |
| download | fontutils-e81fc7f0fc1e84438da5fca54fc4448880aee5c9.tar.gz | |
Added autoconf's X path support
| -rw-r--r-- | GNUmakefile.in | 7 | ||||
| -rw-r--r-- | configure.in | 8 |
2 files changed, 12 insertions, 3 deletions
diff --git a/GNUmakefile.in b/GNUmakefile.in index b216d77..82a29a9 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -61,12 +61,15 @@ SHELL = /bin/sh srcdir = @srcdir@ VPATH = @srcdir@ +xincdir = @x_includes@ +xlibdirp = @x_libraries@ + # Compiler option for #include <X11/...>, i.e., should start with `-I', # or -DX_DISPLAY_MISSING if X is not supported. -xincludedir = @X_CFLAGS@ +xincludedir = -I $(xincdir) # Loader option for -lX..., i.e., should start with `-L'. -xlibdir = @X_LDFLAGS@ +xlibdir = -L $(xlibdirp) CC = @CC@ CFLAGS = -g diff --git a/configure.in b/configure.in index 2dd152f..5ee5069 100644 --- a/configure.in +++ b/configure.in @@ -1,5 +1,5 @@ # Process this file with autoconf to produce a configure script. -# $Id: configure.in,v 1.3 2004/05/14 17:07:14 karl Exp $ +# $Id: configure.in,v 1.4 2004/05/15 05:44:42 mjflick Exp $ # # This file is free software; as a special exception the author gives # unlimited permission to copy and/or distribute it, with or without @@ -47,6 +47,12 @@ else echo "so you need to have gcc." fi] + +# Set paths for X +AC_PATH_X +AC_SUBST(x_includes, $x_includes) +AC_SUBST(x_libraries, $x_libraries) + # This will generate `Makefile'(s), `config.status', and our header file. AC_CONFIG_FILES([GNUmakefile doc/Makefile]) AC_OUTPUT |