annotate configure.in @ 1862:e38bc8018e9e

don't need --use-images with fltk2-config This brings fltk's image/* files into the equation (which turn into libfltk2_images.a). Since dillo doesn't use them, ld seems to have the good sense not to add any of it in, but we can save it the trouble of looking through it...
author corvid <corvid@lavabit.com>
date Sun, 09 Jan 2011 17:57:17 +0000
parents a098599bb580
children ece02d1a09cc
rev   line source
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1 dnl Process this file with aclocal, autoconf and automake.
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
2
1785
ef68139142bb configure.in: modernize the initialization of autoconf/automake.
Jeremy Henty <onepoint@starurchin.org>
parents: 1775
diff changeset
3 AC_INIT([dillo], [2.2])
1786
dedb666768cf configure.in: move AC_CANONICAL_SYSTEM to fix an autoconf warning.
Jeremy Henty <onepoint@starurchin.org>
parents: 1785
diff changeset
4
dedb666768cf configure.in: move AC_CANONICAL_SYSTEM to fix an autoconf warning.
Jeremy Henty <onepoint@starurchin.org>
parents: 1785
diff changeset
5 dnl Detect the canonical host and target build environment
dedb666768cf configure.in: move AC_CANONICAL_SYSTEM to fix an autoconf warning.
Jeremy Henty <onepoint@starurchin.org>
parents: 1785
diff changeset
6 AC_CANONICAL_SYSTEM
dedb666768cf configure.in: move AC_CANONICAL_SYSTEM to fix an autoconf warning.
Jeremy Henty <onepoint@starurchin.org>
parents: 1785
diff changeset
7
1785
ef68139142bb configure.in: modernize the initialization of autoconf/automake.
Jeremy Henty <onepoint@starurchin.org>
parents: 1775
diff changeset
8 AM_INIT_AUTOMAKE
ef68139142bb configure.in: modernize the initialization of autoconf/automake.
Jeremy Henty <onepoint@starurchin.org>
parents: 1775
diff changeset
9 AC_CONFIG_SRCDIR([src/dillo.cc])
ef68139142bb configure.in: modernize the initialization of autoconf/automake.
Jeremy Henty <onepoint@starurchin.org>
parents: 1775
diff changeset
10 AC_CONFIG_HEADERS([config.h])
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
11
1164
8f682d270874 group dillo system config files into a dillo subdir; have Paths use it
corvid <corvid@lavabit.com>
parents: 996
diff changeset
12 sysconfdir=${sysconfdir}/${PACKAGE}
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
13
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
14 dnl Options
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
15
300
74108abc6931 - reversed a mistaken patch.
jcid
parents: 299
diff changeset
16 AC_ARG_WITH(jpeg-lib, [ --with-jpeg-lib=DIR Specify where to find libjpeg], LIBJPEG_LIBDIR=$withval)
74108abc6931 - reversed a mistaken patch.
jcid
parents: 299
diff changeset
17 AC_ARG_WITH(jpeg-inc, [ --with-jpeg-inc=DIR Specify where to find libjpeg's headers], LIBJPEG_INCDIR=$withval)
74108abc6931 - reversed a mistaken patch.
jcid
parents: 299
diff changeset
18
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
19 AC_ARG_ENABLE(efence, [ --enable-efence Try to compile and run with Electric Fence],
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
20 , enable_efence=no)
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
21 AC_ARG_ENABLE(gprof, [ --enable-gprof Try to compile and run with profiling enabled],
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
22 , enable_gprof=no)
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
23 AC_ARG_ENABLE(insure, [ --enable-insure Try to compile and run with Insure++],
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
24 , enable_insure=no)
300
74108abc6931 - reversed a mistaken patch.
jcid
parents: 299
diff changeset
25 AC_ARG_ENABLE(ansi, [ --enable-ansi Try to compile and run with ANSI flags],
74108abc6931 - reversed a mistaken patch.
jcid
parents: 299
diff changeset
26 , enable_ansi=no)
427
jcid
parents: 424
diff changeset
27 AC_ARG_ENABLE(ssl, [ --enable-ssl Enable ssl, https (ALPHA CODE)],
424
479f5df04b37 - Switched SSL enabled to configure.in (./configure --enable-ssl)
jcid
parents: 405
diff changeset
28 , enable_ssl=no)
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
29 AC_ARG_ENABLE(ipv6, [ --enable-ipv6 Build with support for IPv6], , )
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
30 AC_ARG_ENABLE(cookies,[ --disable-cookies Don't compile support for cookies],
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
31 , enable_cookies=yes)
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
32 AC_ARG_ENABLE(png, [ --disable-png Disable support for PNG images],
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
33 enable_png=$enableval, enable_png=yes)
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
34 AC_ARG_ENABLE(jpeg, [ --disable-jpeg Disable support for JPEG images],
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
35 enable_jpeg=$enableval, enable_jpeg=yes)
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
36 AC_ARG_ENABLE(gif, [ --disable-gif Disable support for GIF images],
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
37 enable_gif=$enableval, enable_gif=yes)
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
38 AC_ARG_ENABLE(threaded-dns,[ --disable-threaded-dns Disable the advantage of a reentrant resolver library],
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
39 enable_threaded_dns=$enableval, enable_threaded_dns=yes)
347
e5955ab8dafb - Moved the dw2 tree into dillo2's tree.
jcid
parents: 300
diff changeset
40 AC_ARG_ENABLE(rtfl, [ --enable-rtfl Build with rtfl messages])
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
41 AC_PROG_CC
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
42 AC_PROG_CXX
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
43 AC_PROG_RANLIB
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
44 AC_PROG_CPP
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
45
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
46 dnl ----------------------------
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
47 dnl Check our char and int types
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
48 dnl ----------------------------
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
49 dnl
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
50 AC_CHECK_SIZEOF(char)
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
51 AC_CHECK_SIZEOF(short)
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
52 AC_CHECK_SIZEOF(long)
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
53 AC_CHECK_SIZEOF(int)
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
54 AC_CHECK_SIZEOF(void *)
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
55
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
56 case 2 in
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
57 $ac_cv_sizeof_short) gint16=short;;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
58 $ac_cv_sizeof_int) gint16=int;;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
59 esac
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
60 case 4 in
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
61 $ac_cv_sizeof_short) gint32=short;;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
62 $ac_cv_sizeof_int) gint32=int;;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
63 $ac_cv_sizeof_long) gint32=long;;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
64 esac
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
65
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
66 cat >d_size.h <<_______EOF
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
67 #ifndef __D_SIZE_H__
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
68 #define __D_SIZE_H__
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
69
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
70
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
71 #include "config.h"
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
72
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
73 #if HAVE_STDINT_H == 0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
74 #include <stdint.h>
430
b296fd9d8752 - Allowed compilation with older machines by removing a few C99isms.
jcid
parents: 427
diff changeset
75 #elif defined(HAVE_INTTYPES_H)
b296fd9d8752 - Allowed compilation with older machines by removing a few C99isms.
jcid
parents: 427
diff changeset
76 #include <inttypes.h>
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
77 #else
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
78 typedef signed $gint16 int16_t;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
79 typedef unsigned $gint16 uint16_t;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
80 typedef signed $gint32 int32_t;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
81 typedef unsigned $gint32 uint32_t;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
82 #endif
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
83 typedef unsigned char uchar_t;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
84 typedef unsigned short ushort_t;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
85 typedef unsigned long ulong_t;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
86 typedef unsigned int uint_t;
184
e9c8fd71790a - Improved parsing of collapsing white space.
jcid
parents: 148
diff changeset
87 typedef unsigned char bool_t;
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
88
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
89
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
90 #endif /* __D_SIZE_H__ */
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
91 _______EOF
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
92
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
93
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
94 dnl --------------------------------------
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
95 dnl Check whether to add /usr/local or not
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
96 dnl (this is somewhat a religious problem)
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
97 dnl --------------------------------------
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
98 dnl
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
99 if test "`$CPP -v < /dev/null 2>&1 | grep '/usr/local/include' 2>&1`" = ""; then
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
100 CPPFLAGS="$CPPFLAGS -I/usr/local/include"
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
101 LDFLAGS="$LDFLAGS -L/usr/local/lib"
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
102 fi
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
103
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
104 dnl ------------------------------------
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
105 dnl Check for socket libs (AIX, Solaris)
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
106 dnl ------------------------------------
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
107 dnl
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
108 AC_CHECK_FUNCS(gethostbyname,,
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
109 [AC_CHECK_LIB(nsl,gethostbyname,,[AC_CHECK_LIB(socket,gethostbyname)])])
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
110 AC_CHECK_FUNCS(setsockopt,,[AC_CHECK_LIB(socket,setsockopt)])
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
111
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
112 dnl --------------------
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
113 dnl Checks for socklen_t
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
114 dnl --------------------
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
115 dnl
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
116 AC_MSG_CHECKING([for socklen_t])
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
117 ac_cv_socklen_t=""
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
118 AC_TRY_COMPILE([
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
119 #include <sys/types.h>
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
120 #include <sys/socket.h>
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
121 ],[
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
122 socklen_t a=0;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
123 getsockname(0,(struct sockaddr*)0, &a);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
124 ],
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
125 ac_cv_socklen_t="socklen_t",
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
126 AC_TRY_COMPILE([
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
127 #include <sys/types.h>
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
128 #include <sys/socket.h>
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
129 ],[
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
130 int a=0;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
131 getsockname(0,(struct sockaddr*)0, &a);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
132 ],
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
133 ac_cv_socklen_t="int",
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
134 ac_cv_socklen_t="size_t"
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
135 )
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
136 )
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
137 AC_MSG_RESULT($ac_cv_socklen_t)
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
138 if test "$ac_cv_socklen_t" != "socklen_t"; then
1227
511017b74e8e Fixed detection of socklen_t for dpid
Jorge Arellano Cid <jcid@dillo.org>
parents: 1207
diff changeset
139 AC_DEFINE_UNQUOTED([socklen_t], [$ac_cv_socklen_t],
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
140 [Define the real type of socklen_t])
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
141 fi
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
142
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
143
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
144 dnl ----------------------
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
145 dnl Test for FLTK2 library
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
146 dnl ----------------------
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
147 dnl
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
148 dnl For debugging and to be user friendly
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
149 AC_MSG_CHECKING([FLTK2])
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
150 if sh -c "fltk2-config --version" >/dev/null 2>&1
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
151 then AC_MSG_RESULT(yes)
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
152 LIBFLTK_CXXFLAGS=`fltk2-config --cxxflags`
6
c390daa639ce Improved FLTK library detection at configure time.
jcid
parents: 0
diff changeset
153 LIBFLTK_CFLAGS=`fltk2-config --cflags`
1862
e38bc8018e9e don't need --use-images with fltk2-config
corvid <corvid@lavabit.com>
parents: 1788
diff changeset
154 LIBFLTK_LIBS=`fltk2-config --ldflags`
14
6e6700dd252f Updated configure.in to check only for fltk2-config.
jcid
parents: 6
diff changeset
155 else AC_MSG_RESULT(no)
6e6700dd252f Updated configure.in to check only for fltk2-config.
jcid
parents: 6
diff changeset
156 AC_ERROR(FLTK2 must be installed!)
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
157 fi
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
158
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
159
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
160 dnl ----------------
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
161 dnl Test for libjpeg
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
162 dnl ----------------
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
163 dnl
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
164 if test "x$enable_jpeg" = "xyes"; then
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
165 AC_CHECK_HEADER(jpeglib.h, jpeg_ok=yes, jpeg_ok=no)
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
166
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
167 if test "x$jpeg_ok" = "xyes"; then
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
168 old_libs="$LIBS"
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
169 AC_CHECK_LIB(jpeg, jpeg_destroy_decompress, jpeg_ok=yes, jpeg_ok=no)
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
170 LIBS="$old_libs"
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
171 fi
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
172
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
173 if test "x$jpeg_ok" = "xyes"; then
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
174 LIBJPEG_LIBS="-ljpeg"
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
175 if test -n "$LIBJPEG_LIBDIR"; then
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
176 LIBJPEG_LDFLAGS="-L$LIBJPEG_LIBDIR"
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
177 fi
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
178 if test -n "$LIBJPEG_INCDIR"; then
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
179 LIBJPEG_CPPFLAGS="-I$LIBJPEG_INCDIR"
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
180 fi
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
181 else
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
182 AC_MSG_WARN([*** No libjpeg found. Disabling jpeg images.***])
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
183 fi
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
184 fi
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
185
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
186 if test "x$jpeg_ok" = "xyes"; then
1227
511017b74e8e Fixed detection of socklen_t for dpid
Jorge Arellano Cid <jcid@dillo.org>
parents: 1207
diff changeset
187 AC_DEFINE([ENABLE_JPEG], [1], [Enable JPEG images])
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
188 fi
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
189
211
b2ff493b447a - Made zlib a configure requirement.
jcid
parents: 209
diff changeset
190 dnl -------------
b2ff493b447a - Made zlib a configure requirement.
jcid
parents: 209
diff changeset
191 dnl Test for zlib
b2ff493b447a - Made zlib a configure requirement.
jcid
parents: 209
diff changeset
192 dnl -------------
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
193 dnl
211
b2ff493b447a - Made zlib a configure requirement.
jcid
parents: 209
diff changeset
194 AC_CHECK_HEADER(zlib.h, libz_ok=yes, libz_ok=no)
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
195
211
b2ff493b447a - Made zlib a configure requirement.
jcid
parents: 209
diff changeset
196 if test "x$libz_ok" = "xyes"; then
b2ff493b447a - Made zlib a configure requirement.
jcid
parents: 209
diff changeset
197 old_libs="$LIBS"
b2ff493b447a - Made zlib a configure requirement.
jcid
parents: 209
diff changeset
198 AC_CHECK_LIB(z, zlibVersion, libz_ok=yes, libz_ok=no)
b2ff493b447a - Made zlib a configure requirement.
jcid
parents: 209
diff changeset
199 LIBS="$old_libs"
b2ff493b447a - Made zlib a configure requirement.
jcid
parents: 209
diff changeset
200 fi
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
201
211
b2ff493b447a - Made zlib a configure requirement.
jcid
parents: 209
diff changeset
202 if test "x$libz_ok" = xyes; then
b2ff493b447a - Made zlib a configure requirement.
jcid
parents: 209
diff changeset
203 LIBZ_LIBS="-lz"
b2ff493b447a - Made zlib a configure requirement.
jcid
parents: 209
diff changeset
204 else
b2ff493b447a - Made zlib a configure requirement.
jcid
parents: 209
diff changeset
205 AC_ERROR(zlib must be installed!)
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
206 fi
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
207
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
208 dnl ---------------
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
209 dnl Test for libpng
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
210 dnl ---------------
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
211 dnl
211
b2ff493b447a - Made zlib a configure requirement.
jcid
parents: 209
diff changeset
212 if test "x$enable_png" = "xyes"; then
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
213 AC_MSG_CHECKING([for libpng-config])
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
214
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
215 dnl Check if the user hasn't set the variable $PNG_CONFIG
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
216 if test -z "$PNG_CONFIG"; then
1573
1d4de024f7cb (cautious version of) fix for configure.in for libpng 1.4 (reported by xentalion)
corvid <corvid@lavabit.com>
parents: 1557
diff changeset
217 PNG_CONFIG=`which libpng14-config`
1d4de024f7cb (cautious version of) fix for configure.in for libpng 1.4 (reported by xentalion)
corvid <corvid@lavabit.com>
parents: 1557
diff changeset
218 if test -z "$PNG_CONFIG"; then
1d4de024f7cb (cautious version of) fix for configure.in for libpng 1.4 (reported by xentalion)
corvid <corvid@lavabit.com>
parents: 1557
diff changeset
219 PNG_CONFIG=`which libpng12-config`
1d4de024f7cb (cautious version of) fix for configure.in for libpng 1.4 (reported by xentalion)
corvid <corvid@lavabit.com>
parents: 1557
diff changeset
220 fi
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
221 if test -z "$PNG_CONFIG"; then
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
222 PNG_CONFIG=`which libpng-config`
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
223 fi
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
224 if test -z "$PNG_CONFIG"; then
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
225 PNG_CONFIG=`which libpng10-config`
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
226 fi
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
227 fi
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
228
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
229 dnl Check if the libpng-config script was found and is executable
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
230 if test -n "$PNG_CONFIG" && test -x "$PNG_CONFIG"; then
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
231 AC_MSG_RESULT([$PNG_CONFIG])
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
232 png_ok="yes"
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
233 else
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
234 AC_MSG_RESULT([missing])
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
235 png_ok="no"
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
236 fi
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
237
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
238 if test "x$png_ok" = "xyes"; then
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
239 dnl For debugging and to be user friendly
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
240 AC_MSG_CHECKING([for libpng version])
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
241 png_version=`$PNG_CONFIG --version`
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
242 case $png_version in
1573
1d4de024f7cb (cautious version of) fix for configure.in for libpng 1.4 (reported by xentalion)
corvid <corvid@lavabit.com>
parents: 1557
diff changeset
243 1.4.*) AC_MSG_RESULT([$png_version (newer version)]) ;;
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
244 1.2.*) AC_MSG_RESULT([$png_version (newer version)]) ;;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
245 1.0.*) AC_MSG_RESULT([$png_version (older version)]) ;;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
246 *) AC_MSG_RESULT([ERROR]) ;;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
247 esac
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
248
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
249 dnl Try to use options that are supported by all libpng-config versions...
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
250 LIBPNG_CFLAGS=`$PNG_CONFIG --cflags`
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
251 LIBPNG_LIBS=`$PNG_CONFIG --ldflags`
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
252 case $png_version in
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
253 1.2.4*) LIBPNG_LIBS="$LIBPNG_LIBS `$PNG_CONFIG --libs`" ;;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
254 esac
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
255 else
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
256 dnl Try to find libpng even though libpng-config wasn't found
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
257 AC_CHECK_HEADERS(png.h libpng/png.h, png_ok=yes && break, png_ok=no)
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
258
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
259 if test "x$png_ok" = "xyes"; then
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
260 old_libs="$LIBS"
1573
1d4de024f7cb (cautious version of) fix for configure.in for libpng 1.4 (reported by xentalion)
corvid <corvid@lavabit.com>
parents: 1557
diff changeset
261 AC_CHECK_LIB(png, png_sig_cmp, png_ok=yes, png_ok=no, $LIBZ_LIBS -lm)
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
262 LIBS="$old_libs"
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
263
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
264 if test "x$png_ok" = "xyes"; then
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
265 LIBPNG_LIBS="-lpng -lm"
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
266 fi
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
267 fi
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
268
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
269 if test "x$png_ok" = "xno"; then
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
270 AC_MSG_WARN([*** No libpng found. Disabling PNG images ***])
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
271 fi
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
272 fi
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
273 fi
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
274
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
275 if test "x$png_ok" = "xyes"; then
1227
511017b74e8e Fixed detection of socklen_t for dpid
Jorge Arellano Cid <jcid@dillo.org>
parents: 1207
diff changeset
276 AC_DEFINE([ENABLE_PNG], [1], [Enable PNG images])
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
277 fi
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
278
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
279 dnl Check if support for GIF images should be compiled in
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
280 if test "x$enable_gif" = "xyes"; then
1227
511017b74e8e Fixed detection of socklen_t for dpid
Jorge Arellano Cid <jcid@dillo.org>
parents: 1207
diff changeset
281 AC_DEFINE([ENABLE_GIF], [1], [Enable GIF images])
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
282 fi
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
283
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
284 dnl --------------------------
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
285 dnl Test for support for SSL
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
286 dnl --------------------------
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
287 dnl
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
288 if test "x$enable_ssl" = "xyes"; then
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
289 AC_CHECK_HEADER(openssl/ssl.h, ssl_ok=yes, ssl_ok=no)
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
290
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
291 if test "x$ssl_ok" = "xyes"; then
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
292 old_libs="$LIBS"
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
293 AC_CHECK_LIB(ssl, SSL_library_init, ssl_ok=yes, ssl_ok=no, -lcrypto)
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
294 LIBS="$old_libs"
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
295 fi
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
296
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
297 if test "x$ssl_ok" = "xyes"; then
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
298 LIBSSL_LIBS="-lcrypto -lssl"
424
479f5df04b37 - Switched SSL enabled to configure.in (./configure --enable-ssl)
jcid
parents: 405
diff changeset
299 AC_MSG_WARN([*** Enabling ssl support. THIS IS ALPHA CODE!***])
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
300 else
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
301 AC_MSG_WARN([*** No libssl found. Disabling ssl support.***])
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
302 fi
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
303 fi
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
304
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
305 if test "x$ssl_ok" = "xyes"; then
1227
511017b74e8e Fixed detection of socklen_t for dpid
Jorge Arellano Cid <jcid@dillo.org>
parents: 1207
diff changeset
306 AC_DEFINE([ENABLE_SSL], [1], [Enable SSL support])
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
307 fi
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
308
108
9478813e0c85 - Another try at iconv detection for OpenBSD
jcid
parents: 106
diff changeset
309 dnl --------------------------------------------------------------
106
d63b130d8b24 - Added iconv tests for FreeBSD.
jcid
parents: 14
diff changeset
310 dnl Test for iconv functionality in libc or for libiconv usability
108
9478813e0c85 - Another try at iconv detection for OpenBSD
jcid
parents: 106
diff changeset
311 dnl --------------------------------------------------------------
106
d63b130d8b24 - Added iconv tests for FreeBSD.
jcid
parents: 14
diff changeset
312 AC_CHECK_HEADER(iconv.h, iconv_ok=yes, iconv_ok=no)
d63b130d8b24 - Added iconv tests for FreeBSD.
jcid
parents: 14
diff changeset
313 if test "x$iconv_ok" = "xyes"; then
d63b130d8b24 - Added iconv tests for FreeBSD.
jcid
parents: 14
diff changeset
314 AC_CHECK_LIB(c, iconv_open, LIBICONV_LIBS="",
d63b130d8b24 - Added iconv tests for FreeBSD.
jcid
parents: 14
diff changeset
315 AC_CHECK_LIB(iconv, iconv_open, LIBICONV_LIBS="-liconv", iconv_ok=no))
d63b130d8b24 - Added iconv tests for FreeBSD.
jcid
parents: 14
diff changeset
316 fi
d63b130d8b24 - Added iconv tests for FreeBSD.
jcid
parents: 14
diff changeset
317 if test "x$iconv_ok" = "xno"; then
108
9478813e0c85 - Another try at iconv detection for OpenBSD
jcid
parents: 106
diff changeset
318 dnl Test for OpenBSD
113
9ca877f93161 - another tweak to iconv detection for OpenBSD.
jcid
parents: 108
diff changeset
319 old_libs="$LIBS"
9ca877f93161 - another tweak to iconv detection for OpenBSD.
jcid
parents: 108
diff changeset
320 LIBS="$old_libs -liconv"
108
9478813e0c85 - Another try at iconv detection for OpenBSD
jcid
parents: 106
diff changeset
321 AC_TRY_COMPILE([#include <iconv.h>],[iconv_open("","");],
9478813e0c85 - Another try at iconv detection for OpenBSD
jcid
parents: 106
diff changeset
322 iconv_ok=yes, iconv_ok=no)
113
9ca877f93161 - another tweak to iconv detection for OpenBSD.
jcid
parents: 108
diff changeset
323 LIBS="$old_libs"
9ca877f93161 - another tweak to iconv detection for OpenBSD.
jcid
parents: 108
diff changeset
324 if test "x$iconv_ok" = "xyes"; then
9ca877f93161 - another tweak to iconv detection for OpenBSD.
jcid
parents: 108
diff changeset
325 LIBICONV_LIBS="-liconv"
9ca877f93161 - another tweak to iconv detection for OpenBSD.
jcid
parents: 108
diff changeset
326 fi
108
9478813e0c85 - Another try at iconv detection for OpenBSD
jcid
parents: 106
diff changeset
327 fi
9478813e0c85 - Another try at iconv detection for OpenBSD
jcid
parents: 106
diff changeset
328
9478813e0c85 - Another try at iconv detection for OpenBSD
jcid
parents: 106
diff changeset
329 if test "x$iconv_ok" = "xno"; then
106
d63b130d8b24 - Added iconv tests for FreeBSD.
jcid
parents: 14
diff changeset
330 AC_ERROR(libiconv must be installed!)
d63b130d8b24 - Added iconv tests for FreeBSD.
jcid
parents: 14
diff changeset
331 fi
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
332
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
333 dnl ----------------------
142
d87c151837f4 - Added suport for old iconv() (const char** as 2nd arg).
jcid
parents: 113
diff changeset
334 dnl Check if we need to
d87c151837f4 - Added suport for old iconv() (const char** as 2nd arg).
jcid
parents: 113
diff changeset
335 dnl support the old
d87c151837f4 - Added suport for old iconv() (const char** as 2nd arg).
jcid
parents: 113
diff changeset
336 dnl iconv interface
d87c151837f4 - Added suport for old iconv() (const char** as 2nd arg).
jcid
parents: 113
diff changeset
337 dnl ----------------------
d87c151837f4 - Added suport for old iconv() (const char** as 2nd arg).
jcid
parents: 113
diff changeset
338 if test "x$iconv_ok" = "xyes"; then
d87c151837f4 - Added suport for old iconv() (const char** as 2nd arg).
jcid
parents: 113
diff changeset
339 old_libs="$LIBS"
d87c151837f4 - Added suport for old iconv() (const char** as 2nd arg).
jcid
parents: 113
diff changeset
340 LIBS="$old_libs $LIBICONV_LIBS"
d87c151837f4 - Added suport for old iconv() (const char** as 2nd arg).
jcid
parents: 113
diff changeset
341 old_cflags="$CFLAGS"
d87c151837f4 - Added suport for old iconv() (const char** as 2nd arg).
jcid
parents: 113
diff changeset
342 CFLAGS="$CFLAGS -Werror"
434
feb2091ff940 ? Trying a new iconv() test in configure.in.
jcid
parents: 430
diff changeset
343 AC_LANG_PUSH([C++])
142
d87c151837f4 - Added suport for old iconv() (const char** as 2nd arg).
jcid
parents: 113
diff changeset
344 AC_TRY_COMPILE([#include <iconv.h>],
d87c151837f4 - Added suport for old iconv() (const char** as 2nd arg).
jcid
parents: 113
diff changeset
345 [
d87c151837f4 - Added suport for old iconv() (const char** as 2nd arg).
jcid
parents: 113
diff changeset
346 const char *inPtr;
d87c151837f4 - Added suport for old iconv() (const char** as 2nd arg).
jcid
parents: 113
diff changeset
347 char *outPtr;
d87c151837f4 - Added suport for old iconv() (const char** as 2nd arg).
jcid
parents: 113
diff changeset
348 size_t inLeft = 0, outRoom = 0;
d87c151837f4 - Added suport for old iconv() (const char** as 2nd arg).
jcid
parents: 113
diff changeset
349 iconv_t encoder = iconv_open("ASCII", "UTF-8");
d87c151837f4 - Added suport for old iconv() (const char** as 2nd arg).
jcid
parents: 113
diff changeset
350 iconv(encoder, &inPtr, &inLeft, &outPtr, &outRoom);
d87c151837f4 - Added suport for old iconv() (const char** as 2nd arg).
jcid
parents: 113
diff changeset
351 ],
d87c151837f4 - Added suport for old iconv() (const char** as 2nd arg).
jcid
parents: 113
diff changeset
352 iconv_old=yes,iconv_old=no)
434
feb2091ff940 ? Trying a new iconv() test in configure.in.
jcid
parents: 430
diff changeset
353 AC_LANG_POP([C++])
142
d87c151837f4 - Added suport for old iconv() (const char** as 2nd arg).
jcid
parents: 113
diff changeset
354 LIBS="$old_libs"
143
b2c94699dd6c - Fixed a typo s/CLFAGS/CFLAGS/g in configure.in
jcid
parents: 142
diff changeset
355 CFLAGS="$old_cflags"
142
d87c151837f4 - Added suport for old iconv() (const char** as 2nd arg).
jcid
parents: 113
diff changeset
356
d87c151837f4 - Added suport for old iconv() (const char** as 2nd arg).
jcid
parents: 113
diff changeset
357 if test "x$iconv_old" = "xyes"; then
d87c151837f4 - Added suport for old iconv() (const char** as 2nd arg).
jcid
parents: 113
diff changeset
358 AC_DEFINE([inbuf_t], [const char], [Use const char pointers for older libiconv])
d87c151837f4 - Added suport for old iconv() (const char** as 2nd arg).
jcid
parents: 113
diff changeset
359 else
d87c151837f4 - Added suport for old iconv() (const char** as 2nd arg).
jcid
parents: 113
diff changeset
360 AC_DEFINE([inbuf_t], [char], [Use char pointers for newer libiconv])
d87c151837f4 - Added suport for old iconv() (const char** as 2nd arg).
jcid
parents: 113
diff changeset
361 fi
d87c151837f4 - Added suport for old iconv() (const char** as 2nd arg).
jcid
parents: 113
diff changeset
362 fi
d87c151837f4 - Added suport for old iconv() (const char** as 2nd arg).
jcid
parents: 113
diff changeset
363
d87c151837f4 - Added suport for old iconv() (const char** as 2nd arg).
jcid
parents: 113
diff changeset
364 dnl ----------------------
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
365 dnl Test for POSIX threads
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
366 dnl ----------------------
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
367 dnl
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
368 if test -z "$LIBPTHREAD_LIBS"; then
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
369 case $target in
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
370 *-*-linux*|*-*-solaris*)
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
371 old_libs="$LIBS"
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
372 AC_CHECK_LIB(pthread, pthread_create, LIBPTHREAD_LIBS="-lpthread")
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
373 LIBS="$old_libs"
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
374 ;;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
375
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
376 *-*-osf1*)
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
377 AC_MSG_CHECKING(whether pthreads work)
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
378 LIBPTHREAD_LIBS="-lpthread -lexc -ldb"
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
379 AC_MSG_WARN([*** _Untested pthreads_ try setting LIBPTHREAD_LIBS manually if it doesn't work ***])
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
380 ;;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
381
1235
81e5a3d2dbf0 Skip pthread detection for minix (configure.in)
Jorge Arellano Cid <jcid@dillo.org>
parents: 1227
diff changeset
382 *-*-minix*)
81e5a3d2dbf0 Skip pthread detection for minix (configure.in)
Jorge Arellano Cid <jcid@dillo.org>
parents: 1227
diff changeset
383 AC_MSG_NOTICE([Minix detected, skipping pthread detection])
81e5a3d2dbf0 Skip pthread detection for minix (configure.in)
Jorge Arellano Cid <jcid@dillo.org>
parents: 1227
diff changeset
384 ;;
81e5a3d2dbf0 Skip pthread detection for minix (configure.in)
Jorge Arellano Cid <jcid@dillo.org>
parents: 1227
diff changeset
385
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
386 *)
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
387 AC_MSG_CHECKING(whether threads work with -pthread)
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
388 LDSAVEFLAGS=$LDFLAGS
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
389 LDFLAGS="$LDFLAGS -pthread"
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
390 AC_TRY_LINK_FUNC(pthread_create, pthread_ok=yes, pthread_ok=no)
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
391 LDFLAGS=$LDSAVEFLAGS
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
392
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
393 if test "x$pthread_ok" = "xyes"; then
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
394 AC_MSG_RESULT(yes)
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
395 LIBPTHREAD_LDFLAGS="-pthread"
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
396 else
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
397 AC_MSG_RESULT(no. Now we will try some libraries.)
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
398
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
399 AC_SEARCH_LIBS(pthread_create, pthread,
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
400 LIBPTHREADS_LIBS="-lpthread",
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
401 AC_SEARCH_LIBS(pthread_create, pthreads,
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
402 LIBPTHREADS_LIBS="-lpthreads",
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
403 AC_SEARCH_LIBS(pthread_create, c_r,
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
404 LIBPTHREADS_LIBS="-lc_r", thread_ok=no)))
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
405
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
406 if test "x$thread_ok" = "xno"; then
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
407 AC_MSG_WARN([*** No pthreads found. ***])
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
408 AC_MSG_ERROR([*** Try setting LIBPTHREAD_LIBS manually to point to your pthreads library. ***])
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
409 exit 1
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
410 else
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
411 AC_MSG_WARN([found a way to link threads, but it may not work...])
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
412 fi
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
413 fi
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
414 ;;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
415
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
416 esac
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
417 fi
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
418
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
419 dnl --------------------
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
420 dnl Command line options
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
421 dnl --------------------
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
422 dnl
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
423 if test "x$enable_cookies" = "xno" ; then
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
424 CFLAGS="$CFLAGS -DDISABLE_COOKIES"
1520
2202238be236 fix DISABLE_COOKIES (reported by furaisanjin)
corvid <corvid@lavabit.com>
parents: 1235
diff changeset
425 CXXFLAGS="$CXXFLAGS -DDISABLE_COOKIES"
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
426 fi
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
427 if test "x$enable_ipv6" = "xyes" ; then
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
428 CFLAGS="$CFLAGS -DENABLE_IPV6"
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
429 fi
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
430 if test "x$enable_efence" = "xyes" ; then
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
431 LIBS="-lefence $LIBS"
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
432 fi
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
433 if test "x$enable_gprof" = "xyes" ; then
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
434 CFLAGS="$CFLAGS -pg"
232
802c1d8bef55 - Fixed a typo bug in configure.in.
jcid
parents: 230
diff changeset
435 CXXFLAGS="$CXXFLAGS -pg"
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
436 fi
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
437 if test "x$enable_insure" = "xyes" ; then
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
438 CC="insure -Zoi \"compiler $CC\""
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
439 LIBS="$LIBS -lstdc++-2-libc6.1-1-2.9.0"
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
440 fi
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
441 if test "x$enable_threaded_dns" = "xyes" ; then
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
442 CFLAGS="$CFLAGS -DD_DNS_THREADED"
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
443 fi
347
e5955ab8dafb - Moved the dw2 tree into dillo2's tree.
jcid
parents: 300
diff changeset
444 if test "x$enable_rtfl" = "xyes" ; then
e5955ab8dafb - Moved the dw2 tree into dillo2's tree.
jcid
parents: 300
diff changeset
445 CXXFLAGS="$CXXFLAGS -DDBG_RTFL"
e5955ab8dafb - Moved the dw2 tree into dillo2's tree.
jcid
parents: 300
diff changeset
446 fi
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
447
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
448 dnl -----------------------
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
449 dnl Checks for header files
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
450 dnl -----------------------
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
451 dnl
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
452 AC_CHECK_HEADERS(fcntl.h unistd.h sys/uio.h)
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
453
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
454 dnl --------------------------
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
455 dnl Check for compiler options
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
456 dnl --------------------------
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
457 dnl
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
458 if eval "test x$GCC = xyes"; then
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
459 if test "`echo $CFLAGS | grep '\-D_REENTRANT' 2> /dev/null`" = ""; then
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
460 CFLAGS="$CFLAGS -D_REENTRANT"
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
461 fi
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
462 if test "`echo $CFLAGS | grep '\-D_THREAD_SAFE' 2> /dev/null`" = ""; then
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
463 CFLAGS="$CFLAGS -D_THREAD_SAFE"
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
464 fi
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
465 if test "`echo $CFLAGS | grep '\-Wall' 2> /dev/null`" = ""; then
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
466 CFLAGS="$CFLAGS -Wall"
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
467 fi
884
8d747af3b6d7 Fix for 9144ba0845e7 (typo)
Jorge Arellano Cid <jcid@dillo.org>
parents: 882
diff changeset
468 if test "`echo $CFLAGS | grep -e '-W ' -e '-W$' 2> /dev/null`" = ""; then
882
9144ba0845e7 Added the -W flag to the CFLAGS variable (compilation)
Jorge Arellano Cid <jcid@dillo.org>
parents: 434
diff changeset
469 CFLAGS="$CFLAGS -W"
9144ba0845e7 Added the -W flag to the CFLAGS variable (compilation)
Jorge Arellano Cid <jcid@dillo.org>
parents: 434
diff changeset
470 fi
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
471 if test "`echo $CFLAGS | grep '\-W[^a]' 2> /dev/null`" = ""; then
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
472 if test "`$CC -v 2>&1 | grep 'version 3'`" != ""; then
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
473 CFLAGS="$CFLAGS -W -Wno-unused-parameter"
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
474 fi
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
475 fi
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
476 if test "`echo $CFLAGS | grep '\-Waggregate-return' 2> /dev/null`" = ""; then
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
477 CFLAGS="$CFLAGS -Waggregate-return"
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
478 fi
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
479
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
480 if eval "test x$enable_ansi = xyes"; then
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
481 if test "`echo $CFLAGS | grep '\-ansi' 2> /dev/null`" = ""; then
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
482 CFLAGS="$CFLAGS -ansi"
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
483 fi
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
484
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
485 if test "`echo $CFLAGS | grep '\-pedantic' 2> /dev/null`" = ""; then
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
486 CFLAGS="$CFLAGS -pedantic"
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
487 fi
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
488 fi
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
489 fi
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
490 dnl -----------
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
491 dnl CXX options
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
492 dnl -----------
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
493 dnl
996
2ed439264264 Added "-fno-rtti -fno-exceptions" to CXXFLAGS (reduces binary size)
Jorge Arellano Cid <jcid@dillo.org>
parents: 884
diff changeset
494
2ed439264264 Added "-fno-rtti -fno-exceptions" to CXXFLAGS (reduces binary size)
Jorge Arellano Cid <jcid@dillo.org>
parents: 884
diff changeset
495 if eval "test x$GCC = xyes"; then
2ed439264264 Added "-fno-rtti -fno-exceptions" to CXXFLAGS (reduces binary size)
Jorge Arellano Cid <jcid@dillo.org>
parents: 884
diff changeset
496 CXXFLAGS="$CXXFLAGS -Wall -W -Wno-unused-parameter -fno-rtti -fno-exceptions"
2ed439264264 Added "-fno-rtti -fno-exceptions" to CXXFLAGS (reduces binary size)
Jorge Arellano Cid <jcid@dillo.org>
parents: 884
diff changeset
497 fi
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
498
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
499 AC_SUBST(LIBJPEG_LIBS)
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
500 AC_SUBST(LIBJPEG_LDFLAGS)
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
501 AC_SUBST(LIBJPEG_CPPFLAGS)
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
502 AC_SUBST(LIBPNG_LIBS)
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
503 AC_SUBST(LIBPNG_CFLAGS)
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
504 AC_SUBST(LIBZ_LIBS)
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
505 AC_SUBST(LIBSSL_LIBS)
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
506 AC_SUBST(LIBPTHREAD_LIBS)
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
507 AC_SUBST(LIBPTHREAD_LDFLAGS)
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
508 AC_SUBST(LIBFLTK_CXXFLAGS)
6
c390daa639ce Improved FLTK library detection at configure time.
jcid
parents: 0
diff changeset
509 AC_SUBST(LIBFLTK_CFLAGS)
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
510 AC_SUBST(LIBFLTK_LIBS)
106
d63b130d8b24 - Added iconv tests for FreeBSD.
jcid
parents: 14
diff changeset
511 AC_SUBST(LIBICONV_LIBS)
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
512 AC_SUBST(datadir)
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
513
1775
d70c73254772 configure.in: fix the obsolete usage of AC_OUTPUT.
Jeremy Henty <onepoint@starurchin.org>
parents: 1573
diff changeset
514 AC_CONFIG_FILES([
d70c73254772 configure.in: fix the obsolete usage of AC_OUTPUT.
Jeremy Henty <onepoint@starurchin.org>
parents: 1573
diff changeset
515 Makefile
d70c73254772 configure.in: fix the obsolete usage of AC_OUTPUT.
Jeremy Henty <onepoint@starurchin.org>
parents: 1573
diff changeset
516 dlib/Makefile
d70c73254772 configure.in: fix the obsolete usage of AC_OUTPUT.
Jeremy Henty <onepoint@starurchin.org>
parents: 1573
diff changeset
517 dpip/Makefile
d70c73254772 configure.in: fix the obsolete usage of AC_OUTPUT.
Jeremy Henty <onepoint@starurchin.org>
parents: 1573
diff changeset
518 dpid/Makefile
d70c73254772 configure.in: fix the obsolete usage of AC_OUTPUT.
Jeremy Henty <onepoint@starurchin.org>
parents: 1573
diff changeset
519 dpi/Makefile
d70c73254772 configure.in: fix the obsolete usage of AC_OUTPUT.
Jeremy Henty <onepoint@starurchin.org>
parents: 1573
diff changeset
520 doc/Makefile
d70c73254772 configure.in: fix the obsolete usage of AC_OUTPUT.
Jeremy Henty <onepoint@starurchin.org>
parents: 1573
diff changeset
521 dw/Makefile
d70c73254772 configure.in: fix the obsolete usage of AC_OUTPUT.
Jeremy Henty <onepoint@starurchin.org>
parents: 1573
diff changeset
522 lout/Makefile
d70c73254772 configure.in: fix the obsolete usage of AC_OUTPUT.
Jeremy Henty <onepoint@starurchin.org>
parents: 1573
diff changeset
523 src/Makefile
d70c73254772 configure.in: fix the obsolete usage of AC_OUTPUT.
Jeremy Henty <onepoint@starurchin.org>
parents: 1573
diff changeset
524 src/IO/Makefile
d70c73254772 configure.in: fix the obsolete usage of AC_OUTPUT.
Jeremy Henty <onepoint@starurchin.org>
parents: 1573
diff changeset
525 test/Makefile
d70c73254772 configure.in: fix the obsolete usage of AC_OUTPUT.
Jeremy Henty <onepoint@starurchin.org>
parents: 1573
diff changeset
526 ])
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
527
1775
d70c73254772 configure.in: fix the obsolete usage of AC_OUTPUT.
Jeremy Henty <onepoint@starurchin.org>
parents: 1573
diff changeset
528 AC_OUTPUT