X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=configure.ac;h=e07f9e07cdde1fd8c163816103baf6289af72e94;hb=4c8e33fa4f067642dc948a13e91648d43597204d;hp=90521dfe20b0f964f5e90bcbf87276800119fbc9;hpb=c4bfb18b78b3935b8dbf68f70b219cfb2a192979;p=paraslash.git

diff --git a/configure.ac b/configure.ac
index 90521dfe..e07f9e07 100644
--- a/configure.ac
+++ b/configure.ac
@@ -74,7 +74,6 @@ AC_FUNC_MKTIME
 AC_FUNC_MMAP
 AC_FUNC_REALLOC
 AC_FUNC_SELECT_ARGTYPES
-AC_TYPE_SIGNAL
 AC_FUNC_STAT
 AC_FUNC_STRFTIME
 AC_FUNC_VPRINTF
@@ -87,8 +86,6 @@ AC_CHECK_FUNCS([atexit dup2 memchr memmove memset \
 	strncasecmp strrchr strspn alarm mkdir inet_ntoa socket], [],
 	[AC_MSG_ERROR([function not found, cannot live without it])])
 
-cmdline_dir="cmdline"
-AC_SUBST(cmdline_dir)
 AC_DEFUN([add_cmdline],[$(for i in $@; do printf "${i}.cmdline "; done)])
 
 
@@ -239,13 +236,13 @@ have_osl=yes
 OLD_CPPFLAGS="$CPPFLAGS"
 OLD_LD_FLAGS="$LDFLAGS"
 OLD_LIBS="$LIBS"
-AC_ARG_WITH(osl_headers, [AC_HELP_STRING(--with-osl-headers=dir,
+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, [AC_HELP_STRING(--with-osl-libs=dir,
+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"
@@ -303,13 +300,13 @@ if test "$check_openssl" = "yes"; then
 	OLD_LD_FLAGS="$LDFLAGS"
 	OLD_LIBS="$LIBS"
 	have_openssl="yes"
-	AC_ARG_WITH(openssl_headers, [AC_HELP_STRING(--with-openssl-headers=dir,
+	AC_ARG_WITH(openssl_headers, [AS_HELP_STRING(--with-openssl-headers=dir,
 		[look for openssl headers also in dir])])
 	if test -n "$with_openssl_headers"; then
 		openssl_cppflags="-I$with_openssl_headers"
 		CPPFLAGS="$CPPFLAGS $openssl_cppflags"
 	fi
-	AC_ARG_WITH(openssl_libs, [AC_HELP_STRING(--with-openssl-libs=dir,
+	AC_ARG_WITH(openssl_libs, [AS_HELP_STRING(--with-openssl-libs=dir,
 		[look for openssl libraries also in dir])])
 	if test -n "$with_openssl_libs"; then
 		openssl_libs="-L$with_openssl_libs"
@@ -360,13 +357,13 @@ if test "$check_gcrypt" = "yes"; then
 	OLD_LD_FLAGS="$LDFLAGS"
 	OLD_LIBS="$LIBS"
 	have_gcrypt="yes"
-	AC_ARG_WITH(gcrypt_headers, [AC_HELP_STRING(--with-gcrypt-headers=dir,
+	AC_ARG_WITH(gcrypt_headers, [AS_HELP_STRING(--with-gcrypt-headers=dir,
 		[look for gcrypt headers also in dir])])
 	if test -n "$with_gcrypt_headers"; then
 		gcrypt_cppflags="-I$with_gcrypt_headers"
 		CPPFLAGS="$CPPFLAGS $gcrypt_cppflags"
 	fi
-	AC_ARG_WITH(gcrypt_libs, [AC_HELP_STRING(--with-gcrypt-libs=dir,
+	AC_ARG_WITH(gcrypt_libs, [AS_HELP_STRING(--with-gcrypt-libs=dir,
 		[look for libgcrypt also in dir])])
 	if test -n "$with_gcrypt_libs"; then
 		gcrypt_libs="-L$with_gcrypt_libs"
@@ -443,13 +440,13 @@ have_curses="yes"
 OLD_CPPFLAGS="$CPPFLAGS"
 OLD_LD_FLAGS="$LDFLAGS"
 OLD_LIBS="$LIBS"
-AC_ARG_WITH(curses_headers, [AC_HELP_STRING(--with-curses-headers=dir,
+AC_ARG_WITH(curses_headers, [AS_HELP_STRING(--with-curses-headers=dir,
 	[look for curses.h also in dir])])
 if test -n "$with_curses_headers"; then
 	curses_cppflags="-I$with_curses_headers"
 	CPPFLAGS="$CPPFLAGS $curses_cppflags"
 fi
-AC_ARG_WITH(curses_libs, [AC_HELP_STRING(--with-curses-libs=dir,
+AC_ARG_WITH(curses_libs, [AS_HELP_STRING(--with-curses-libs=dir,
 	[look for libcurses also in dir])])
 if test -n "$with_curses_libs"; then
 	curses_libs="-L$with_curses_libs"
@@ -525,17 +522,17 @@ have_ogg="yes"
 OLD_CPPFLAGS="$CPPFLAGS"
 OLD_LD_FLAGS="$LDFLAGS"
 OLD_LIBS="$LIBS"
-AC_ARG_WITH(ogg_headers, [AC_HELP_STRING(--with-ogg-headers=dir,
+AC_ARG_WITH(ogg_headers, [AS_HELP_STRING(--with-ogg-headers=dir,
 	[look for ogg headers also in dir])])
-AC_ARG_WITH(ogg_libs, [AC_HELP_STRING(--with-ogg-libs=dir,
+AC_ARG_WITH(ogg_libs, [AS_HELP_STRING(--with-ogg-libs=dir,
 	[look for ogg libs also in dir])])
-AC_ARG_WITH(vorbis_headers, [AC_HELP_STRING(--with-vorbis-headers=dir,
+AC_ARG_WITH(vorbis_headers, [AS_HELP_STRING(--with-vorbis-headers=dir,
 	[look for vorbis headers also in dir])])
-AC_ARG_WITH(vorbis_libs, [AC_HELP_STRING(--with-vorbis-libs=dir,
+AC_ARG_WITH(vorbis_libs, [AS_HELP_STRING(--with-vorbis-libs=dir,
 	[look for vorbis libs also in dir])])
-AC_ARG_WITH(speex_headers, [AC_HELP_STRING(--with-speex-headers=dir,
+AC_ARG_WITH(speex_headers, [AS_HELP_STRING(--with-speex-headers=dir,
 	[look for speex headers also in dir])])
-AC_ARG_WITH(speex_libs, [AC_HELP_STRING(--with-speex-libs=dir,
+AC_ARG_WITH(speex_libs, [AS_HELP_STRING(--with-speex-libs=dir,
 	[look for speex libs also in dir])])
 
 if test -n "$with_ogg_headers"; then
@@ -644,13 +641,13 @@ have_faad=yes
 OLD_CPPFLAGS="$CPPFLAGS"
 OLD_LD_FLAGS="$LDFLAGS"
 OLD_LIBS="$LIBS"
-AC_ARG_WITH(faad_headers, [AC_HELP_STRING(--with-faad-headers=dir,
+AC_ARG_WITH(faad_headers, [AS_HELP_STRING(--with-faad-headers=dir,
 	[look for neaacdec.h also in dir])])
 if test -n "$with_faad_headers"; then
 	faad_cppflags="-I$with_faad_headers"
 	CPPFLAGS="$CPPFLAGS $faad_cppflags"
 fi
-AC_ARG_WITH(faad_libs, [AC_HELP_STRING(--with-faad-libs=dir,
+AC_ARG_WITH(faad_libs, [AS_HELP_STRING(--with-faad-libs=dir,
 	[look for libfaad also in dir])])
 if test -n "$with_faad_libs"; then
 	faad_libs="-L$with_faad_libs"
@@ -685,13 +682,13 @@ OLD_CPPFLAGS="$CPPFLAGS"
 OLD_LD_FLAGS="$LDFLAGS"
 OLD_LIBS="$LIBS"
 
-AC_ARG_WITH(mad_headers, [AC_HELP_STRING(--with-mad-headers=dir,
+AC_ARG_WITH(mad_headers, [AS_HELP_STRING(--with-mad-headers=dir,
 	[look for mad.h also in dir])])
 if test -n "$with_mad_headers"; then
 	mad_cppflags="-I$with_mad_headers"
 	CPPFLAGS="$CPPFLAGS $mad_cppflags"
 fi
-AC_ARG_WITH(mad_libs, [AC_HELP_STRING(--with-mad-libs=dir,
+AC_ARG_WITH(mad_libs, [AS_HELP_STRING(--with-mad-libs=dir,
 	[look for libmad also in dir])])
 if test -n "$with_mad_libs"; then
 	mad_libs="-L$with_mad_libs"
@@ -727,13 +724,13 @@ OLD_LD_FLAGS="$LDFLAGS"
 OLD_LIBS="$LIBS"
 
 have_libid3tag="yes"
-AC_ARG_WITH(id3tag_headers, [AC_HELP_STRING(--with-id3tag-headers=dir,
+AC_ARG_WITH(id3tag_headers, [AS_HELP_STRING(--with-id3tag-headers=dir,
 	[look for id3tag header files also in dir])])
 if test -n "$with_id3tag_headers"; then
 	id3tag_cppflags="-I$with_id3tag_headers"
 	CPPFLAGS="$CPPFLAGS $id3tag_cppflags"
 fi
-AC_ARG_WITH(id3tag_libs, [AC_HELP_STRING(--with-id3tag-libs=dir,
+AC_ARG_WITH(id3tag_libs, [AS_HELP_STRING(--with-id3tag-libs=dir,
 	[look for id3tag libs also in dir])])
 if test -n "$with_id3tag_libs"; then
 	id3tag_libs="-L$with_id3tag_libs"
@@ -765,13 +762,13 @@ OLD_LD_FLAGS="$LDFLAGS"
 OLD_LIBS="$LIBS"
 
 have_flac="yes"
-AC_ARG_WITH(flac_headers, [AC_HELP_STRING(--with-flac-headers=dir,
+AC_ARG_WITH(flac_headers, [AS_HELP_STRING(--with-flac-headers=dir,
 	[look for flac headers also in dir])])
 if test -n "$with_flac_headers"; then
 	flac_cppflags="-I$with_flac_headers"
 	CPPFLAGS="$CPPFLAGS $flac_cppflags"
 fi
-AC_ARG_WITH(flac_libs, [AC_HELP_STRING(--with-flac-libs=dir,
+AC_ARG_WITH(flac_libs, [AS_HELP_STRING(--with-flac-libs=dir,
 	[look for flac libs also in dir])])
 if test -n "$with_flac_libs"; then
 	flac_libs="-L$with_flac_libs"
@@ -822,7 +819,7 @@ AC_CHECK_HEADER(sys/soundcard.h, [
 	AC_CHECK_LIB(ossaudio, _oss_ioctl, [
 			audiod_ldflags="$audiod_ldflags -lossaudio"
 			write_ldflags="$write_ldflags -lossaudio"
-			fade_ldflags="$write_ldflags -lossaudio"
+			fade_ldflags="$fade_ldflags -lossaudio"
 		]
 	)
 	],
@@ -882,13 +879,13 @@ OLD_LD_FLAGS="$LDFLAGS"
 OLD_LIBS="$LIBS"
 
 have_ao="yes"
-AC_ARG_WITH(ao_headers, [AC_HELP_STRING(--with-ao-headers=dir,
+AC_ARG_WITH(ao_headers, [AS_HELP_STRING(--with-ao-headers=dir,
 	[look for ao/ao.h also in dir])])
 if test -n "$with_ao_headers"; then
 	ao_cppflags="-I$with_ao_headers"
 	CPPFLAGS="$CPPFLAGS $ao_cppflags"
 fi
-AC_ARG_WITH(ao_libs, [AC_HELP_STRING(--with-ao-libs=dir,
+AC_ARG_WITH(ao_libs, [AS_HELP_STRING(--with-ao-libs=dir,
 	[look for libao also in dir])])
 if test -n "$with_ao_libs"; then
 	ao_libs="-L$with_ao_libs"
@@ -941,14 +938,14 @@ OLD_LD_FLAGS="$LDFLAGS"
 OLD_LIBS="$LIBS"
 
 have_readline="yes"
-AC_ARG_WITH(readline_headers, [AC_HELP_STRING(--with-readline-headers=dir,
+AC_ARG_WITH(readline_headers, [AS_HELP_STRING(--with-readline-headers=dir,
 	[look for libreadline header files also in dir])])
 if test -n "$with_readline_headers"; then
 	readline_cppflags="-I$with_readline_headers"
 	CPPFLAGS="$CPPFLAGS $readline_cppflags"
 fi
 
-AC_ARG_WITH(readline_libs, [AC_HELP_STRING(--with-readline-libs=dir,
+AC_ARG_WITH(readline_libs, [AS_HELP_STRING(--with-readline-libs=dir,
 	[look for readline library also in dir])])
 if test -n "$with_readline_libs"; then
 	readline_libs="-L$with_readline_libs"