diff options
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index d135dc04..2c136526 100644 --- a/configure.ac +++ b/configure.ac @@ -321,6 +321,20 @@ AC_C_BIGENDIAN( [AC_MSG_ERROR([Cannot determine CPU endianity.])] ) +BIRD_CHECK_ANDROID_GLOB +if test "$bird_cv_lib_glob" = no ; then + AC_MSG_ERROR([glob.h not found.]) +elif test "$bird_cv_lib_glob" != yes ; then + LIBS="$LIBS $bird_cv_lib_glob" +fi + +BIRD_CHECK_ANDROID_LOG +if test "$bird_cv_lib_log" = no ; then + AC_MSG_ERROR([don't know how to link syslog.]) +elif test "$bird_cv_lib_log" != yes ; then + LIBS="$LIBS $bird_cv_lib_log" +fi + if test "$enable_debug" = yes ; then AC_DEFINE([DEBUGGING], [1], [Define to 1 if debugging is enabled]) if test "$enable_memcheck" = yes ; then @@ -382,7 +396,7 @@ AC_SUBST([CLIENT_LIBS]) mkdir -p $objdir/sysdep AC_CONFIG_HEADERS([$objdir/sysdep/autoconf.h:sysdep/autoconf.h.in]) AC_CONFIG_COMMANDS([merge], - [ export CPP="$CPP"; $srcdir/tools/mergedirs $srcdir $srcdir_rel $objdir $sysdep_dirs ], + [ export CPP="$CPP"; sh $srcdir/tools/mergedirs $srcdir $srcdir_rel $objdir $sysdep_dirs ], [ srcdir=$srcdir srcdir_rel=$srcdir_rel @@ -405,4 +419,4 @@ AC_MSG_RESULT([ Debugging: $enable_debug]) AC_MSG_RESULT([ POSIX threads: $enable_pthreads]) AC_MSG_RESULT([ Routing protocols: $protocols]) AC_MSG_RESULT([ Client: $enable_client]) -rm -f $objdir/.*-stamp +rm -f $objdir/.*-stamp
\ No newline at end of file |