Commit b81a73d1 authored by Ondřej Zajíček's avatar Ondřej Zajíček

Minor autoconf cleanups

Make indentation and quotation consistent in configure macros.
Also remove --with-sysinclude option, which was broken for 7 years
and nobody complained.

Thanks to Ruben Kerkhof for source patches.
parent e40542ef
...@@ -5,8 +5,9 @@ ...@@ -5,8 +5,9 @@
/bird /bird
/birdc /birdc
/birdcl /birdcl
/bird.conf
/bird.log
/config.log /config.log
/config.status /config.status
/configure /configure
/bird.conf /sysdep/autoconf.h.in
/bird.log
...@@ -2,69 +2,119 @@ dnl ** Additional Autoconf tests for BIRD configure script ...@@ -2,69 +2,119 @@ dnl ** Additional Autoconf tests for BIRD configure script
dnl ** (c) 1999 Martin Mares <mj@ucw.cz> dnl ** (c) 1999 Martin Mares <mj@ucw.cz>
AC_DEFUN([BIRD_CHECK_STRUCT_ALIGN], AC_DEFUN([BIRD_CHECK_STRUCT_ALIGN],
[AC_CACHE_CHECK([usual alignment of structures],bird_cv_c_struct_align,[ [
AC_TRY_RUN([ AC_CACHE_CHECK(
#include <stdio.h> [usual alignment of structures],
[bird_cv_c_struct_align],
struct { char x; long int y; } ary[2]; [
AC_TRY_RUN(
int main(void) [
{ #include <stdio.h>
FILE *f = fopen("conftestresult", "w");
if (!f) return 10; struct { char x; long int y; } ary[2];
fprintf(f, "%d", sizeof(ary)/2);
fclose(f); int main(void)
exit(0); {
} FILE *f = fopen("conftestresult", "w");
],[ if (!f)
bird_cv_c_struct_align=`cat conftestresult` return 10;
],[ fprintf(f, "%d", sizeof(ary)/2);
AC_MSG_RESULT([test program failed]) fclose(f);
AC_MSG_ERROR([Cannot determine structure alignment]) exit(0);
],[bird_cv_c_struct_align=16]) }
]) ],
AC_DEFINE_UNQUOTED([CPU_STRUCT_ALIGN], [$bird_cv_c_struct_align], [Usual alignment of structures]) [bird_cv_c_struct_align=$(cat conftestresult)],
[
AC_MSG_RESULT([test program failed])
AC_MSG_ERROR([Cannot determine structure alignment])
],
[bird_cv_c_struct_align=16]
)
]
)
AC_DEFINE_UNQUOTED([CPU_STRUCT_ALIGN],
[$bird_cv_c_struct_align],
[Usual alignment of structures]
)
]) ])
AC_DEFUN([BIRD_CHECK_TIME_T], AC_DEFUN([BIRD_CHECK_TIME_T],
[AC_CACHE_CHECK([characteristics of time_t], bird_cv_type_time_t, [ [
AC_TRY_RUN([ AC_CACHE_CHECK(
#include <stdio.h> [characteristics of time_t],
#include <sys/time.h> [bird_cv_type_time_t],
#include <limits.h> [
AC_TRY_RUN(
int main(void) [
{ #include <stdio.h>
FILE *f = fopen("conftestresult", "w"); #include <sys/time.h>
if (!f) return 10; #include <limits.h>
fprintf(f, "%d-bit ", sizeof(time_t)*CHAR_BIT);
if ((time_t) -1 > 0) fprintf(f, "un"); int main(void)
fprintf(f, "signed"); {
fclose(f); FILE *f = fopen("conftestresult", "w");
exit(0); if (!f)
} return 10;
],[bird_cv_type_time_t=`cat conftestresult` fprintf(f, "%d-bit ", sizeof(time_t)*CHAR_BIT);
],[ AC_MSG_RESULT([test program failed]) if ((time_t) -1 > 0)
AC_MSG_ERROR([Cannot determine time_t size and signedness.]) fprintf(f, "un");
],[bird_cv_type_time_t="32-bit signed"]) fprintf(f, "signed");
]) fclose(f);
case "$bird_cv_type_time_t" in exit(0);
*64-bit*) AC_DEFINE([TIME_T_IS_64BIT], [1], [Define to 1 if time_t is 64 bit]) ;; }
esac ],
case "$bird_cv_type_time_t" in [bird_cv_type_time_t=$(cat conftestresult)],
*unsigned*) ;; [
*) AC_DEFINE([TIME_T_IS_SIGNED], [1], [Define to 1 if time_t is signed]) ;; AC_MSG_RESULT([test program failed])
esac AC_MSG_ERROR([Cannot determine time_t size and signedness.])
],
[bird_cv_type_time_t="32-bit signed"]
)
]
)
case "$bird_cv_type_time_t" in
*64-bit*)
AC_DEFINE([TIME_T_IS_64BIT], [1], [Define to 1 if time_t is 64 bit])
;;
esac
case "$bird_cv_type_time_t" in
*unsigned*)
;;
*)
AC_DEFINE([TIME_T_IS_SIGNED], [1], [Define to 1 if time_t is signed])
;;
esac
]) ])
AC_DEFUN([BIRD_CHECK_PTHREADS], AC_DEFUN([BIRD_CHECK_PTHREADS],
[ [
bird_tmp_cflags="$CFLAGS" bird_tmp_cflags="$CFLAGS"
CFLAGS="$CFLAGS -pthread" CFLAGS="$CFLAGS -pthread"
AC_CACHE_CHECK([whether POSIX threads are available], bird_cv_lib_pthreads,
[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <pthread.h>]], [[pthread_t pt; pthread_create(&pt, NULL, NULL, NULL); pthread_spinlock_t lock; pthread_spin_lock(&lock); ]])], AC_CACHE_CHECK(
[bird_cv_lib_pthreads=yes], [bird_cv_lib_pthreads=no])]) [whether POSIX threads are available],
[bird_cv_lib_pthreads],
[
AC_LINK_IFELSE(
[
AC_LANG_PROGRAM(
[ #include <pthread.h> ],
[
pthread_t pt;
pthread_create(&pt, NULL, NULL, NULL);
pthread_spinlock_t lock;
pthread_spin_lock(&lock);
]
)
],
[bird_cv_lib_pthreads=yes],
[bird_cv_lib_pthreads=no]
)
]
)
CFLAGS="$bird_tmp_cflags" CFLAGS="$bird_tmp_cflags"
]) ])
...@@ -72,10 +122,19 @@ AC_DEFUN([BIRD_CHECK_PTHREADS], ...@@ -72,10 +122,19 @@ AC_DEFUN([BIRD_CHECK_PTHREADS],
AC_DEFUN([BIRD_CHECK_GCC_OPTION], AC_DEFUN([BIRD_CHECK_GCC_OPTION],
[ [
bird_tmp_cflags="$CFLAGS" bird_tmp_cflags="$CFLAGS"
CFLAGS="$3 $2" CFLAGS="$3 $2"
AC_CACHE_CHECK([whether CC supports $2], $1,
[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])], [$1=yes], [$1=no])]) AC_CACHE_CHECK(
[whether CC supports $2],
[$1],
[
AC_COMPILE_IFELSE(
[AC_LANG_PROGRAM()],
[$1=yes],
[$1=no]
)
]
)
CFLAGS="$bird_tmp_cflags" CFLAGS="$bird_tmp_cflags"
]) ])
...@@ -88,14 +147,19 @@ AC_DEFUN([BIRD_ADD_GCC_OPTION], ...@@ -88,14 +147,19 @@ AC_DEFUN([BIRD_ADD_GCC_OPTION],
]) ])
# BIRD_CHECK_PROG_FLAVOR_GNU(PROGRAM-PATH, IF-SUCCESS, [IF-FAILURE]) # BIRD_CHECK_PROG_FLAVOR_GNU(PROGRAM-PATH, IF-SUCCESS, [IF-FAILURE])
# copied autoconf internal _AC_PATH_PROG_FLAVOR_GNU # copied from autoconf internal _AC_PATH_PROG_FLAVOR_GNU
AC_DEFUN([BIRD_CHECK_PROG_FLAVOR_GNU], AC_DEFUN([BIRD_CHECK_PROG_FLAVOR_GNU],
[# Check for GNU $1 [
case `"$1" --version 2>&1` in # Check for GNU $1
*GNU*) case `"$1" --version 2>&1` in
$2;; *GNU*)
m4_ifval([$3], $2
[*) ;;
$3;; m4_ifval([$3],
])esac [*)
$3
;;
]
)
esac
]) ])
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment