1 --- links-2.1pre14/configure.in~configure
2 +++ links-2.1pre14/configure.in
5 # This file is a part of the Links program, released under GPL.
9 +AC_CONFIG_SRCDIR([main.c])
11 AM_INIT_AUTOMAKE(links, 2.1pre14)
14 AUTOHEADER="./missing autoheader"
15 image_formats="GIF PNG XBM"
17 -AM_CONFIG_HEADER(config.h)
18 +AC_CONFIG_HEADERS([config.h])
20 dnl Checks for programs.
29 #AC_CHECK_LIB(fl,main,AC_DEFINE(JS) LIBS="$LIBS -lfl",AC_MSG_WARN(You don't have libfl; you won't be able to run javascript))
31 AC_CACHE_CHECK([for EMX], ac_cv_have_emx,
32 - AC_TRY_COMPILE(, [#ifndef __EMX__
33 + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[#ifndef __EMX__
35 - #endif ], ac_cv_have_emx=yes, ac_cv_have_emx=no)
36 + #endif ]])],[ac_cv_have_emx=yes],[ac_cv_have_emx=no])
38 test "$ac_cv_have_emx" = yes && LDFLAGS=`echo "$LDFLAGS" | sed "s/-Zexe//g" | sed "s/-Zbin-files//g"`
40 AC_CACHE_CHECK([for typeof], ac_cv_have_typeof,
41 - AC_TRY_COMPILE(, [int a;
42 - typeof(a) b;], ac_cv_have_typeof=yes, ac_cv_have_typeof=no)
43 + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[int a;
44 + typeof(a) b;]])],[ac_cv_have_typeof=yes],[ac_cv_have_typeof=no])
46 test "$ac_cv_have_typeof" = yes && AC_DEFINE(HAVE_TYPEOF)
48 AC_CACHE_CHECK([for long long], ac_cv_have_long_long,
49 - AC_TRY_COMPILE(, [unsigned long long a; ], ac_cv_have_long_long=yes, ac_cv_have_long_long=no)
50 + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[unsigned long long a; ]])],[ac_cv_have_long_long=yes],[ac_cv_have_long_long=no])
52 test "$ac_cv_have_long_long" = yes && AC_DEFINE(HAVE_LONG_LONG)
55 AC_CHECK_SIZEOF(long, "$default_int")
56 AC_CHECK_SIZEOF(unsigned long, "$default_int")
57 AC_CACHE_CHECK([for big endian], ac_cv_big_endian,
59 + AC_RUN_IFELSE([AC_LANG_SOURCE([[
65 return !(c[[sizeof(long) - 1]] == 0x78 && c[[sizeof(long) - 2]] == 0x56 && c[[sizeof(long) - 3]] == 0x34 && c[[sizeof(long) - 4]] == 0x12);
67 - ], ac_cv_big_endian=yes, ac_cv_big_endian=no, ac_cv_big_endian=no)
68 + ]])],[ac_cv_big_endian=yes],[ac_cv_big_endian=no],[ac_cv_big_endian=no])
70 AC_CACHE_CHECK([for little endian], ac_cv_little_endian,
72 + AC_RUN_IFELSE([AC_LANG_SOURCE([[
78 return !(c[[0]] == 0x78 && c[[1]] == 0x56 && c[[2]] == 0x34 && c[[3]] == 0x12);
80 - ], ac_cv_little_endian=yes, ac_cv_little_endian=no, ac_cv_little_endian="$ac_cv_have_emx")
81 + ]])],[ac_cv_little_endian=yes],[ac_cv_little_endian=no],[ac_cv_little_endian="$ac_cv_have_emx"])
84 +AC_DEFUN([AC_BIG_ENDIAN],[],[])
85 +AC_DEFUN([AC_LITTLE_ENDIAN],[],[])
87 if test "$ac_cv_big_endian" = yes; then
88 AC_DEFINE(AC_BIG_ENDIAN)
89 else if test "$ac_cv_little_endian" = yes; then
94 -AC_HAVE_FUNCS(calloc)
95 -AC_HAVE_FUNCS(snprintf)
96 -AC_HAVE_FUNCS(gettimeofday mkdir select strcspn strerror strstr strtol strtoul alarm chmod)
97 -AC_HAVE_FUNCS(getpid setpgid getpgid setpgrp getpgrp)
100 -AC_HAVE_FUNCS(strptime)
101 -AC_HAVE_FUNCS(setlocale)
102 -AC_HAVE_FUNCS(nl_langinfo)
103 -dnl AC_HAVE_FUNCS(sigsetjmp siglongjmp)
104 +AC_CHECK_FUNCS([calloc])
105 +AC_CHECK_FUNCS([snprintf])
106 +AC_CHECK_FUNCS([gettimeofday mkdir select strcspn strerror strstr strtol strtoul alarm chmod])
107 +AC_CHECK_FUNCS([getpid setpgid getpgid setpgrp getpgrp])
108 +AC_CHECK_FUNCS([popen])
109 +AC_CHECK_FUNCS([uname])
110 +AC_CHECK_FUNCS([strptime])
111 +AC_CHECK_FUNCS([setlocale])
112 +AC_CHECK_FUNCS([nl_langinfo])
113 +dnl AC_CHECK_FUNCS([sigsetjmp siglongjmp])
115 AC_CACHE_CHECK([for sigsetjmp/siglongjmp], ac_cv_have_sigsetjmp,
116 - AC_TRY_LINK([#include <setjmp.h>], [sigjmp_buf env;sigsetjmp(env, 1);siglongjmp(env, 2);], ac_cv_have_sigsetjmp=yes, ac_cv_have_sigsetjmp=no)
117 + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <setjmp.h>]], [[sigjmp_buf env;sigsetjmp(env, 1);siglongjmp(env, 2);]])],[ac_cv_have_sigsetjmp=yes],[ac_cv_have_sigsetjmp=no])
119 if test "$ac_cv_have_sigsetjmp" = yes; then
120 AC_DEFINE(HAVE_SIGSETJMP)
124 #AC_MSG_CHECKING([for gethostbyname])
125 -#AC_TRY_LINK([#include <netdb.h>], [gethostbyname("")], cf_result=yes, cf_result=no)
126 +#AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <netdb.h>]], [[gethostbyname("")]])],[cf_result=yes],[cf_result=no])
127 #AC_MSG_RESULT($cf_result)
128 AC_CHECK_FUNC(gethostbyname, cf_result=yes, cf_result=no)
129 if test "$cf_result" = no; then
131 AC_CHECK_FUNC(herror, AC_DEFINE(HAVE_HERROR))
132 AC_CHECK_FUNC(cfmakeraw, AC_DEFINE(HAVE_CFMAKERAW))
134 -AC_HAVE_FUNCS(cygwin_conv_to_full_win32_path)
135 +AC_CHECK_FUNCS([cygwin_conv_to_full_win32_path])
137 AC_MSG_CHECKING([if you want to enable javascript])
138 AC_ARG_ENABLE(javascript, [ --enable-javascript use javascript interpreter], cf_use_javascript=yes, cf_use_javascript=no)
140 AC_CACHE_CHECK([for OS/2 threads], ac_cv_have_beginthread,
142 CFLAGS="$CFLAGS -Zmt"
143 - AC_TRY_LINK([#include <stdlib.h>], [_beginthread(NULL, NULL, 0, NULL)], ac_cv_have_beginthread=yes, ac_cv_have_beginthread=no)
144 + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <stdlib.h>]], [[_beginthread(NULL, NULL, 0, NULL)]])],[ac_cv_have_beginthread=yes],[ac_cv_have_beginthread=no])
147 if test "$ac_cv_have_beginthread" = yes; then
150 #AC_CHECK_FUNC(clone, AC_DEFINE(HAVE_CLONE))
151 AC_CHECK_HEADERS(atheos/threads.h)
152 -AC_HAVE_FUNCS(spawn_thread)
153 -AC_HAVE_FUNCS(resume_thread)
154 +AC_CHECK_FUNCS([spawn_thread])
155 +AC_CHECK_FUNCS([resume_thread])
157 AC_CHECK_FUNC(MouOpen, AC_DEFINE(HAVE_MOUOPEN))
158 AC_CHECK_FUNC(_read_kbd, AC_DEFINE(HAVE_READ_KBD))
159 @@ -222,10 +226,10 @@
160 if test -n "$X11ROOT"; then
161 CPPFLAGS="$CPPFLAGS_X -I$X11ROOT/XFree86/include"
162 LIBS="$LIBS_X -L$X11ROOT/XFree86/lib -lxf86_gcc"
163 - AC_TRY_LINK([#include <pty.h>], [struct winsize win;ptioctl(1, TIOCGWINSZ, &win)], ac_cv_have_x2=xf86_gcc, ac_cv_have_x2=no)
164 + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <pty.h>]], [[struct winsize win;ptioctl(1, TIOCGWINSZ, &win)]])],[ac_cv_have_x2=xf86_gcc],[ac_cv_have_x2=no])
165 if test "$ac_cv_have_x2" = no; then
166 LIBS="$LIBS_X -L$X11ROOT/XFree86/lib -lxf86"
167 - AC_TRY_LINK([#include <pty.h>], [struct winsize win;ptioctl(1, TIOCGWINSZ, &win)], ac_cv_have_x2=xf86, ac_cv_have_x2=no)
168 + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <pty.h>]], [[struct winsize win;ptioctl(1, TIOCGWINSZ, &win)]])],[ac_cv_have_x2=xf86],[ac_cv_have_x2=no])
171 CPPFLAGS="$CPPFLAGS_X"
174 LIBS="-lssl -lcrypto $LIBS_X"
176 - AC_TRY_LINK([#include <openssl/ssl.h>], [OpenSSL_add_all_algorithms()], cf_result=yes, cf_result=no)
177 + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <openssl/ssl.h>]], [[OpenSSL_add_all_algorithms()]])],[cf_result=yes],[cf_result=no])
178 if test "$cf_result" != yes; then
179 - AC_TRY_LINK([#include <openssl/ssl.h>], [SSLeay_add_ssl_algorithms()], cf_result=yes, cf_result=no)
180 + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <openssl/ssl.h>]], [[SSLeay_add_ssl_algorithms()]])],[cf_result=yes],[cf_result=no])
184 @@ -287,14 +291,14 @@
185 AC_CHECK_HEADERS(png.h libpng/png.h)
186 AC_CHECK_LIB(png, png_create_info_struct)
187 if test "$ac_cv_header_png_h" != yes && test "$ac_cv_header_libpng_png_h" != yes || test "$ac_cv_lib_png_png_create_info_struct" != yes; then
188 - AC_ERROR([You need libpng to compile Links in graphics mode])
189 + AC_MSG_ERROR([You need libpng to compile Links in graphics mode])
192 - AC_HAVE_FUNCS(png_set_rgb_to_gray)
193 + AC_CHECK_FUNCS([png_set_rgb_to_gray])
195 AC_CACHE_CHECK(if you can include both setjmp.h and png.h, ac_cv_include_setjmp_png,
196 - AC_TRY_COMPILE([#include <setjmp.h>
197 - #include <png.h>], [jmp_buf bla;], ac_cv_include_setjmp_png=yes, ac_cv_include_setjmp_png=no)
198 + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <setjmp.h>
199 + #include <png.h>]], [[jmp_buf bla;]])],[ac_cv_include_setjmp_png=yes],[ac_cv_include_setjmp_png=no])
202 if test "$ac_cv_include_setjmp_png" != yes; then
204 AC_CACHE_CHECK([for svgalib], ac_cv_have_svgalib,
207 - AC_TRY_LINK([#include <vga.h>], [vga_setmode(0)], ac_cv_have_svgalib=yes, ac_cv_have_svgalib=no)
208 + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <vga.h>]], [[vga_setmode(0)]])],[ac_cv_have_svgalib=yes],[ac_cv_have_svgalib=no])
214 dnl braine, tohle jsem predelal
215 dnl AC_CACHE_CHECK([for framebuffer], ac_cv_have_fb,
216 -dnl AC_TRY_RUN([#include <stdio.h>
217 +dnl AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <stdio.h>
218 dnl #include <fcntl.h>
219 -dnl main(){return open("/dev/fb",O_RDWR)==-1;}], ac_cv_have_fb=yes, ac_cv_have_fb=no, ac_cv_have_fb=no)
220 +dnl main(){return open("/dev/fb",O_RDWR)==-1;}]])],[ac_cv_have_fb=yes],[ac_cv_have_fb=no],[ac_cv_have_fb=no])
223 if test "$disable_fb" != yes ; then
224 @@ -406,14 +410,12 @@
226 if test "$disable_pmshell" != yes ; then
227 AC_CACHE_CHECK([for pmshell], ac_cv_have_pmshell,
228 - AC_TRY_LINK([#define INCL_WIN
229 + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#define INCL_WIN
232 - #include <sys/fmutex.h>],
234 + #include <sys/fmutex.h>]], [[_fmutex mutex;
235 WinDrawText(NULLHANDLE, -1, NULL, NULL, 0, 0, 0),
236 - GpiSetPel(NULLHANDLE, NULL)],
237 - ac_cv_have_pmshell=yes, ac_cv_have_pmshell=no)
238 + GpiSetPel(NULLHANDLE, NULL)]])],[ac_cv_have_pmshell=yes],[ac_cv_have_pmshell=no])
241 if test "$ac_cv_have_pmshell" = yes; then
243 test "$ac_cv_have_emx" = yes && LDFLAGS="$LDFLAGS -Zexe"
244 test "$ac_cv_have_emx" = yes && LDFLAGS=`echo "$LDFLAGS" | sed "s/-Zbin-files//g"`
247 +AC_CONFIG_FILES([Makefile])
250 echo "---------------------------------------------------------"
251 echo "Configuration results:"
255 #if test -z "$AWK"; then
256 -# AC_WARN([awk not found. You won't be able to rebuild code page table.]);
257 +# AC_MSG_WARN([awk not found. You won't be able to rebuild code page table.]);