comparison configure.ac @ 910:89555751c489 asm

merge up to 2013.63, improve ASM makefile rules a bit
author Matt Johnston <matt@ucc.asn.au>
date Thu, 27 Feb 2014 21:35:58 +0800
parents 4f1988cb79ce
children 7cd89d4e0335
comparison
equal deleted inserted replaced
909:e4b75744acab 910:89555751c489
3 3
4 # This Autoconf file was cobbled from various locations. In particular, a bunch 4 # This Autoconf file was cobbled from various locations. In particular, a bunch
5 # of the platform checks have been taken straight from OpenSSH's configure.ac 5 # of the platform checks have been taken straight from OpenSSH's configure.ac
6 # Huge thanks to them for dealing with the horrible platform-specifics :) 6 # Huge thanks to them for dealing with the horrible platform-specifics :)
7 7
8 AC_PREREQ(2.50) 8 AC_PREREQ(2.59)
9 AC_INIT(buffer.c) 9 AC_INIT
10 AC_CONFIG_SRCDIR(buffer.c)
10 11
11 OLDCFLAGS=$CFLAGS 12 OLDCFLAGS=$CFLAGS
12 # Checks for programs. 13 # Checks for programs.
13 AC_PROG_CC 14 AC_PROG_CC
14 AC_PROG_MAKE_SET 15 AC_PROG_MAKE_SET
18 fi 19 fi
19 AC_SUBST(LD) 20 AC_SUBST(LD)
20 21
21 if test -z "$OLDCFLAGS" && test "$GCC" = "yes"; then 22 if test -z "$OLDCFLAGS" && test "$GCC" = "yes"; then
22 AC_MSG_NOTICE(No \$CFLAGS set... using "-Os -W -Wall" for GCC) 23 AC_MSG_NOTICE(No \$CFLAGS set... using "-Os -W -Wall" for GCC)
23 CFLAGS="-Os -W -Wall" 24 CFLAGS="-Os -W -Wall -Wno-pointer-sign"
24 fi 25 fi
25 26
26 # large file support is useful for scp 27 # large file support is useful for scp
27 AC_SYS_LARGEFILE 28 AC_SYS_LARGEFILE
28 29
219 AC_TYPE_MODE_T 220 AC_TYPE_MODE_T
220 AC_TYPE_PID_T 221 AC_TYPE_PID_T
221 AC_TYPE_SIZE_T 222 AC_TYPE_SIZE_T
222 AC_HEADER_TIME 223 AC_HEADER_TIME
223 224
224 AC_CHECK_TYPES([uint16_t, u_int16_t, struct sockaddr_storage]) 225 AC_CHECK_TYPES([uint8_t, u_int8_t, uint16_t, u_int16_t, uint32_t, u_int32_t])
226 AC_CHECK_TYPES([struct sockaddr_storage])
225 AC_CHECK_TYPE([socklen_t], ,[ 227 AC_CHECK_TYPE([socklen_t], ,[
226 AC_MSG_CHECKING([for socklen_t equivalent]) 228 AC_MSG_CHECKING([for socklen_t equivalent])
227 AC_CACHE_VAL([curl_cv_socklen_t_equiv], 229 AC_CACHE_VAL([curl_cv_socklen_t_equiv],
228 [ 230 [
229 # Systems have either "struct sockaddr *" or 231 # Systems have either "struct sockaddr *" or
230 # "void *" as the second argument to getpeername 232 # "void *" as the second argument to getpeername
231 curl_cv_socklen_t_equiv= 233 curl_cv_socklen_t_equiv=
232 for arg2 in "struct sockaddr" void; do 234 for arg2 in "struct sockaddr" void; do
233 for t in int size_t unsigned long "unsigned long"; do 235 for t in int size_t unsigned long "unsigned long"; do
234 AC_TRY_COMPILE([ 236 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
235 #include <sys/types.h> 237 #include <sys/types.h>
236 #include <sys/socket.h> 238 #include <sys/socket.h>
237 239
238 int getpeername (int, $arg2 *, $t *); 240 int getpeername (int, $arg2 *, $t *);
239 ],[ 241 ]],[[
240 $t len; 242 $t len;
241 getpeername(0,0,&len); 243 getpeername(0,0,&len);
242 ],[ 244 ]])],[
243 curl_cv_socklen_t_equiv="$t" 245 curl_cv_socklen_t_equiv="$t"
244 break 246 break
245 ]) 247 ])
246 done 248 done
247 done 249 done
257 #include <sys/socket.h>]) 259 #include <sys/socket.h>])
258 260
259 # for the fake-rfc2553 stuff - straight from OpenSSH 261 # for the fake-rfc2553 stuff - straight from OpenSSH
260 262
261 AC_CACHE_CHECK([for struct sockaddr_storage], ac_cv_have_struct_sockaddr_storage, [ 263 AC_CACHE_CHECK([for struct sockaddr_storage], ac_cv_have_struct_sockaddr_storage, [
262 AC_TRY_COMPILE( 264 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
263 [
264 #include <sys/types.h> 265 #include <sys/types.h>
265 #include <sys/socket.h> 266 #include <sys/socket.h>
266 ], 267 ]],
267 [ struct sockaddr_storage s; ], 268 [[ struct sockaddr_storage s; ]])],
268 [ ac_cv_have_struct_sockaddr_storage="yes" ], 269 [ ac_cv_have_struct_sockaddr_storage="yes" ],
269 [ ac_cv_have_struct_sockaddr_storage="no" ] 270 [ ac_cv_have_struct_sockaddr_storage="no" ]
270 ) 271 )
271 ]) 272 ])
272 if test "x$ac_cv_have_struct_sockaddr_storage" = "xyes" ; then 273 if test "x$ac_cv_have_struct_sockaddr_storage" = "xyes" ; then
273 AC_DEFINE(HAVE_STRUCT_SOCKADDR_STORAGE) 274 AC_DEFINE(HAVE_STRUCT_SOCKADDR_STORAGE)
274 fi 275 fi
275 276
276 AC_CACHE_CHECK([for struct sockaddr_in6], ac_cv_have_struct_sockaddr_in6, [ 277 AC_CACHE_CHECK([for struct sockaddr_in6], ac_cv_have_struct_sockaddr_in6, [
277 AC_TRY_COMPILE( 278 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
278 [
279 #include <sys/types.h> 279 #include <sys/types.h>
280 #include <netinet/in.h> 280 #include <netinet/in.h>
281 ], 281 ]],
282 [ struct sockaddr_in6 s; s.sin6_family = 0; ], 282 [[ struct sockaddr_in6 s; s.sin6_family = 0; ]])],
283 [ ac_cv_have_struct_sockaddr_in6="yes" ], 283 [ ac_cv_have_struct_sockaddr_in6="yes" ],
284 [ ac_cv_have_struct_sockaddr_in6="no" ] 284 [ ac_cv_have_struct_sockaddr_in6="no" ]
285 ) 285 )
286 ]) 286 ])
287 if test "x$ac_cv_have_struct_sockaddr_in6" = "xyes" ; then 287 if test "x$ac_cv_have_struct_sockaddr_in6" = "xyes" ; then
288 AC_DEFINE(HAVE_STRUCT_SOCKADDR_IN6,,Have struct sockaddr_in6) 288 AC_DEFINE(HAVE_STRUCT_SOCKADDR_IN6,,Have struct sockaddr_in6)
289 fi 289 fi
290 290
291 AC_CACHE_CHECK([for struct in6_addr], ac_cv_have_struct_in6_addr, [ 291 AC_CACHE_CHECK([for struct in6_addr], ac_cv_have_struct_in6_addr, [
292 AC_TRY_COMPILE( 292 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
293 [
294 #include <sys/types.h> 293 #include <sys/types.h>
295 #include <netinet/in.h> 294 #include <netinet/in.h>
296 ], 295 ]],
297 [ struct in6_addr s; s.s6_addr[0] = 0; ], 296 [[ struct in6_addr s; s.s6_addr[0] = 0; ]])],
298 [ ac_cv_have_struct_in6_addr="yes" ], 297 [ ac_cv_have_struct_in6_addr="yes" ],
299 [ ac_cv_have_struct_in6_addr="no" ] 298 [ ac_cv_have_struct_in6_addr="no" ]
300 ) 299 )
301 ]) 300 ])
302 if test "x$ac_cv_have_struct_in6_addr" = "xyes" ; then 301 if test "x$ac_cv_have_struct_in6_addr" = "xyes" ; then
303 AC_DEFINE(HAVE_STRUCT_IN6_ADDR,,Have struct in6_addr) 302 AC_DEFINE(HAVE_STRUCT_IN6_ADDR,,Have struct in6_addr)
304 fi 303 fi
305 304
306 AC_CACHE_CHECK([for struct addrinfo], ac_cv_have_struct_addrinfo, [ 305 AC_CACHE_CHECK([for struct addrinfo], ac_cv_have_struct_addrinfo, [
307 AC_TRY_COMPILE( 306 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
308 [
309 #include <sys/types.h> 307 #include <sys/types.h>
310 #include <sys/socket.h> 308 #include <sys/socket.h>
311 #include <netdb.h> 309 #include <netdb.h>
312 ], 310 ]],
313 [ struct addrinfo s; s.ai_flags = AI_PASSIVE; ], 311 [[ struct addrinfo s; s.ai_flags = AI_PASSIVE; ]])],
314 [ ac_cv_have_struct_addrinfo="yes" ], 312 [ ac_cv_have_struct_addrinfo="yes" ],
315 [ ac_cv_have_struct_addrinfo="no" ] 313 [ ac_cv_have_struct_addrinfo="no" ]
316 ) 314 )
317 ]) 315 ])
318 if test "x$ac_cv_have_struct_addrinfo" = "xyes" ; then 316 if test "x$ac_cv_have_struct_addrinfo" = "xyes" ; then
321 319
322 320
323 # IRIX has a const char return value for gai_strerror() 321 # IRIX has a const char return value for gai_strerror()
324 AC_CHECK_FUNCS(gai_strerror,[ 322 AC_CHECK_FUNCS(gai_strerror,[
325 AC_DEFINE(HAVE_GAI_STRERROR) 323 AC_DEFINE(HAVE_GAI_STRERROR)
326 AC_TRY_COMPILE([ 324 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
327 #include <sys/types.h> 325 #include <sys/types.h>
328 #include <sys/socket.h> 326 #include <sys/socket.h>
329 #include <netdb.h> 327 #include <netdb.h>
330 328
331 const char *gai_strerror(int);],[ 329 const char *gai_strerror(int);]],[[
332 char *str; 330 char *str;
333 331
334 str = gai_strerror(0);],[ 332 str = gai_strerror(0);]])],[
335 AC_DEFINE(HAVE_CONST_GAI_STRERROR_PROTO, 1, 333 AC_DEFINE(HAVE_CONST_GAI_STRERROR_PROTO, 1,
336 [Define if gai_strerror() returns const char *])])]) 334 [Define if gai_strerror() returns const char *])])])
337 335
338 # for loginrec.c 336 # for loginrec.c
339 337
362 AC_CHECK_FUNCS(endutxent getutxent getutxid getutxline pututxline ) 360 AC_CHECK_FUNCS(endutxent getutxent getutxid getutxline pututxline )
363 AC_CHECK_FUNCS(setutxent utmpxname) 361 AC_CHECK_FUNCS(setutxent utmpxname)
364 AC_CHECK_FUNCS(logout updwtmp logwtmp) 362 AC_CHECK_FUNCS(logout updwtmp logwtmp)
365 363
366 AC_ARG_ENABLE(bundled-libtom, 364 AC_ARG_ENABLE(bundled-libtom,
367 [ --enable-bundled-libtom Use bundled libtomcrypt/libtommath even if a system version exists], 365 [ --enable-bundled-libtom Force using bundled libtomcrypt/libtommath even if a system version exists.
368 [ 366 --disable-bundled-libtom Force using system libtomcrypt/libtommath, fail if it does not exist.
369 BUNDLED_LIBTOM=1 367 Default is to use system if available, otherwise bundled.],
370 AC_MSG_NOTICE(Forcing bundled libtom*) 368 [
369 if test "x$enableval" = "xyes"; then
370 BUNDLED_LIBTOM=1
371 AC_MSG_NOTICE(Forcing bundled libtom*)
372 else
373 BUNDLED_LIBTOM=0
374 AC_CHECK_LIB(tommath, mp_exptmod, LIBTOM_LIBS="$LIBTOM_LIBS -ltommath",
375 [AC_MSG_ERROR([Missing system libtommath and --disable-bundled-libtom was specified])] )
376 AC_CHECK_LIB(tomcrypt, register_cipher, LIBTOM_LIBS="$LIBTOM_LIBS -ltomcrypt",
377 [AC_MSG_ERROR([Missing system libtomcrypt and --disable-bundled-libtom was specified])] )
378 fi
371 ], 379 ],
372 [ 380 [
373 BUNDLED_LIBTOM=0 381 BUNDLED_LIBTOM=0
374 AC_CHECK_LIB(tomcrypt, register_cipher, , BUNDLED_LIBTOM=1) 382 AC_CHECK_LIB(tommath, mp_exptmod, LIBTOM_LIBS="$LIBTOM_LIBS -ltommath", BUNDLED_LIBTOM=1)
375 AC_CHECK_LIB(tommath, mp_exptmod, , BUNDLED_LIBTOM=1) 383 AC_CHECK_LIB(tomcrypt, register_cipher, LIBTOM_LIBS="$LIBTOM_LIBS -ltomcrypt", BUNDLED_LIBTOM=1)
376 ] 384 ]
377 ) 385 )
378 386
379 if test $BUNDLED_LIBTOM = 1 ; then 387 if test $BUNDLED_LIBTOM = 1 ; then
380 AC_DEFINE(BUNDLED_LIBTOM,,Use bundled libtom) 388 AC_DEFINE(BUNDLED_LIBTOM,,Use bundled libtom)
381 fi 389 fi
382 390
391 AC_SUBST(LIBTOM_LIBS)
383 AC_SUBST(BUNDLED_LIBTOM) 392 AC_SUBST(BUNDLED_LIBTOM)
384 393
385 dnl Added from OpenSSH 3.6.1p2's configure.ac 394 dnl Added from OpenSSH 3.6.1p2's configure.ac
386 395
387 dnl allow user to disable some login recording features 396 dnl allow user to disable some login recording features
441 dnl lastlog and [uw]tmp are subject to a file search if all else fails 450 dnl lastlog and [uw]tmp are subject to a file search if all else fails
442 451
443 dnl lastlog detection 452 dnl lastlog detection
444 dnl NOTE: the code itself will detect if lastlog is a directory 453 dnl NOTE: the code itself will detect if lastlog is a directory
445 AC_MSG_CHECKING([if your system defines LASTLOG_FILE]) 454 AC_MSG_CHECKING([if your system defines LASTLOG_FILE])
446 AC_TRY_COMPILE([ 455 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
447 #include <sys/types.h> 456 #include <sys/types.h>
448 #include <utmp.h> 457 #include <utmp.h>
449 #ifdef HAVE_LASTLOG_H 458 #ifdef HAVE_LASTLOG_H
450 # include <lastlog.h> 459 # include <lastlog.h>
451 #endif 460 #endif
453 # include <paths.h> 462 # include <paths.h>
454 #endif 463 #endif
455 #ifdef HAVE_LOGIN_H 464 #ifdef HAVE_LOGIN_H
456 # include <login.h> 465 # include <login.h>
457 #endif 466 #endif
458 ], 467 ]],
459 [ char *lastlog = LASTLOG_FILE; ], 468 [[ char *lastlog = LASTLOG_FILE; ]])],
460 [ AC_MSG_RESULT(yes) ], 469 [ AC_MSG_RESULT(yes) ],
461 [ 470 [
462 AC_MSG_RESULT(no) 471 AC_MSG_RESULT(no)
463 AC_MSG_CHECKING([if your system defines _PATH_LASTLOG]) 472 AC_MSG_CHECKING([if your system defines _PATH_LASTLOG])
464 AC_TRY_COMPILE([ 473 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
465 #include <sys/types.h> 474 #include <sys/types.h>
466 #include <utmp.h> 475 #include <utmp.h>
467 #ifdef HAVE_LASTLOG_H 476 #ifdef HAVE_LASTLOG_H
468 # include <lastlog.h> 477 # include <lastlog.h>
469 #endif 478 #endif
470 #ifdef HAVE_PATHS_H 479 #ifdef HAVE_PATHS_H
471 # include <paths.h> 480 # include <paths.h>
472 #endif 481 #endif
473 ], 482 ]],
474 [ char *lastlog = _PATH_LASTLOG; ], 483 [[ char *lastlog = _PATH_LASTLOG; ]])],
475 [ AC_MSG_RESULT(yes) ], 484 [ AC_MSG_RESULT(yes) ],
476 [ 485 [
477 AC_MSG_RESULT(no) 486 AC_MSG_RESULT(no)
478 system_lastlog_path=no 487 system_lastlog_path=no
479 ]) 488 ])
498 AC_DEFINE_UNQUOTED(CONF_LASTLOG_FILE, "$conf_lastlog_location", lastlog file location) 507 AC_DEFINE_UNQUOTED(CONF_LASTLOG_FILE, "$conf_lastlog_location", lastlog file location)
499 fi 508 fi
500 509
501 dnl utmp detection 510 dnl utmp detection
502 AC_MSG_CHECKING([if your system defines UTMP_FILE]) 511 AC_MSG_CHECKING([if your system defines UTMP_FILE])
503 AC_TRY_COMPILE([ 512 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
504 #include <sys/types.h> 513 #include <sys/types.h>
505 #include <utmp.h> 514 #include <utmp.h>
506 #ifdef HAVE_PATHS_H 515 #ifdef HAVE_PATHS_H
507 # include <paths.h> 516 # include <paths.h>
508 #endif 517 #endif
509 ], 518 ]],
510 [ char *utmp = UTMP_FILE; ], 519 [[ char *utmp = UTMP_FILE; ]])],
511 [ AC_MSG_RESULT(yes) ], 520 [ AC_MSG_RESULT(yes) ],
512 [ AC_MSG_RESULT(no) 521 [ AC_MSG_RESULT(no)
513 system_utmp_path=no ] 522 system_utmp_path=no ]
514 ) 523 )
515 if test -z "$conf_utmp_location"; then 524 if test -z "$conf_utmp_location"; then
528 AC_DEFINE_UNQUOTED(CONF_UTMP_FILE, "$conf_utmp_location", utmp file location) 537 AC_DEFINE_UNQUOTED(CONF_UTMP_FILE, "$conf_utmp_location", utmp file location)
529 fi 538 fi
530 539
531 dnl wtmp detection 540 dnl wtmp detection
532 AC_MSG_CHECKING([if your system defines WTMP_FILE]) 541 AC_MSG_CHECKING([if your system defines WTMP_FILE])
533 AC_TRY_COMPILE([ 542 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
534 #include <sys/types.h> 543 #include <sys/types.h>
535 #include <utmp.h> 544 #ifdef HAVE_UTMP_H
545 # include <utmp.h>
546 #endif
536 #ifdef HAVE_PATHS_H 547 #ifdef HAVE_PATHS_H
537 # include <paths.h> 548 # include <paths.h>
538 #endif 549 #endif
539 ], 550 ]],
540 [ char *wtmp = WTMP_FILE; ], 551 [[ char *wtmp = WTMP_FILE; ]])],
541 [ AC_MSG_RESULT(yes) ], 552 [ AC_MSG_RESULT(yes) ],
542 [ AC_MSG_RESULT(no) 553 [ AC_MSG_RESULT(no)
543 system_wtmp_path=no ] 554 system_wtmp_path=no ]
544 ) 555 )
545 if test -z "$conf_wtmp_location"; then 556 if test -z "$conf_wtmp_location"; then
561 572
562 dnl utmpx detection - I don't know any system so perverse as to require 573 dnl utmpx detection - I don't know any system so perverse as to require
563 dnl utmpx, but not define UTMPX_FILE (ditto wtmpx.) No doubt it's out 574 dnl utmpx, but not define UTMPX_FILE (ditto wtmpx.) No doubt it's out
564 dnl there, though. 575 dnl there, though.
565 AC_MSG_CHECKING([if your system defines UTMPX_FILE]) 576 AC_MSG_CHECKING([if your system defines UTMPX_FILE])
566 AC_TRY_COMPILE([ 577 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
567 #include <sys/types.h> 578 #include <sys/types.h>
568 #include <utmp.h> 579 #include <utmp.h>
569 #ifdef HAVE_UTMPX_H 580 #ifdef HAVE_UTMPX_H
570 #include <utmpx.h> 581 #include <utmpx.h>
571 #endif 582 #endif
572 #ifdef HAVE_PATHS_H 583 #ifdef HAVE_PATHS_H
573 # include <paths.h> 584 # include <paths.h>
574 #endif 585 #endif
575 ], 586 ]],
576 [ char *utmpx = UTMPX_FILE; ], 587 [[ char *utmpx = UTMPX_FILE; ]])],
577 [ AC_MSG_RESULT(yes) ], 588 [ AC_MSG_RESULT(yes) ],
578 [ AC_MSG_RESULT(no) 589 [ AC_MSG_RESULT(no)
579 system_utmpx_path=no ] 590 system_utmpx_path=no ]
580 ) 591 )
581 if test -z "$conf_utmpx_location"; then 592 if test -z "$conf_utmpx_location"; then
586 AC_DEFINE_UNQUOTED(CONF_UTMPX_FILE, "$conf_utmpx_location", utmpx file location) 597 AC_DEFINE_UNQUOTED(CONF_UTMPX_FILE, "$conf_utmpx_location", utmpx file location)
587 fi 598 fi
588 599
589 dnl wtmpx detection 600 dnl wtmpx detection
590 AC_MSG_CHECKING([if your system defines WTMPX_FILE]) 601 AC_MSG_CHECKING([if your system defines WTMPX_FILE])
591 AC_TRY_COMPILE([ 602 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
592 #include <sys/types.h> 603 #include <sys/types.h>
593 #include <utmp.h> 604 #ifdef HAVE_UTMP_H
605 # include <utmp.h>
606 #endif
594 #ifdef HAVE_UTMPX_H 607 #ifdef HAVE_UTMPX_H
595 #include <utmpx.h> 608 # include <utmpx.h>
596 #endif 609 #endif
597 #ifdef HAVE_PATHS_H 610 #ifdef HAVE_PATHS_H
598 # include <paths.h> 611 # include <paths.h>
599 #endif 612 #endif
600 ], 613 ]],
601 [ char *wtmpx = WTMPX_FILE; ], 614 [[ char *wtmpx = WTMPX_FILE; ]])],
602 [ AC_MSG_RESULT(yes) ], 615 [ AC_MSG_RESULT(yes) ],
603 [ AC_MSG_RESULT(no) 616 [ AC_MSG_RESULT(no)
604 system_wtmpx_path=no ] 617 system_wtmpx_path=no ]
605 ) 618 )
606 if test -z "$conf_wtmpx_location"; then 619 if test -z "$conf_wtmpx_location"; then
613 626
614 # Checks for library functions. 627 # Checks for library functions.
615 AC_PROG_GCC_TRADITIONAL 628 AC_PROG_GCC_TRADITIONAL
616 AC_FUNC_MEMCMP 629 AC_FUNC_MEMCMP
617 AC_FUNC_SELECT_ARGTYPES 630 AC_FUNC_SELECT_ARGTYPES
618 AC_TYPE_SIGNAL
619 AC_CHECK_FUNCS([dup2 getspnam getusershell memset putenv select socket strdup clearenv strlcpy strlcat daemon basename _getpty getaddrinfo freeaddrinfo getnameinfo fork writev]) 631 AC_CHECK_FUNCS([dup2 getspnam getusershell memset putenv select socket strdup clearenv strlcpy strlcat daemon basename _getpty getaddrinfo freeaddrinfo getnameinfo fork writev])
620 632
621 AC_SEARCH_LIBS(basename, gen, AC_DEFINE(HAVE_BASENAME)) 633 AC_SEARCH_LIBS(basename, gen, AC_DEFINE(HAVE_BASENAME))
622 634
623 # Solaris needs ptmx 635 # Solaris needs ptmx
624 if test -z "$no_ptmx_check" ; then 636 if test -z "$no_ptmx_check" ; then
625 if test x"$cross_compiling" = x"no" ; then 637 if test x"$cross_compiling" = x"no" ; then
626 AC_CHECK_FILE("/dev/ptmx", AC_DEFINE(USE_DEV_PTMX,,Use /dev/ptmx)) 638 if test -e /dev/ptmx ; then
639 AC_DEFINE(USE_DEV_PTMX,,Use /dev/ptmx)
640 fi
627 else 641 else
628 AC_MSG_NOTICE([Not checking for /dev/ptmx, we're cross-compiling]) 642 AC_MSG_NOTICE([Not checking for /dev/ptmx, we're cross-compiling])
629 fi 643 fi
630 fi 644 fi
631 645
632 if test -z "$no_ptc_check" ; then 646 if test -z "$no_ptc_check" ; then
633 if test x"$cross_compiling" = x"no" ; then 647 if test x"$cross_compiling" = x"no" ; then
634 AC_CHECK_FILE("/dev/ptc", AC_DEFINE(HAVE_DEV_PTS_AND_PTC,,Use /dev/ptc & /dev/pts)) 648 if test -e /dev/ptc ; then
649 AC_DEFINE(HAVE_DEV_PTS_AND_PTC,,Use /dev/ptc & /dev/pts)
650 fi
635 else 651 else
636 AC_MSG_NOTICE([Not checking for /dev/ptc & /dev/pts since we're cross-compiling]) 652 AC_MSG_NOTICE([Not checking for /dev/ptc & /dev/pts since we're cross-compiling])
637 fi 653 fi
638 fi 654 fi
639 655
669 AS_MKDIR_P(libtomcrypt/src/modes/ecb) 685 AS_MKDIR_P(libtomcrypt/src/modes/ecb)
670 AS_MKDIR_P(libtomcrypt/src/modes/ofb) 686 AS_MKDIR_P(libtomcrypt/src/modes/ofb)
671 AS_MKDIR_P(libtomcrypt/src/modes/f8) 687 AS_MKDIR_P(libtomcrypt/src/modes/f8)
672 AS_MKDIR_P(libtomcrypt/src/modes/lrw) 688 AS_MKDIR_P(libtomcrypt/src/modes/lrw)
673 AS_MKDIR_P(libtomcrypt/src/pk/asn1/der/bit) 689 AS_MKDIR_P(libtomcrypt/src/pk/asn1/der/bit)
690 AS_MKDIR_P(libtomcrypt/src/pk/asn1/der/boolean)
674 AS_MKDIR_P(libtomcrypt/src/pk/asn1/der/choice) 691 AS_MKDIR_P(libtomcrypt/src/pk/asn1/der/choice)
675 AS_MKDIR_P(libtomcrypt/src/pk/asn1/der/ia5) 692 AS_MKDIR_P(libtomcrypt/src/pk/asn1/der/ia5)
676 AS_MKDIR_P(libtomcrypt/src/pk/asn1/der/integer) 693 AS_MKDIR_P(libtomcrypt/src/pk/asn1/der/integer)
677 AS_MKDIR_P(libtomcrypt/src/pk/asn1/der/object_identifier) 694 AS_MKDIR_P(libtomcrypt/src/pk/asn1/der/object_identifier)
678 AS_MKDIR_P(libtomcrypt/src/pk/asn1/der/octet) 695 AS_MKDIR_P(libtomcrypt/src/pk/asn1/der/octet)
679 AS_MKDIR_P(libtomcrypt/src/pk/asn1/der/printable_string) 696 AS_MKDIR_P(libtomcrypt/src/pk/asn1/der/printable_string)
680 AS_MKDIR_P(libtomcrypt/src/pk/asn1/der/sequence) 697 AS_MKDIR_P(libtomcrypt/src/pk/asn1/der/sequence)
698 AS_MKDIR_P(libtomcrypt/src/pk/asn1/der/set)
681 AS_MKDIR_P(libtomcrypt/src/pk/asn1/der/short_integer) 699 AS_MKDIR_P(libtomcrypt/src/pk/asn1/der/short_integer)
682 AS_MKDIR_P(libtomcrypt/src/pk/asn1/der/utctime) 700 AS_MKDIR_P(libtomcrypt/src/pk/asn1/der/utctime)
701 AS_MKDIR_P(libtomcrypt/src/pk/asn1/der/utf8)
683 AS_MKDIR_P(libtomcrypt/src/pk/dh) 702 AS_MKDIR_P(libtomcrypt/src/pk/dh)
684 AS_MKDIR_P(libtomcrypt/src/pk/dsa) 703 AS_MKDIR_P(libtomcrypt/src/pk/dsa)
685 AS_MKDIR_P(libtomcrypt/src/pk/ecc) 704 AS_MKDIR_P(libtomcrypt/src/pk/ecc)
705 AS_MKDIR_P(libtomcrypt/src/pk/katja)
686 AS_MKDIR_P(libtomcrypt/src/pk/pkcs1) 706 AS_MKDIR_P(libtomcrypt/src/pk/pkcs1)
687 AS_MKDIR_P(libtomcrypt/src/pk/rsa) 707 AS_MKDIR_P(libtomcrypt/src/pk/rsa)
688 AS_MKDIR_P(libtomcrypt/src/prng) 708 AS_MKDIR_P(libtomcrypt/src/prngs)
689 AC_CONFIG_HEADER(config.h) 709 AC_CONFIG_HEADER(config.h)
690 AC_OUTPUT(Makefile) 710 AC_CONFIG_FILES(Makefile libtomcrypt/Makefile libtommath/Makefile)
691 AC_OUTPUT(libtomcrypt/Makefile) 711 AC_OUTPUT
692 AC_OUTPUT(libtommath/Makefile)
693 712
694 AC_MSG_NOTICE() 713 AC_MSG_NOTICE()
695 if test $BUNDLED_LIBTOM = 1 ; then 714 if test $BUNDLED_LIBTOM = 1 ; then
696 AC_MSG_NOTICE(Using bundled libtomcrypt and libtommath) 715 AC_MSG_NOTICE(Using bundled libtomcrypt and libtommath)
697 else 716 else