#
# Author: Pekka Riikonen <priikone@silcnet.org>
#
-# Copyright (C) 2000 - 2006 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
-case "$host_cpu" in
- i386)
- AC_DEFINE([SILC_I386], [], [SILC_I386])
- AC_DEFINE([SILC_I486], [], [SILC_I486])
- ;;
- i?86)
- AC_DEFINE([SILC_I486], [], [SILC_I486])
- ;;
- x86_64)
- AC_DEFINE([SILC_X86_64], [], [SILC_X86_64])
- ;;
- powerpc*)
- AC_DEFINE([SILC_POWERPC], [], [SILC_POWERPC])
- ;;
- ia64)
- AC_DEFINE([SILC_IA64], [], [SILC_IA64])
- ;;
-esac
-
# 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_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)
want_asm=true
])
-##
-## va_copy 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
-
##
## Compiler and compiler flag checks
##
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_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