[Linux-ha-dev] [patch 6/6] Remove acconfig.h

[Simon Horman]

Remove acconfig.h and instead put desriptions in configur.in
as the third argument to AC_DEFINE() and AC_DEFINE_UNQUOTED()
as per the following warning:

# autoheader
autoheader (GNU Autoconf) 2.61
Copyright (C) 2006 Free Software Foundation, Inc.
This is free software.  You may redistribute copies of it under the terms
of
the GNU General Public License <http://www.gnu.org/licenses/gpl.html>.
There is NO WARRANTY, to the extent permitted by law.

Written by Roland McGrath and Akim Demaille.

# autoheader
autoheader: WARNING: Using auxiliary files such as `acconfig.h', `config.h.bot'
autoheader: WARNING: and `config.h.top', to define templates for `config.h.in'
autoheader: WARNING: is deprecated and discouraged.
autoheader: 
autoheader: WARNING: Using the third argument of `AC_DEFINE' and
autoheader: WARNING: `AC_DEFINE_UNQUOTED' allows one to define a template without
autoheader: WARNING: `acconfig.h':
autoheader: 
autoheader: WARNING:   AC_DEFINE([NEED_FUNC_MAIN], 1,
autoheader: 		[Define if a function `main' is needed.])
autoheader: 
autoheader: WARNING: More sophisticated templates can also be produced, see the
autoheader: WARNING: documentation.

Signed-off-by: Simon Horman <horms at verge.net.au>

Index: lha-dev/acconfig.h
===================================================================
--- lha-dev.orig/acconfig.h	2008-10-15 16:43:51.000000000 +1100
+++ /dev/null	1970-01-01 00:00:00.000000000 +0000
@@ -1,39 +0,0 @@
-/* For the odds and ends we need to #define */ 
-
-/* termios.h : c_line */
-#undef HAVE_TERMIOS_C_LINE
-
-/* netinet/in.h : sin_len */
-#undef HAVE_SOCKADDR_IN_SIN_LEN
-
-/* limits.h: CLK_TCK */
-#undef CLK_TCK_IN_LIMITS_H
-
-/* time.h: CLK_TCK */
-#undef CLK_TCK_IN_TIME_H
-
-
-/* Borrowed from Proftpd
- * Proftpd is Licenced under the terms of the GNU General Public Licence
- * and is available from http://www.proftpd.org/
- */
-
-/* Define this if you have the setpassent function */
-#undef HAVE_SETPASSENT
-
-/* If you don't have setproctitle, PF_ARGV_TYPE needs to be set to either
- * PF_ARGV_NEW (replace argv[] arguments), PF_ARGV_WRITEABLE (overwrite
- * argv[]), PF_ARGV_PSTAT (use the pstat function), or PF_ARGV_PSSTRINGS
- * (use PS_STRINGS).
- * 
- * configure should, we hope <wink>, detect this for you.
- */
-#undef PF_ARGV_TYPE
-
-/* Define if your system has __progname */
-#undef HAVE___PROGNAME
-
-/* Define if your system has the setproctitle function */
-#undef HAVE_SETPROCTITLE
-
-/* End of code borrowed from proftpd */
Index: lha-dev/configure.in
===================================================================
--- lha-dev.orig/configure.in	2008-10-15 16:43:51.000000000 +1100
+++ lha-dev/configure.in	2008-10-15 16:46:12.000000000 +1100
@@ -1408,7 +1408,7 @@ AC_TRY_COMPILE([#include <sys/types.h>
 [struct termios ti;  ti.c_line = 'a';],
 samba_cv_HAVE_TERMIOS_C_LINE=yes,samba_cv_HAVE_TERMIOS_C_LINE=no,samba_cv_HAVE_TERMIOS_C_LINE=cross)])
 if test x"$samba_cv_HAVE_TERMIOS_C_LINE" = x"yes"; then
-    AC_DEFINE(HAVE_TERMIOS_C_LINE,1,[ ])
+    AC_DEFINE(HAVE_TERMIOS_C_LINE,1,[termios.h : c_line])
 fi
 
 dnl Check sockaddr_in for components (e.g. sin_len not present on Solaris)
@@ -1419,7 +1419,7 @@ AC_TRY_COMPILE([#include <sys/types.h>
 [struct sockaddr_in si;  si.sin_len = 1;],
 samba_cv_HAVE_SOCKADDR_IN_SIN_LEN=yes,samba_cv_HAVE_SOCKADDR_IN_SIN_LEN=no,samba_cv_HAVE_SOCKADDR_IN_SIN_LEN=cross)])
 if test x"$samba_cv_HAVE_SOCKADDR_IN_SIN_LEN" = x"yes"; then
-    AC_DEFINE(HAVE_SOCKADDR_IN_SIN_LEN,1,[ ])
+    AC_DEFINE(HAVE_SOCKADDR_IN_SIN_LEN,1,[netinet/in.h : sin_len])
 fi
 
 dnl Check msghdr for components (e.g. msg_control/msg_controlen not present on Solaris)
@@ -2140,7 +2140,8 @@ dnl
 AC_CHECK_FUNCS(setproctitle)
 AC_CHECK_HEADERS(libutil.h)
 AC_CHECK_LIB(util, setproctitle,
-	[AC_DEFINE(HAVE_SETPROCTITLE,1,[ ])
+	[AC_DEFINE(HAVE_SETPROCTITLE,1,
+	[Define if your system has the setproctitle function])
 		ac_cv_func_setproctitle="yes" ; LIBS="$LIBS -lutil"])
 
 if test "$ac_cv_func_setproctitle" = "yes"; then
@@ -2175,7 +2176,7 @@ if test "$pf_argv_set" = ""; then
 			pf_cv_var_progname="yes", pf_cv_var_progname="no"))
 
     if test "$pf_cv_var_progname" = "yes"; then
-	AC_DEFINE(HAVE___PROGNAME,1,[ ])
+	AC_DEFINE(HAVE___PROGNAME,1,[Define if your system has __prognam])
     fi
 
     AC_CACHE_CHECK(which argv replacement method to use,
@@ -2196,7 +2197,7 @@ if test "$pf_argv_set" = ""; then
   fi
 fi
 AC_DEFINE_UNQUOTED(PF_ARGV_TYPE, $pf_argv_set,
-	mechanism to pretty-print ps output: setproctitle-equivalent)
+        [mechanism to pretty-print ps output: setproctitle-equivalent])
 
 dnl End of tests borrowed from Proftpd
 

-- 

-- 
Simon Horman
  VA Linux Systems Japan K.K., Sydney, Australia Satellite Office
  H: www.vergenet.net/~horms/             W: www.valinux.co.jp/en