X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=configure.ac;h=3768da57ddf2d8362ea64f8a1d9b4a41b03c2584;hp=6f8878a3e09c5b8b30f4f42f4a43825000b3c7a9;hb=f189411b9986564c2652ef87e54189e5fa0d5d11;hpb=c685233a75d7c592ce0574382bc876d88def2a5b

diff --git a/configure.ac b/configure.ac
index 6f8878a3..3768da57 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,8 @@
 
 AC_PREREQ([2.61])
 
-AC_INIT([paraslash],[git],[maan@tuebingen.mpg.de])
+AC_INIT([paraslash], [m4_esyscmd_s(./GIT-VERSION-GEN)],
+	[maan@tuebingen.mpg.de], [], [http://people.tuebingen.mpg.de/maan/paraslash/])
 AC_CONFIG_HEADERS([config.h])
 
 AC_CONFIG_FILES([Makefile])
@@ -23,6 +24,46 @@ AC_DEFUN([objlist_to_errlist],[ \
 	make_errlist_defines($@) \
 	[const char **para_errlist[[]]] = {make_para_errlists($@)} \
 ])
+AC_DEFUN([LIB_ARG_WITH], [
+	AC_ARG_WITH($1-headers, [AS_HELP_STRING(--with-$1-headers=dir,
+		[look for $1 headers in dir])])
+	AC_ARG_WITH($1-libs, [AS_HELP_STRING(--with-$1-libs=dir,
+		[look for $1 libraries in dir])])
+	if test -n "$with_$1_headers"; then
+		$1_cppflags="-I$with_$1_headers"
+		CPPFLAGS="$CPPFLAGS $$1_cppflags"
+	fi
+	if test -n "$with_$1_libs"; then
+		$1_ldflags="-L$with_$1_libs $2"
+	else
+		$1_ldflags="$2"
+	fi
+	LDFLAGS="$LDFLAGS $$1_ldflags"
+])
+
+AC_DEFUN([STASH_FLAGS], [
+	OLD_CPPFLAGS="$CPPFLAGS"
+	OLD_LDFLAGS="$LDFLAGS"
+	OLD_LIBS="$LIBS"
+])
+
+AC_DEFUN([UNSTASH_FLAGS], [
+	CPPFLAGS="$OLD_CPPFLAGS"
+	LDFLAGS="$OLD_LDFLAGS"
+	LIBS="$OLD_LIBS"
+])
+AC_DEFUN([LIB_SUBST_FLAGS], [
+	if test "$HAVE_[]m4_toupper([$1])" == 'yes'; then
+		AC_DEFINE(HAVE_[]m4_toupper([$1]), 1,
+			define to 1 to turn on $1 support)
+	else
+		$1_cppflags=
+		$1_ldflags=
+	fi
+	AC_SUBST(HAVE_[]m4_toupper([$1]))
+	AC_SUBST($1_cppflags)
+	AC_SUBST($1_ldflags)
+])
 
 AC_PATH_PROG(UNAMEPATH, uname, no)
 if test "$UNAMEPATH" = "no"; then
@@ -55,54 +96,6 @@ test -z "$install" && AC_MSG_ERROR(
 AC_PROG_CC
 AC_PROG_CPP
 
-AC_HEADER_DIRENT
-AC_HEADER_STDC
-AC_HEADER_SYS_WAIT
-AC_HEADER_STDBOOL
-AC_CHECK_HEADERS([arpa/inet.h ctype.h fcntl.h limits.h netdb.h netinet/in.h \
-	stdlib.h string.h sys/socket.h sys/time.h sys/timeb.h sys/un.h \
-	sys/ipc.h unistd.h utime.h stddef.h],
-	[], [AC_MSG_ERROR([$ac_header not found])])
-
-# Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
-AC_C_INLINE
-AC_TYPE_OFF_T
-AC_TYPE_PID_T
-AC_TYPE_SIZE_T
-AC_HEADER_TIME
-AC_STRUCT_TM
-AC_TYPE_INT8_T
-AC_TYPE_INT16_T
-AC_TYPE_INT32_T
-AC_TYPE_INT64_T
-AC_TYPE_MODE_T
-AC_TYPE_SSIZE_T
-AC_TYPE_UID_T
-AC_TYPE_UINT8_T
-AC_TYPE_UINT16_T
-AC_TYPE_UINT32_T
-AC_TYPE_UINT64_T
-
-# Checks for library functions.
-AC_FUNC_FORK
-AC_PROG_GCC_TRADITIONAL
-AC_FUNC_MEMCMP
-AC_FUNC_MKTIME
-AC_FUNC_MMAP
-AC_FUNC_SELECT_ARGTYPES
-AC_FUNC_STAT
-AC_FUNC_STRFTIME
-AC_FUNC_VPRINTF
-AC_FUNC_CLOSEDIR_VOID
-AC_FUNC_LSTAT
-
-AC_CHECK_FUNCS([atexit dup2 memchr memmove memset \
-	regcomp select strchr strdup strerror strstr strtol uname \
-	fchdir gettimeofday localtime_r munmap strcasecmp strcspn \
-	strncasecmp strrchr strspn alarm mkdir inet_ntoa socket], [],
-	[AC_MSG_ERROR([function not found, cannot live without it])])
-
 executables="recv filter audioc write afh play"
 ################################################################## clock_gettime
 clock_gettime_lib=
@@ -116,41 +109,15 @@ fi
 if test "$clock_gettime_lib" = "rt"; then
 	AC_SUBST(clock_gettime_ldflags, -lrt)
 fi
+
 ########################################################################### osl
-have_osl=yes
-OLD_CPPFLAGS="$CPPFLAGS"
-OLD_LDFLAGS="$LDFLAGS"
-OLD_LIBS="$LIBS"
-AC_ARG_WITH(osl_headers, [AS_HELP_STRING(--with-osl-headers=dir,
-	[look for osl.h also in dir])])
-if test -n "$with_osl_headers"; then
-	osl_cppflags="-I$with_osl_headers"
-	CPPFLAGS="$CPPFLAGS $osl_cppflags"
-fi
-AC_ARG_WITH(osl_libs, [AS_HELP_STRING(--with-osl-libs=dir,
-	[look for libosl also in dir])])
-if test -n "$with_osl_libs"; then
-	osl_libs="-L$with_osl_libs"
-	LDFLAGS="$LDFLAGS $osl_libs"
-fi
-
-AC_CHECK_HEADER(osl.h, [], have_osl=no)
-AC_CHECK_LIB([osl], [osl_open_table], [], have_osl=no)
-if test "$have_osl" = "yes"; then
-	AC_SUBST(osl_cppflags)
-	osl_ldflags="$osl_libs -losl"
-	AC_SUBST(osl_ldflags)
-else
-	AC_MSG_WARN([libosl not found, can not build para_server.
-Download libosl at
-	http://people.tuebingen.mpg.de/maan/osl/
-or execute
-	git clone git://git.tuebingen.mpg.de/osl
-	])
-fi
-CPPFLAGS="$OLD_CPPFLAGS"
-LDFLAGS="$OLD_LDFLAGS"
-LIBS="$OLD_LIBS"
+STASH_FLAGS
+LIB_ARG_WITH([osl], [-losl])
+HAVE_OSL=yes
+AC_CHECK_HEADER(osl.h, [], [HAVE_OSL=no])
+AC_CHECK_LIB([osl], [osl_open_table], [], [HAVE_OSL=no])
+LIB_SUBST_FLAGS(osl)
+UNSTASH_FLAGS
 ########################################################################### crypto
 AC_ARG_ENABLE(cryptolib, [AS_HELP_STRING(--enable-cryptolib=lib, [
 	Force using crypto library "lib". This package requires either
@@ -828,7 +795,7 @@ LDFLAGS="$OLD_LDFLAGS"
 LIBS="$OLD_LIBS"
 ######################################################################### server
 if test \( "$have_openssl" = "yes" -o "$have_gcrypt" = "yes" \) \
-	-a "$have_osl" = "yes" ; then
+	-a "$HAVE_OSL" = "yes" ; then
 
 	build_server="yes"
 	executables="$executables server"
@@ -1541,9 +1508,8 @@ done
 # use echo to replace newlines by space
 AC_SUBST(object_executable_matrix, $(echo $object_executable_matrix))
 
-for obj in $all_errlist_objs; do
-	SS="$SS SS_$(echo $obj | tr 'a-z' 'A-Z'),"
-done
+SS=$(for obj in $all_errlist_objs; do
+	printf '%s' " SS_$obj,"; done | tr 'a-z' 'A-Z')
 AC_DEFINE_UNQUOTED(DEFINE_ERRLIST_OBJECT_ENUM,
 	[enum {$SS NUM_SS}],
 	[list of all objects that use the paraslash error facility]