Browse Source

Small cleanup on the autoconf

Brian Aker 13 years ago
parent
commit
524649c015
4 changed files with 5 additions and 8 deletions
  1. 1 2
      Makefile.am
  2. 1 1
      configure.ac
  3. 1 1
      libtest/gearmand.cc
  4. 2 4
      m4/pandora_canonical.m4

+ 1 - 2
Makefile.am

@@ -5,8 +5,7 @@
 # Use and distribution licensed under the BSD license.  See
 # the COPYING file in this directory for full text.
 
-#AUTOMAKE_OPTIONS = std-options
-ACLOCAL_AMFLAGS= -I m4
+ACLOCAL_AMFLAGS= -I m4 --install
 
 bin_PROGRAMS =
 sbin_PROGRAMS = 

+ 1 - 1
configure.ac

@@ -12,7 +12,7 @@ AC_CONFIG_AUX_DIR(config)
 
 AC_CANONICAL_TARGET
 
-AM_INIT_AUTOMAKE
+AM_INIT_AUTOMAKE(-Wall -Werror -Wno-portability subdir-objects foreign tar-ustar silent-rules)
 
 AC_CANONICAL_HOST
 AC_CANONICAL_BUILD

+ 1 - 1
libtest/gearmand.cc

@@ -98,7 +98,7 @@ public:
   {
     if (not pid_file().empty())
     {
-      Wait wait(pid_file(), 0);
+      Wait wait(pid_file(), 4);
 
       if (error_is_ok and not wait.successful())
       {

+ 2 - 4
m4/pandora_canonical.m4

@@ -90,13 +90,11 @@ AC_DEFUN([PANDORA_CANONICAL_TARGET],[
   AC_CANONICAL_TARGET
   
   m4_if(PCT_DONT_SUPRESS_INCLUDE,yes,[
-    AM_INIT_AUTOMAKE(-Wall -Werror -Wno-portability subdir-objects foreign tar-ustar)
+    AM_INIT_AUTOMAKE(-Wall -Werror -Wno-portability subdir-objects foreign tar-ustar silent-rules)
   ],[
-    AM_INIT_AUTOMAKE(-Wall -Werror -Wno-portability nostdinc subdir-objects foreign tar-ustar)
+    AM_INIT_AUTOMAKE(-Wall -Werror -Wno-portability nostdinc subdir-objects foreign tar-ustar silent-rules)
   ])
 
-  #m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
-
   m4_if(m4_substr(m4_esyscmd(test -d gnulib && echo 0),0,1),0,[
     gl_EARLY
   ],[