|
Line
Link Here
|
| 0 |
-- configure.in |
0 |
++ configure.in |
|
Lines 44-49
Link Here
|
| 44 |
AC_PROG_INSTALL |
44 |
AC_PROG_INSTALL |
| 45 |
AC_PROG_LN_S |
45 |
AC_PROG_LN_S |
| 46 |
AC_PROG_MAKE_SET |
46 |
AC_PROG_MAKE_SET |
|
|
47 |
AC_PATH_PROG([PKGCONFIG], [pkg-config]) |
| 48 |
AS_IF([test "x$PKGCONFIG" = "x"], |
| 49 |
[AC_MSG_ERROR([pkg-config not found!])]) |
| 47 |
|
50 |
|
| 48 |
AC_CHECK_PROGS(BUILD_CC,gcc cc ${CC},gcc) |
51 |
AC_CHECK_PROGS(BUILD_CC,gcc cc ${CC},gcc) |
| 49 |
AC_CHECK_PROG(AR,${AR:-ar},${AR:-ar},ar) |
52 |
AC_CHECK_PROG(AR,${AR:-ar},${AR:-ar},ar) |
|
Lines 55-60
Link Here
|
| 55 |
dnl doesn't work if gd isn't where the compiler can find it |
58 |
dnl doesn't work if gd isn't where the compiler can find it |
| 56 |
dnl AC_CHECK_LIB(gd, gdImageCreateFromGif) |
59 |
dnl AC_CHECK_LIB(gd, gdImageCreateFromGif) |
| 57 |
|
60 |
|
|
|
61 |
PKG_CHECK_MODULES([X], [x11]) |
| 62 |
PKG_CHECK_MODULES([Z], [zlib]) |
| 63 |
PKG_CHECK_MODULES([PNG], [libpng]) |
| 64 |
|
| 58 |
dnl Checks for header files. |
65 |
dnl Checks for header files. |
| 59 |
|
66 |
|
| 60 |
AC_PATH_XTRA |
67 |
AC_PATH_XTRA |
|
Lines 69-125
Link Here
|
| 69 |
AC_FUNC_UTIME_NULL |
76 |
AC_FUNC_UTIME_NULL |
| 70 |
AC_CHECK_FUNCS(gettimeofday mkdir strdup strstr) |
77 |
AC_CHECK_FUNCS(gettimeofday mkdir strdup strstr) |
| 71 |
|
78 |
|
| 72 |
opt_gd= |
|
|
| 73 |
AC_ARG_WITH(z,[ --with-z=DIR location of the ZLIB library],opt_z=$withval) |
| 74 |
AC_ARG_WITH(png,[ --with-png=DIR location of the PNG library],opt_png=$withval) |
| 75 |
|
| 76 |
case "$with_z" in |
| 77 |
yes|no) AC_MSG_ERROR([ |
| 78 |
*** Directory must be specified for --with-z]) |
| 79 |
;; |
| 80 |
"") |
| 81 |
Z_CFLAGS= |
| 82 |
Z_LIBS=-lz |
| 83 |
;; |
| 84 |
*) |
| 85 |
if test -f $with_z/include/z.h |
| 86 |
then |
| 87 |
Z_CFLAGS=-I$with_z/include |
| 88 |
else |
| 89 |
Z_CFLAGS=-I$with_z |
| 90 |
fi |
| 91 |
if test -f $with_z/lib/libz.a |
| 92 |
then |
| 93 |
Z_LIBS=$with_z/lib/libz.a |
| 94 |
else |
| 95 |
Z_LIBS=$with_z/libz.a |
| 96 |
fi |
| 97 |
;; |
| 98 |
esac |
| 99 |
|
| 100 |
case "$with_png" in |
| 101 |
yes|no) AC_MSG_ERROR([ |
| 102 |
*** Directory must be specified for --with-png]) |
| 103 |
;; |
| 104 |
"") |
| 105 |
PNG_CFLAGS= |
| 106 |
PNG_LIBS= |
| 107 |
;; |
| 108 |
*) |
| 109 |
if test -f $with_png/lib/png.h |
| 110 |
then |
| 111 |
PNG_CFLAGS=-I$with_png/lib |
| 112 |
else |
| 113 |
PNG_CFLAGS=-I$with_png/include/X11 |
| 114 |
fi |
| 115 |
if test -f $with_png/lib/libPng.a |
| 116 |
then |
| 117 |
PNG_LIBS="-L$with_png/lib" |
| 118 |
else |
| 119 |
PNG_LIBS="-L$with_png" |
| 120 |
fi |
| 121 |
;; |
| 122 |
esac |
| 123 |
|
79 |
|
| 124 |
AC_SUBST(Z_CFLAGS) |
80 |
AC_SUBST(Z_CFLAGS) |
| 125 |
AC_SUBST(Z_LIBS) |
81 |
AC_SUBST(Z_LIBS) |
|
Lines 127-132
Link Here
|
| 127 |
AC_SUBST(PNG_CFLAGS) |
83 |
AC_SUBST(PNG_CFLAGS) |
| 128 |
AC_SUBST(PNG_LIBS) |
84 |
AC_SUBST(PNG_LIBS) |
| 129 |
|
85 |
|
|
|
86 |
AC_SUBST(X_LIBS) |
| 87 |
AC_SUBST(X_CFLAGS) |
| 88 |
|
| 130 |
AC_SUBST(PDA) |
89 |
AC_SUBST(PDA) |
| 131 |
|
90 |
|
| 132 |
AC_OUTPUT(Makefile lib/Makefile games/Makefile tests/Makefile) |
91 |
AC_OUTPUT(Makefile lib/Makefile games/Makefile tests/Makefile) |
| 133 |
-- lib/Makefile.am |
92 |
++ lib/Makefile.am |
|
Lines 5-22
Link Here
|
| 5 |
|
5 |
|
| 6 |
CLEANFILES = images.c images.d |
6 |
CLEANFILES = images.c images.d |
| 7 |
|
7 |
|
| 8 |
INCLUDES = $(X_CFLAGS) @PDA@ |
8 |
INCLUDES = $(X_CFLAGS) $(PNG_CFLAGS) $(Z_CFLAGS) @PDA@ |
| 9 |
AM_LDFLAGS = $(X_LIBS) |
|
|
| 10 |
|
9 |
|
| 11 |
BUILD_CC = @BUILD_CC@ |
10 |
BUILD_CC = @BUILD_CC@ |
| 12 |
AR = @AR@ |
11 |
AR = @AR@ |
| 13 |
STRIP = @STRIP@ |
12 |
STRIP = @STRIP@ |
| 14 |
|
13 |
|
| 15 |
libcards_la_LDFLAGS = -version-info 1:0:0 $(AM_LDFLAGS) |
14 |
libcards_la_LDFLAGS = -version-info 1:0:0 |
| 16 |
|
15 |
|
| 17 |
libcards_la_SOURCES = table.c help.c stack.c imagelib.c xwin.c \ |
16 |
libcards_la_SOURCES = table.c help.c stack.c imagelib.c xwin.c \ |
| 18 |
images.c table_rn.c funcs.c |
17 |
images.c table_rn.c funcs.c |
| 19 |
|
18 |
|
|
|
19 |
libcards_la_LIBADD = $(X_LIBS) $(PNG_LIBS) $(Z_LIBS) |
| 20 |
|
| 20 |
# table_ai.c table_ck.c table_dc.c table_dg.c \ |
21 |
# table_ai.c table_ck.c table_dc.c table_dg.c \ |
| 21 |
#table_dp.c table_in.c table_ky.c table_rd.c table_rs.c |
22 |
#table_dp.c table_in.c table_ky.c table_rd.c table_rs.c |
| 22 |
|
23 |
|
| 23 |
-- games/Makefile.am |
24 |
++ games/Makefile.am |
|
Lines 30-37
Link Here
|
| 30 |
|
30 |
|
| 31 |
STRIP = @STRIP@ |
31 |
STRIP = @STRIP@ |
| 32 |
|
32 |
|
| 33 |
INCLUDES = -I$(srcdir)/../lib $(X_CFLAGS) @PDA@ |
33 |
INCLUDES = -I$(srcdir)/../lib @PDA@ |
| 34 |
AM_LDFLAGS = $(X_LIBS) |
|
|
| 35 |
|
34 |
|
| 36 |
canfield_SOURCES = canfield.c canfield-img.c |
35 |
canfield_SOURCES = canfield.c canfield-img.c |
| 37 |
freecell_SOURCES = freecell.c freecell-help.c freecell-img.c |
36 |
freecell_SOURCES = freecell.c freecell-help.c freecell-img.c |
|
Lines 52-58
Link Here
|
| 52 |
solitaire-help.c solitaire-img.c spider-help.c spider-img.c \ |
51 |
solitaire-help.c solitaire-img.c spider-help.c spider-img.c \ |
| 53 |
taipedit-help.c taipedit-img.c taipei-help.c taipei-img.c |
52 |
taipedit-help.c taipedit-img.c taipei-help.c taipei-img.c |
| 54 |
|
53 |
|
| 55 |
LDADD = ../lib/libcards.la -lpng -lz -lX11 -lm |
54 |
LDADD = ../lib/libcards.la -lm |
| 56 |
|
55 |
|
| 57 |
EXTRA_DIST = $(wildcard *.png) $(wildcard *.tp) |
56 |
EXTRA_DIST = $(wildcard *.png) $(wildcard *.tp) |
| 58 |
|
57 |
|
