X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=configure.ac;h=e1d3db640deee4605b4982c7f28aa880792c8343;hp=18031b0480d0e5b251af73002bbde131b83ba765;hb=57549529c86785b7ecf5f56d2a3ff42b5e519755;hpb=8911376d59cb5f0c4788b11a27de11048ecce158

diff --git a/configure.ac b/configure.ac
index 18031b0..e1d3db6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,6 +2,7 @@
 
 dnl    This file is part of linux-call-router
 dnl    Copyright (C) 2007 Joerg Habenicht (j.habenicht@gmx.de)
+dnl    Copyright (C) 2008 Peter Schlaile (peter -at- schlaile.de)
 
 dnl    This program is free software; you can redistribute it and/or
 dnl    modify it under the terms of the GNU General Public License as
@@ -23,23 +24,22 @@ dnl    Boston, MA 02110-1301, USA.
 dnl This keeps being the first instruction.
 dnl Change the 2nd argument if the version increases
 dnl 1st + 2nd argument is used for distribution package name
-AC_INIT(lcr, 0.1.20071001, pbx4linux@koeln.ccc.de)
-AC_PREREQ(2.61)
+AC_INIT(lcr, 1.4, andreas@eversberg.eu)
+AC_PREREQ(2.59)
 AC_CONFIG_SRCDIR([main.c])
-AC_CONFIG_HEADER([config.h])
+AM_CONFIG_HEADER(config.h)
 
 # fix warnings from autoconf + automake
 AC_GNU_SOURCE
-AC_USE_SYSTEM_EXTENSIONS
-AM_INIT_AUTOMAKE([dist-bzip2])
+# AC_USE_SYSTEM_EXTENSIONS
+AM_INIT_AUTOMAKE(lcr,1.4)
 
 
 
 # Checks for programs.
-dnl AC_CHECK_COMPILERS contains AC_PROG_CC AC_PROG_CPP and AC_PROG_CXX
-AC_CHECK_COMPILERS
-dnl AC_PROG_CXX
-dnl AC_PROG_CC
+AC_PROG_CPP
+AC_PROG_CXX
+AC_PROG_CC
 AC_PROG_INSTALL
 AC_PROG_MAKE_SET
 dnl required, if per binary CFLAGS are used
@@ -50,25 +50,25 @@ dnl AM_PROG_CC_C_O
 dnl enable this to have all special options on one place
 dnl AC_PRESERVE_HELP_ORDER
 
-# enable socket access to misdn kernel module on demand
-dnl SOCKET_MISDN=
-AC_ARG_ENABLE([socket_misdn],
-              [AS_HELP_STRING([--enable-socket-misdn],
-                              [use socket connection to misdn kernel code (default=disable)])
-              ],
-              [use_misdn_socket="yes"],
-              [use_misdn_socket="no"]
-             )
-AM_CONDITIONAL(ENABLE_SOCKET_MISDN, test "x$use_misdn_socket" == "xyes" )
-
 # check for asterisk
 AC_ARG_WITH([asterisk],
 	[AS_HELP_STRING([--with-asterisk],
-			[compile with built-in Asterisk channel driver @<:@default=no@:>@])
+			[compile with built-in Asterisk channel driver @<:@default=check@:>@])
 	],
-	[with_asterisk_channel_driver="yes"],
-	[with_asterisk_channel_driver="no"])
-AM_CONDITIONAL(ENABLE_ASTERISK_CHANNEL_DRIVER, test "x$with_asterisk_channel_driver" == "xyes" )
+	[],
+	[with_asterisk="check"])
+
+AS_IF([test "x$with_asterisk" != xno],
+      [AC_CHECK_HEADERS([asterisk/compiler.h],
+			[with_asterisk="yes"],
+			[if test "x$with_asterisk" != xcheck ; then
+                      AC_MSG_FAILURE(
+                        [--with-asterisk was given, but test for header-file asterisk/compiler.h failed])
+                     fi
+		     ])
+      ])
+
+AM_CONDITIONAL(ENABLE_ASTERISK_CHANNEL_DRIVER, test "x$with_asterisk" == "xyes" )
 
 # check for crypto
 AC_ARG_WITH([ssl],
@@ -94,45 +94,17 @@ AS_IF([test "x$with_ssl" != xno],
                    )
       ]
      )
-AM_CONDITIONAL(WITH_CRYPTO, test "x$LIBCRYPTO" == "x-lcrypto" )
-
-# check for isdn_net.h
-# check for mISDNlib.h
-# --with-isdn_net-include=<include>, default: env MISDNUSER= , $include/mISDNuser
-
-# self written test for mISDNuser lib
-AC_PATH_MISDNUSER
-
-# self written test for mISDN kernel header
-AC_PATH_MISDNKERNEL
-
-
-
 
 # Checks for libraries.
-dnl FIXME: Replace `main' with a function in `-ldl':
-dnl AC_CHECK_LIB([dl], [main])
-dnl FIXME: Replace `main' with a function in `-lh323_linux_x86_r':
-dnl AC_CHECK_LIB([h323_linux_x86_r], [main])
-dnl FIXME: Replace `main' with a function in `-lisdnnet':
-dnl AC_CHECK_LIB([isdnnet], [main])
-# FIXME: Replace `main' with a function in `-lm':
 AC_CHECK_LIB([m], [main])
-dnl FIXME: Replace `main' with a function in `-lmISDN':
-dnl AC_CHECK_LIB([mISDN], [main])
-# FIXME: Replace `main' with a function in `-lncurses':
 AC_CHECK_LIB([ncurses], [main])
-dnl FIXME: Replace `main' with a function in `-lpt_linux_x86_r':
-dnl AC_CHECK_LIB([pt_linux_x86_r], [main])
-# FIXME: Replace `main' with a function in `-lpthread':
 AC_CHECK_LIB([pthread], [main])
 
 # Checks for header files.
 AC_HEADER_DIRENT
 AC_HEADER_STDC
 AC_HEADER_SYS_WAIT
-AC_CHECK_HEADERS([fcntl.h netinet/in.h stdlib.h string.h sys/file.h sys/ioctl.h sys/socket.h sys/time.h unistd.h ctype.h assert.h])
-AC_HEADER_ASSERT
+AC_CHECK_HEADERS([fcntl.h netinet/in.h stdlib.h string.h sys/file.h sys/ioctl.h sys/socket.h sys/time.h unistd.h ctype.h assert.h mISDNuser/mbuffer.h assert.h])
 
 # Checks for typedefs, structures, and compiler characteristics.
 AC_HEADER_STDBOOL
@@ -155,11 +127,6 @@ AC_FUNC_STRTOD
 AC_FUNC_VPRINTF
 AC_CHECK_FUNCS([gettimeofday memmove memset mkdir socket strcasecmp strchr strerror strncasecmp strstr strtol strtoul])
 
-AC_SUBST(misdnuser_libraries)
-AC_SUBST(misdnuser_includes)
-AC_SUBST(misdnkernel_includes)
-AC_SUBST(all_includes)
-AC_SUBST(all_libraries)
 
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT