#
# Author: Pekka Riikonen <priikone@silcnet.org>
#
-# Copyright (C) 2000 - 2007 Pekka Riikonen
+# Copyright (C) 2000 - 2005 Pekka Riikonen
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
;;
esac
-# Get CPU
-cpu_i386=false
-cpu_ix86=false
-cpu_x86_64=false
-cpu_ppc=false
-cpu_ia64=false
-case "$host_cpu" in
- i386)
- AC_DEFINE([SILC_I386], [], [SILC_I386])
- AC_DEFINE([SILC_I486], [], [SILC_I486])
- cpu_i386=true
- cpu_ix86=true
- ;;
- i?86)
- AC_DEFINE([SILC_I486], [], [SILC_I486])
- cpu_ix86=true
- ;;
- x86_64)
- AC_DEFINE([SILC_X86_64], [], [SILC_X86_64])
- cpu_x86_64=true
- ;;
- powerpc*)
- AC_DEFINE([SILC_POWERPC], [], [SILC_POWERPC])
- cpu_ppc=true
- ;;
- ia64)
- AC_DEFINE([SILC_IA64], [], [SILC_IA64])
- cpu_ia64=true
- ;;
-esac
-AM_CONDITIONAL(SILC_I386, test x$cpu_i386 = xtrue)
-AM_CONDITIONAL(SILC_I486, test x$cpu_ix86 = xtrue)
-AM_CONDITIONAL(SILC_X86_64, test x$cpu_x86_64 = xtrue)
-AM_CONDITIONAL(SILC_POWERPC, test x$cpu_ppc = xtrue)
-AM_CONDITIONAL(SILC_IA64, test x$cpu_ia64 = xtrue)
-
# Control compiler optimizations
CFLAGS=`echo $CFLAGS | sed 's/-O[ 0123456789s]*//g'`
#ifndef SILC_DIST_TOOLKIT
AC_DISABLE_SHARED
#endif SILC_DIST_TOOLKIT
-#ifdef SILC_DIST_INPLACE
-AC_DISABLE_SHARED
-#endif SILC_DIST_INPLACE
AC_PROG_LIBTOOL
# Header checking
AC_SUBST(SILC_SIZEOF_CHAR, $ac_cv_sizeof_char)
AC_CHECK_SIZEOF(void *, 0)
AC_SUBST(SILC_SIZEOF_VOID_P, $ac_cv_sizeof_void_p)
-AC_CHECK_TYPES(long long)
-AC_CHECK_TYPES(long double)
-
-# Function to check if compiler flag works
-# Usage: SILC_ADD_CFLAGS(FLAGS, [ACTION-IF-FAILED])
-AC_DEFUN([SILC_ADD_CFLAGS],
-[ tmp_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS $1"
- AC_MSG_CHECKING(whether $CC accepts $1 flag)
- AC_TRY_LINK([], [], [AC_MSG_RESULT(yes)], [AC_MSG_RESULT(no)
- CFLAGS="$tmp_CFLAGS"
- $2])
- unset tmp_CFLAGS
-])
-
-# Function to check if compiler flag works, destination specifiable
-# Usage: SILC_ADD_CC_FLAGS(VAR, FLAGS, [ACTION-IF-FAILED])
-AC_DEFUN([SILC_ADD_CC_FLAGS],
-[ tmp_CFLAGS="$1_CFLAGS"
- $1_CFLAGS="${$1_CFLAGS} $2"
- AC_MSG_CHECKING(whether $CC accepts $2 flag)
- AC_TRY_LINK([], [], [AC_MSG_RESULT(yes)], [AC_MSG_RESULT(no)
- $1_CFLAGS="$tmp_CFLAGS"
- $3])
- unset tmp_CFLAGS
-])
# Function and library checking
#
AC_CHECK_LIB(socket, socket, LIBS="$LIBS -lsocket")
)
AC_CHECK_FUNCS(gethostname gethostbyaddr getservbyname getservbyport)
-AC_CHECK_FUNCS(poll select listen bind shutdown close connect setsockopt)
-AC_CHECK_FUNCS(setrlimit time ctime utime gettimeofday getrusage)
+AC_CHECK_FUNCS(select listen bind shutdown close connect setsockopt)
+AC_CHECK_FUNCS(time ctime utime gettimeofday getrusage)
AC_CHECK_FUNCS(chmod fcntl stat fstat getenv putenv strerror)
AC_CHECK_FUNCS(getpid getgid getsid getpgid getpgrp getuid)
-AC_CHECK_FUNCS(setgroups initgroups nl_langinfo epoll_wait)
-AC_CHECK_FUNCS(strchr snprintf strstr strcpy strncpy memcpy memset memmove)
+AC_CHECK_FUNCS(setgroups initgroups nl_langinfo)
+AC_CHECK_FUNCS(strchr strstr strcpy strncpy memcpy memset memmove)
#ifdef SILC_DIST_SIM
# SIM support checking
[ --disable-asm do not use assembler optimizations],
[
AC_MSG_RESULT(no)
- AC_DEFINE([SILC_NO_ASM], [], [SILC_NO_ASM])
want_asm=false
],
[
AC_MSG_RESULT(yes)
want_asm=true
])
-AM_CONDITIONAL(SILC_NO_ASM, test x$want_asm = xfalse)
-
-# Check for assembler
-#
-SILC_ASSEMBLER=""
-have_assembler=false
-if test x$want_asm = xtrue; then
- AC_PATH_PROG([NASM], [nasm], [no])
- if test "x$NASM" != "xno"; then
- SILC_ASSEMBLER="$NASM -O2 -felf"
- have_assembler=true
- fi
-
- AC_PATH_PROG([YASM], [yasm], [no])
- if test "x$YASM" != "xno"; then
- SILC_ASSEMBLER="$YASM -Xgnu -felf"
- have_assembler=true
- fi
-fi
-AC_SUBST(SILC_ASSEMBLER)
##
-## va_copy checks
+## Compiler and compiler flag checks
##
-va_copy=false
-AC_MSG_CHECKING(for va_copy)
-AC_TRY_COMPILE(
- [
- #include <stdarg.h>
- #include <stdlib.h>
- ],
- [
- int t(int x, ...)
- {
- va_list va, cp;
- va_start(va, x);
- va_copy(cp, va);
- if (va_arg(cp, int) != 0xff11)
- return 1;
- va_end(va);
- va_end(cp);
- return 0;
- }
- int main()
- {
- return t(0, 0xff11);
- }
- ],
- [
- AC_DEFINE([HAVE_VA_COPY], [], [HAVE_VA_COPY])
- AC_MSG_RESULT(yes)
- va_copy=true
- ],
- [
- AC_MSG_RESULT(no)
- va_copy=false
- ]
-)
-if test x$va_copy = xfalse; then
- AC_MSG_CHECKING(for __va_copy)
- AC_TRY_COMPILE(
- [
- #include <stdarg.h>
- #include <stdlib.h>
- ],
- [
- int t(int x, ...)
- {
- va_list va, cp;
- va_start(va, x);
- __va_copy(cp, va);
- if (va_arg(cp, int) != 0xff11)
- return 1;
- va_end(va);
- va_end(cp);
- return 0;
- }
- int main()
- {
- return t(0, 0xff11);
- }
- ],
- [
- AC_DEFINE([HAVE___VA_COPY], [], [HAVE___VA_COPY])
- AC_MSG_RESULT(yes)
- va_copy=true
- ],
- [
- AC_MSG_RESULT(no)
- va_copy=false
- ]
- )
-fi
-
-if test x$va_copy = xfalse; then
- AC_RUN_IFELSE(
- [
- #include <stdarg.h>
- #include <stdlib.h>
- int t(int x, ...)
- {
- va_list va, cp;
- va_start(va, x);
- cp = va;
- if (va_arg(cp, int) != 0xff11)
- return 1;
- va_end(va);
- va_end(cp);
- return 0;
- }
- int main()
- {
- return t(0, 0xff11);
- }
- ],
- [va_copy=false],
- [
- AC_DEFINE([SILC_VA_COPY_ARRAY], [], [SILC_VA_COPY_ARRAY])
- ],
- [va=copy=false]
- )
-fi
+# Function to check if compiler flag works
+# Usage: SILC_ADD_CFLAGS(FLAGS, [ACTION-IF-FAILED])
+AC_DEFUN([SILC_ADD_CFLAGS],
+[ tmp_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS $1"
+ AC_MSG_CHECKING(whether $CC accepts $1 flag)
+ AC_TRY_LINK([], [], [AC_MSG_RESULT(yes)], [AC_MSG_RESULT(no)
+ CFLAGS="$tmp_CFLAGS"
+ $2])
+ unset tmp_CFLAGS
+])
-##
-## Compiler and compiler flag checks
-##
+# Function to check if compiler flag works, destination specifiable
+# Usage: SILC_ADD_CC_FLAGS(VAR, FLAGS, [ACTION-IF-FAILED])
+AC_DEFUN([SILC_ADD_CC_FLAGS],
+[ tmp_CFLAGS="$1_CFLAGS"
+ $1_CFLAGS="${$1_CFLAGS} $2"
+ AC_MSG_CHECKING(whether $CC accepts $2 flag)
+ AC_TRY_LINK([], [], [AC_MSG_RESULT(yes)], [AC_MSG_RESULT(no)
+ $1_CFLAGS="$tmp_CFLAGS"
+ $3])
+ unset tmp_CFLAGS
+])
if test "$GCC"; then
# GCC specific options
fi
# Check libs to link against
- f=`$EGREP __SILC_HAVE_PTHREAD $ac_silc_includes/silc.h`
+ f=`$EGREP __SILC_HAVE_PTHREAD $ac_silc_includes/silcincludes.h`
if test -n "$f"; then
LIBS="$LIBS -lpthread"
check_threads=false
has_threads=true
fi
- f=`$EGREP __SILC_HAVE_SIM $ac_silc_includes/silc.h`
+ f=`$EGREP __SILC_HAVE_SIM $ac_silc_includes/silcincludes.h`
if test -n "$f"; then
LIBS="$LIBS -ldl"
fi
#ifdef SILC_DIST_CLIENTLIB
PKG_CHECK_MODULES(SILCCLIENT, silcclient, compile_libs=false, compile_libs=true)
#endif SILC_DIST_CLIENTLIB
-#ifdef SILC_DIST_SERVERLIB
- PKG_CHECK_MODULES(SILCSERVER, silcserver, compile_libs=false, compile_libs=true)
-#endif SILC_DIST_SERVERLIB
if test x$compile_libs = xfalse; then
LIBSUBDIR=
LIBS="$LIBS $SILCCLIENT_LIBS"
CFLAGS="$CFLAGS $SILCCLIENT_CFLAGS"
#endif SILC_DIST_CLIENTLIB
-#ifdef SILC_DIST_SERVERLIB
- LIBS="$LIBS $SILCSERVER_LIBS"
- CFLAGS="$CFLAGS $SILCSERVER_CFLAGS"
-#endif SILC_DIST_SERVERLIB
fi
fi
#endif SILC_DIST_TOOLKIT
AM_CONDITIONAL(SILC_MP_GMP, test x$mp_gmp = xtrue)
AM_CONDITIONAL(SILC_MP_SILCMATH, test x$mp_gmp = xfalse)
if test x$mp_gmp = xfalse; then
- AC_DEFINE([SILC_MP_SILCMATH], [], [SILCMATH])
+ AC_DEFINE([SILC_MP_SILCMAP], [], [SILCMATH])
AC_MSG_RESULT(Using SILC Math as a MP library.)
fi
#endif SILC_DIST_MATH
])
AM_CONDITIONAL(SILC_WIN32, test x$win32_support = xtrue)
-# Native Symbian OS support (disabled by default)
+# Native EPOC support (disabled by default)
#
-AM_CONDITIONAL(SILC_SYMBIAN, test xfalse = xtrue)
+AM_CONDITIONAL(SILC_EPOC, test xfalse = xtrue)
# Native BeOS support (disabled by default)
#
#
AM_CONDITIONAL(SILC_OS2, test xfalse = xtrue)
+# Make enable-shared aware
+AM_CONDITIONAL(SILC_ENABLE_SHARED, test "$enable_shared" = yes)
+
#ifdef SILC_DIST_TOOLKIT
# --with-irssi
#
## Misc
##
-# Make enable-shared aware
-AM_CONDITIONAL(SILC_ENABLE_SHARED, test "$enable_shared" = yes)
-
SILC_TOP_SRCDIR=`pwd`
# Included configure scripts
Makefile.defines_int
includes/Makefile
includes/silcversion.h
-includes/silc.h
+includes/silcincludes.h
#endif SILC_DIST_COMPILER
#ifdef SILC_DIST_APPS
apps/Makefile