From 676aeefb604419efb46903463f95e740afce5b00 Mon Sep 17 00:00:00 2001 From: Enrico Scholz Date: Sun, 23 Aug 2009 12:36:40 +0000 Subject: [PATCH] whitespace cleanups git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@2846 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- m4/ensc_changelog.m4 | 8 +++---- m4/ensc_cxxcompiler.m4 | 30 +++++++++++------------ m4/ensc_dietlibc_compat.m4 | 6 ++--- m4/ensc_initrddir.m4 | 11 ++++----- m4/ensc_release.m4 | 20 ++++++++-------- m4/ensc_syscall.m4 | 60 +++++++++++++++++++++++----------------------- m4/ensc_syscallnr.m4 | 8 +++---- m4/ensc_uv_vrootdir.m4 | 10 ++++---- m4/gpgsig.am | 6 ++--- m4/install-notify.am | 6 ++--- m4/libsel.am | 10 ++++---- m4/pkgconfig.am | 14 +++++------ m4/validate.am | 12 +++++----- 13 files changed, 100 insertions(+), 101 deletions(-) diff --git a/m4/ensc_changelog.m4 b/m4/ensc_changelog.m4 index a0bd1a0..fbfd812 100644 --- a/m4/ensc_changelog.m4 +++ b/m4/ensc_changelog.m4 @@ -1,17 +1,17 @@ dnl $Id$ -dnl Copyright (C) 2002, 2003, 2009 +dnl Copyright (C) 2002, 2003, 2009 dnl Enrico Scholz -dnl +dnl dnl This program is free software; you can redistribute it and/or modify dnl it under the terms of the GNU General Public License as published by dnl the Free Software Foundation; version 2 and/or 3 of the License. -dnl +dnl dnl This program is distributed in the hope that it will be useful, dnl but WITHOUT ANY WARRANTY; without even the implied warranty of dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the dnl GNU General Public License for more details. -dnl +dnl dnl You should have received a copy of the GNU General Public License dnl along with this program; if not, write to the Free Software dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/m4/ensc_cxxcompiler.m4 b/m4/ensc_cxxcompiler.m4 index 1dae532..e831b66 100644 --- a/m4/ensc_cxxcompiler.m4 +++ b/m4/ensc_cxxcompiler.m4 @@ -2,16 +2,16 @@ dnl $Id$ dnl Copyright (C) 2002, 2003, 2004, 2005, 2009 dnl Enrico Scholz -dnl +dnl dnl This program is free software; you can redistribute it and/or modify dnl it under the terms of the GNU General Public License as published by dnl the Free Software Foundation; version 2 and/or 3 of the License. -dnl +dnl dnl This program is distributed in the hope that it will be useful, dnl but WITHOUT ANY WARRANTY; without even the implied warranty of dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the dnl GNU General Public License for more details. -dnl +dnl dnl You should have received a copy of the GNU General Public License dnl along with this program; if not, write to the Free Software dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -21,18 +21,18 @@ AC_DEFUN([ENSC_CXXCOMPILER], AC_REQUIRE([AC_PROG_CXX]) AC_CACHE_CHECK([whether $CXX is a C++ compiler], [ensc_cv_cxx_cxxcompiler], - [ + [ AC_LANG_PUSH(C++) AC_COMPILE_IFELSE([ #include - ], - [ensc_cv_cxx_cxxcompiler=yes], - [ensc_cv_cxx_cxxcompiler=no]) + ], + [ensc_cv_cxx_cxxcompiler=yes], + [ensc_cv_cxx_cxxcompiler=no]) AC_LANG_POP(C++) - ]) + ]) AM_CONDITIONAL(ENSC_HAVE_CXX_COMPILER, - [test x"$ensc_cv_cxx_cxxcompiler" = xyes]) + [test x"$ensc_cv_cxx_cxxcompiler" = xyes]) if test x"$ensc_cv_cxx_cxxcompiler" = xno; then AC_MSG_WARN([*** some programs will not be built because a C++ compiler is lacking]) @@ -44,7 +44,7 @@ AC_DEFUN([ENSC_C99COMPILER], AC_REQUIRE([AC_PROG_CC]) AC_CACHE_CHECK([whether $CC is a C99 compiler], [ensc_cv_c99_c99compiler], - [ + [ AC_LANG_PUSH(C) AC_COMPILE_IFELSE([ int main(int argc, char *argv[]) { @@ -52,14 +52,14 @@ int main(int argc, char *argv[]) { if (0) return 0; int b; } - ], - [ensc_cv_c99_c99compiler=yes], - [ensc_cv_c99_c99compiler=no]) + ], + [ensc_cv_c99_c99compiler=yes], + [ensc_cv_c99_c99compiler=no]) AC_LANG_POP(C) - ]) + ]) AM_CONDITIONAL(ENSC_HAVE_C99_COMPILER, - [test x"$ensc_cv_c99_c99compiler" = xyes]) + [test x"$ensc_cv_c99_c99compiler" = xyes]) if test x"$ensc_cv_c99_c99compiler" = xno; then AC_MSG_WARN([*** some programs will not be built because system is lacking a C99 compiler]) diff --git a/m4/ensc_dietlibc_compat.m4 b/m4/ensc_dietlibc_compat.m4 index 7e4fdcd..4138e5f 100644 --- a/m4/ensc_dietlibc_compat.m4 +++ b/m4/ensc_dietlibc_compat.m4 @@ -2,16 +2,16 @@ dnl $Id$ dnl Copyright (C) 2004, 2005, 2009 dnl Enrico Scholz -dnl +dnl dnl This program is free software; you can redistribute it and/or modify dnl it under the terms of the GNU General Public License as published by dnl the Free Software Foundation; version 2 and/or 3 of the License. -dnl +dnl dnl This program is distributed in the hope that it will be useful, dnl but WITHOUT ANY WARRANTY; without even the implied warranty of dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the dnl GNU General Public License for more details. -dnl +dnl dnl You should have received a copy of the GNU General Public License dnl along with this program; if not, write to the Free Software dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/m4/ensc_initrddir.m4 b/m4/ensc_initrddir.m4 index d8f99b2..b45c3c0 100644 --- a/m4/ensc_initrddir.m4 +++ b/m4/ensc_initrddir.m4 @@ -2,16 +2,16 @@ dnl $Id$ dnl Copyright (C) 2002, 2003, 2005, 2009 dnl Enrico Scholz -dnl +dnl dnl This program is free software; you can redistribute it and/or modify dnl it under the terms of the GNU General Public License as published by dnl the Free Software Foundation; version 2 and/or 3 of the License. -dnl +dnl dnl This program is distributed in the hope that it will be useful, dnl but WITHOUT ANY WARRANTY; without even the implied warranty of dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the dnl GNU General Public License for more details. -dnl +dnl dnl You should have received a copy of the GNU General Public License dnl along with this program; if not, write to the Free Software dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -24,9 +24,9 @@ AC_DEFUN([ENSC_INITRDDIR], AC_ARG_WITH([initrddir], [AC_HELP_STRING([--with-initrddir ], [use as directory for SysV init-files (default: $sysconfdir/init.d)])], - [case "$withval" in + [case "$withval" in yes|no) AC_MSG_ERROR(['$withval' is not a valid value for '--with-initrddir']);; - *) ensc_initrddir=$withval;; + *) ensc_initrddir=$withval;; esac], [ensc_initrddir='$(sysconfdir)/init.d']) @@ -37,4 +37,3 @@ AC_DEFUN([ENSC_INITRDDIR], AC_MSG_RESULT($ensc_initrddir) ]) - diff --git a/m4/ensc_release.m4 b/m4/ensc_release.m4 index 42c4bae..3e2927f 100644 --- a/m4/ensc_release.m4 +++ b/m4/ensc_release.m4 @@ -2,16 +2,16 @@ dnl $Id$ dnl Copyright (C) 2002, 2003, 2009 dnl Enrico Scholz -dnl +dnl dnl This program is free software; you can redistribute it and/or modify dnl it under the terms of the GNU General Public License as published by dnl the Free Software Foundation; version 2 and/or 3 of the License. -dnl +dnl dnl This program is distributed in the hope that it will be useful, dnl but WITHOUT ANY WARRANTY; without even the implied warranty of dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the dnl GNU General Public License for more details. -dnl +dnl dnl You should have received a copy of the GNU General Public License dnl along with this program; if not, write to the Free Software dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -25,13 +25,13 @@ AC_DEFUN([ENSC_RELEASE], AC_MSG_CHECKING([whether to enable release-mode]) AC_ARG_ENABLE([release], [AC_HELP_STRING([--enable-release], - [enable release mode (default: no)])], - [case "$enableval" in - yes) ensc_release_mode=yes;; - no) ensc_release_mode=no;; - *) AC_MSG_ERROR(['$enableval' is not a valid value for '--enable-release']);; - esac], - [ ensc_release_mode=no ]) + [enable release mode (default: no)])], + [case "$enableval" in + yes) ensc_release_mode=yes;; + no) ensc_release_mode=no;; + *) AC_MSG_ERROR(['$enableval' is not a valid value for '--enable-release']);; + esac], + [ ensc_release_mode=no ]) if test x"$ensc_release_mode" = xno; then $1= diff --git a/m4/ensc_syscall.m4 b/m4/ensc_syscall.m4 index bbd24ab..e8e6173 100644 --- a/m4/ensc_syscall.m4 +++ b/m4/ensc_syscall.m4 @@ -2,16 +2,16 @@ dnl $Id$ dnl Copyright (C) 2004, 2005, 2009 dnl Enrico Scholz -dnl +dnl dnl This program is free software; you can redistribute it and/or modify dnl it under the terms of the GNU General Public License as published by dnl the Free Software Foundation; version 2 and/or 3 of the License. -dnl +dnl dnl This program is distributed in the hope that it will be useful, dnl but WITHOUT ANY WARRANTY; without even the implied warranty of dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the dnl GNU General Public License for more details. -dnl +dnl dnl You should have received a copy of the GNU General Public License dnl along with this program; if not, write to the Free Software dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -26,10 +26,10 @@ AC_DEFUN([ENSC_SYSCALL_ALTERNATIVE], [do not use the alternative _syscallX macros provided by Herbert Poetzl (default: use them)])], [case $enableval in - (yes|no) ensc_use_alternative_syscall_macros=$enableval;; + (yes|no) ensc_use_alternative_syscall_macros=$enableval;; (*) AC_MSG_ERROR(['$enableval' is not a valid value for '--disable-alternative-syscalls']);; esac], - [ensc_use_alternative_syscall_macros=yes]) + [ensc_use_alternative_syscall_macros=yes]) case $ensc_use_alternative_syscall_macros in (yes) AC_DEFINE(ENSC_USE_ALTERNATIVE_SYSCALL_MACROS, 1, [Use alternative _syscallX macros]);; @@ -42,16 +42,16 @@ AC_DEFUN([ENSC_SYSCALL], [ AC_REQUIRE([ENSC_SYSCALL_ALTERNATIVE]) - AC_MSG_CHECKING([for syscall(2) invocation method]) - AC_ARG_WITH([syscall], - [AC_HELP_STRING([--with-syscall=METHOD], - [call syscall(2) with the specified METHOD; valid values are 'fast', 'traditional' and 'auto' (default: auto)])], - [], - [with_syscall=auto]) - AC_MSG_RESULT([$with_syscall]) - - case x"$with_syscall" in - (xauto) + AC_MSG_CHECKING([for syscall(2) invocation method]) + AC_ARG_WITH([syscall], + [AC_HELP_STRING([--with-syscall=METHOD], + [call syscall(2) with the specified METHOD; valid values are 'fast', 'traditional' and 'auto' (default: auto)])], + [], + [with_syscall=auto]) + AC_MSG_RESULT([$with_syscall]) + + case x"$with_syscall" in + (xauto) AC_CACHE_CHECK([which syscall(2) invocation works], [ensc_cv_test_syscall], [ AC_LANG_PUSH(C) @@ -76,8 +76,8 @@ int main() { return foo0() || \ foo1(1) || \ foo2(1,2) || \ - foo3(1,2,3) || \ - foo4(1,2,3,4) || \ + foo3(1,2,3) || \ + foo4(1,2,3,4) || \ foo5(1,2,3,4,5); } ]), @@ -87,23 +87,23 @@ int main() { AC_LANG_POP ]) with_syscall=$ensc_cv_test_syscall - ;; - (xfast|xtraditional) - ;; - *) - AC_MSG_ERROR(['$with_syscall' is not a valid value for '--with-syscall']) - ;; - esac + ;; + (xfast|xtraditional) + ;; + *) + AC_MSG_ERROR(['$with_syscall' is not a valid value for '--with-syscall']) + ;; + esac if test x"$with_syscall $ensc_use_alternative_syscall_macros" = 'xfast yes'; then with_syscall='alternative' - fi + fi + + if test x"$with_syscall" = xtraditional; then + AC_DEFINE(ENSC_SYSCALL_TRADITIONAL, 1, [Define to 1 when the fast syscall(2) invocation does not work]) + fi - if test x"$with_syscall" = xtraditional; then - AC_DEFINE(ENSC_SYSCALL_TRADITIONAL, 1, [Define to 1 when the fast syscall(2) invocation does not work]) - fi - - AH_BOTTOM([ + AH_BOTTOM([ #if defined(__pic__) && defined(__i386) && !defined(ENSC_SYSCALL_TRADITIONAL) && !defined(ENSC_USE_ALTERNATIVE_SYSCALL_MACROS) # define ENSC_SYSCALL_TRADITIONAL 1 #endif]) diff --git a/m4/ensc_syscallnr.m4 b/m4/ensc_syscallnr.m4 index 65d1b4c..189c75f 100644 --- a/m4/ensc_syscallnr.m4 +++ b/m4/ensc_syscallnr.m4 @@ -2,16 +2,16 @@ dnl $Id$ dnl Copyright (C) 2004, 2005, 2009 dnl Enrico Scholz -dnl +dnl dnl This program is free software; you can redistribute it and/or modify dnl it under the terms of the GNU General Public License as published by dnl the Free Software Foundation; version 2 and/or 3 of the License. -dnl +dnl dnl This program is distributed in the hope that it will be useful, dnl but WITHOUT ANY WARRANTY; without even the implied warranty of dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the dnl GNU General Public License for more details. -dnl +dnl dnl You should have received a copy of the GNU General Public License dnl along with this program; if not, write to the Free Software dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -40,7 +40,7 @@ ensc_syscall_tmp_src=ENSC_MARK ensc_syscall_tmp_nr= ensc_syscall_tmp_src= test x"$ensc_syscall_tmp_nr" != x || \ - eval $($CPP $CPPFLAGS -D ENSC_MARK='glibc' conftest.c | $EGREP '^ensc_syscall_tmp_(nr=[[1-9]][[0-9]]*;|src=.*)$') + eval $($CPP $CPPFLAGS -D ENSC_MARK='glibc' conftest.c | $EGREP '^ensc_syscall_tmp_(nr=[[1-9]][[0-9]]*;|src=.*)$') test x"$ensc_syscall_tmp_nr" != x -o x'$3' = x || \ eval $($CPP $CPPFLAGS -D ENSC_MARK='fallback' -D ENSC_SYSCALL_FALLBACK='"$3"' conftest.c | $EGREP '^ensc_syscall_tmp_(nr=[[1-9]][[0-9]]*;|src=.*)$') test "$ensc_syscall_tmp_nr" || { diff --git a/m4/ensc_uv_vrootdir.m4 b/m4/ensc_uv_vrootdir.m4 index c5e879d..0b4fa98 100644 --- a/m4/ensc_uv_vrootdir.m4 +++ b/m4/ensc_uv_vrootdir.m4 @@ -2,23 +2,23 @@ dnl $Id$ dnl Copyright (C) 2002, 2003, 2009 dnl Enrico Scholz -dnl +dnl dnl This program is free software; you can redistribute it and/or modify dnl it under the terms of the GNU General Public License as published by dnl the Free Software Foundation; version 2 and/or 3 of the License. -dnl +dnl dnl This program is distributed in the hope that it will be useful, dnl but WITHOUT ANY WARRANTY; without even the implied warranty of dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the dnl GNU General Public License for more details. -dnl +dnl dnl You should have received a copy of the GNU General Public License dnl along with this program; if not, write to the Free Software dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. dnl Usage: ENSC_UV_VROOTDIR[()] dnl ... name of variable which will get assigned -dnl the dirname of the vserver-topdir +dnl the dirname of the vserver-topdir AC_DEFUN([ENSC_UV_VROOTDIR], [ @@ -26,7 +26,7 @@ AC_DEFUN([ENSC_UV_VROOTDIR], AC_ARG_WITH([vrootdir], [AC_HELP_STRING([--with-vrootdir=DIR], [place vservers under DIR (default: /vservers)])], - [case "$withval" in + [case "$withval" in yes|no) AC_MSG_ERROR(['$withval' is not a valid value for vrootdir]);; *) ensc_uv_path_vrootdir=$withval;; esac], diff --git a/m4/gpgsig.am b/m4/gpgsig.am index a80f7b3..a847025 100644 --- a/m4/gpgsig.am +++ b/m4/gpgsig.am @@ -2,16 +2,16 @@ ## Copyright (C) 2002, 2004, 2009 ## Enrico Scholz -## +## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by ## the Free Software Foundation; version 2 and/or 3 of the License. -## +## ## This program is distributed in the hope that it will be useful, ## but WITHOUT ANY WARRANTY; without even the implied warranty of ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. -## +## ## You should have received a copy of the GNU General Public License ## along with this program; if not, write to the Free Software ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/m4/install-notify.am b/m4/install-notify.am index 6f5d339..e63e9a9 100644 --- a/m4/install-notify.am +++ b/m4/install-notify.am @@ -2,16 +2,16 @@ ## Copyright (C) 2005, 2009 ## Enrico Scholz -## +## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by ## the Free Software Foundation; version 2 and/or 3 of the License. -## +## ## This program is distributed in the hope that it will be useful, ## but WITHOUT ANY WARRANTY; without even the implied warranty of ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. -## +## ## You should have received a copy of the GNU General Public License ## along with this program; if not, write to the Free Software ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/m4/libsel.am b/m4/libsel.am index 4f31131..0edf7f4 100644 --- a/m4/libsel.am +++ b/m4/libsel.am @@ -2,20 +2,20 @@ ## Copyright (C) 2002, 2003, 2005 ## Enrico Scholz -## +## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by ## the Free Software Foundation; version 2 and/or 3 of the License. -## +## ## This program is distributed in the hope that it will be useful, ## but WITHOUT ANY WARRANTY; without even the implied warranty of ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. -## +## ## You should have received a copy of the GNU General Public License ## along with this program; if not, write to the Free Software ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -## +## if !ENSC_USE_DIETLIBC @@ -31,7 +31,7 @@ endif # if !ENSC_USE_DIETLIBC # if !ENSC_USE_GLIBC # nodist_lib_nolib_enabled_error_a_SOURCES = \ -# lib-nolib-enabled-error.c +# lib-nolib-enabled-error.c # endif # endif diff --git a/m4/pkgconfig.am b/m4/pkgconfig.am index 2c56342..b1e36ad 100644 --- a/m4/pkgconfig.am +++ b/m4/pkgconfig.am @@ -2,28 +2,28 @@ ## Copyright (C) 2002, 2003, 2005, 2009 ## Enrico Scholz -## +## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by ## the Free Software Foundation; version 2 and/or 3 of the License. -## +## ## This program is distributed in the hope that it will be useful, ## but WITHOUT ANY WARRANTY; without even the implied warranty of ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. -## +## ## You should have received a copy of the GNU General Public License ## along with this program; if not, write to the Free Software ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -## +## BAD_INC_PATHS = /usr/include|/usr/local/include BAD_LIB_PATHS = /usr/lib -pkgconfdir = $(libdir)/pkgconfig -pkgconf_DATA = $(addsuffix .pc, $(PKGCONFIG_FILES)) +pkgconfdir = $(libdir)/pkgconfig +pkgconf_DATA = $(addsuffix .pc, $(PKGCONFIG_FILES)) -CLEANFILES += $(addsuffix .pc, $(PKGCONFIG_FILES)) +CLEANFILES += $(addsuffix .pc, $(PKGCONFIG_FILES)) EXTRA_DIST += $(addsuffix .pc.subst, $(PKGCONFIG_FILES)) pkgconf_SUBST = s!@'PACKAGE'@!$(PACKAGE)!g; \ diff --git a/m4/validate.am b/m4/validate.am index 1936245..ce0e3df 100644 --- a/m4/validate.am +++ b/m4/validate.am @@ -2,30 +2,30 @@ ## Copyright (C) 2002, 2003, 2004, 2009 ## Enrico Scholz -## +## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by ## the Free Software Foundation; version 2 and/or 3 of the License. -## +## ## This program is distributed in the hope that it will be useful, ## but WITHOUT ANY WARRANTY; without even the implied warranty of ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. -## +## ## You should have received a copy of the GNU General Public License ## along with this program; if not, write to the Free Software ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -## +## $(BUILT_SOURCES) config.h: .X$(subst /,_,$(sysconfdir))-up-to-date distclean-local: distclean-uptodate distclean-uptodate: - @rm -f .*-up-to-date + @rm -f .*-up-to-date .%-up-to-date: - @rm -f .*-up-to-date + @rm -f .*-up-to-date @$(MAKE) -s clean @touch -t 197001020000 '$@' @$(MAKE) -s $(BUILT_SOURCES) -- 1.8.1.5