Cleanup autotools files

[~andy/rsl] / configure.ac

diff --git a/configure.ac b/configure.ac
index 62a6ae56e4c2e8f98a0416dcd12b0895f5a689cf..f0e8297bc34a7891cba75eaed37fa9a9731d1e60 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,41 +1,38 @@
-dnl Process this file with autoconf to produce a configure script.
+# Process this file with autoconf to produce a configure script.
 AC_INIT(rsl, v1.40.3)
-AC_CONFIG_SRCDIR(volume.c)
+AM_INIT_AUTOMAKE([-Wall -Werror -Wno-portability foreign])
 
 AM_INIT_AUTOMAKE
 AM_CONFIG_HEADER(config.h)
+AC_CONFIG_MACRO_DIR([m4])
 
-dnl Default for GVS and friends.
-AC_PREFIX_DEFAULT(/usr/local/trmm/GVBOX)
-
-dnl Checks for programs.
+# Checks for programs.
 AC_PROG_CC
 AM_PROG_LIBTOOL
-AC_PROG_YACC
 AM_PROG_LEX
+AC_PROG_YACC
 AC_PROG_LN_S
-AC_PROG_RANLIB
 
-dnl Checks for header files.
+# Checks for header files.
 AC_HEADER_STDC
 AC_HEADER_SYS_WAIT
 AC_CHECK_HEADERS(fcntl.h malloc.h strings.h unistd.h)
 
-dnl Checks for typedefs, structures, and compiler characteristics.
+# Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
 AC_TYPE_SIZE_T
 AC_STRUCT_TM
 
-dnl Checks for library functions.
-dnl AC_FUNC_SETVBUF_REVERSED
+# Checks for library functions.
+# AC_FUNC_SETVBUF_REVERSED
 AC_CHECK_FUNCS(mktime strdup strstr)
 
-dnl I would like lassen to be defined.  Override this in config.h.
+# I would like lassen to be defined.  Override this in config.h.
 AC_DEFINE(HAVE_LASSEN, 1,
     [For LASSEN capability.  Change this to '#undef HAVE_LASSEN', if you
-     don't want LASSEN.])
+     dont want LASSEN.])
 
-dnl Checks for libraries.
+# Checks for libraries.
 if test $prefix = NONE; then
   prefix=$ac_default_prefix
 fi
@@ -58,7 +55,7 @@ AC_CHECK_LIB(tsdistk,  TKopen,             ,,$LIBDIR)
 # Because -letor may depend on RSL being installed, just check for
 # the library libetor.a in a couple of places.
 
-dnl For autoheader, generate template for HAVE_LIBETOR.
+# For autoheader, generate template for HAVE_LIBETOR.
 AH_TEMPLATE(HAVE_LIBETOR,[For EDGE capability.  Change this
     to '#define HAVE_LIBETOR 1', if you have libetor -- the EDGE decoding
     library.])
@@ -86,5 +83,5 @@ if test "$YYWRAP" = ""; then
 fi
 
 AC_MSG_RESULT(LIBS = $LIBS)
-AC_CONFIG_FILES([Makefile colors/Makefile doc/Makefile examples/Makefile])
+AC_CONFIG_FILES([Makefile doc/Makefile data/Makefile examples/Makefile src/Makefile])
 AC_OUTPUT