denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed trailing whitespaces in configure.in/Makefile.am

Browse Source
This commit is contained in:
Martin Willi
2009-09-07 11:48:03 +02:00
parent 0755e98e5c
commit 8b3b4a244e
10 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure.in
+8 -8
View File
@@ -1,12 +1,12 @@
dnl configure.in for linux strongSwan dnl configure.in for linux strongSwan
dnl Copyright (C) 2006 Martin Willi dnl Copyright (C) 2006 Martin Willi
dnl Hochschule fuer Technik Rapperswil dnl Hochschule fuer Technik Rapperswil
dnl dnl
dnl This program is free software; you can redistribute it and/or modify it dnl This program is free software; you can redistribute it and/or modify it
dnl under the terms of the GNU General Public License as published by the dnl under the terms of the GNU General Public License as published by the
dnl Free Software Foundation; either version 2 of the License, or (at your dnl Free Software Foundation; either version 2 of the License, or (at your
dnl option) any later version. See <http://www.fsf.org/copyleft/gpl.txt>. dnl option) any later version. See <http://www.fsf.org/copyleft/gpl.txt>.
dnl dnl
dnl This program is distributed in the hope that it will be useful, but dnl This program is distributed in the hope that it will be useful, but
dnl WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY dnl WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
dnl or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License dnl or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
@@ -1036,7 +1036,7 @@ if test x$gmp = xtrue; then
#if (__GNU_MP_VERSION*100 + __GNU_MP_VERSION_MINOR*10 + __GNU_MP_VERSION_PATCHLEVEL) < 414 #if (__GNU_MP_VERSION*100 + __GNU_MP_VERSION_MINOR*10 + __GNU_MP_VERSION_PATCHLEVEL) < 414
#error bad gmp #error bad gmp
#endif #endif
], ],
[AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no]); AC_MSG_ERROR([No usable gmp.h found!])] [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no]); AC_MSG_ERROR([No usable gmp.h found!])]
) )
fi fi
@@ -1094,7 +1094,7 @@ if test x$fast = xtrue; then
AC_HAVE_LIBRARY([z],[LIBS="$LIBS"],[AC_MSG_ERROR([ClearSilver dependency zlib not found!])]) AC_HAVE_LIBRARY([z],[LIBS="$LIBS"],[AC_MSG_ERROR([ClearSilver dependency zlib not found!])])
dnl autoconf does not like CamelCase!? How to fix this? dnl autoconf does not like CamelCase!? How to fix this?
dnl AC_CHECK_HEADER([ClearSilver/ClearSilver.h],,[AC_MSG_ERROR([ClearSilver header file ClearSilver/ClearSilver.h not found!])]) dnl AC_CHECK_HEADER([ClearSilver/ClearSilver.h],,[AC_MSG_ERROR([ClearSilver header file ClearSilver/ClearSilver.h not found!])])
AC_HAVE_LIBRARY([fcgi],[LIBS="$LIBS"],[AC_MSG_ERROR([FastCGI library fcgi not found!])]) AC_HAVE_LIBRARY([fcgi],[LIBS="$LIBS"],[AC_MSG_ERROR([FastCGI library fcgi not found!])])
AC_CHECK_HEADER([fcgiapp.h],,[AC_MSG_ERROR([FastCGI header file fcgiapp.h not found!])]) AC_CHECK_HEADER([fcgiapp.h],,[AC_MSG_ERROR([FastCGI header file fcgiapp.h not found!])])
fi fi
@@ -1112,7 +1112,7 @@ if test x$sqlite = xtrue; then
[#include <sqlite3.h>], [#include <sqlite3.h>],
[ [
void *test = sqlite3_prepare_v2; void *test = sqlite3_prepare_v2;
], ],
[AC_MSG_RESULT([yes])]; AC_DEFINE_UNQUOTED(HAVE_SQLITE3_PREPARE_V2, 1), [AC_MSG_RESULT([no])]) [AC_MSG_RESULT([yes])]; AC_DEFINE_UNQUOTED(HAVE_SQLITE3_PREPARE_V2, 1), [AC_MSG_RESULT([no])])
AC_MSG_CHECKING([sqlite3.h version >= 3.3.1]) AC_MSG_CHECKING([sqlite3.h version >= 3.3.1])
AC_TRY_COMPILE( AC_TRY_COMPILE(
@@ -1121,7 +1121,7 @@ if test x$sqlite = xtrue; then
#if SQLITE_VERSION_NUMBER < 3003001 #if SQLITE_VERSION_NUMBER < 3003001
#error bad sqlite #error bad sqlite
#endif #endif
], ],
[AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no]); AC_MSG_ERROR([SQLite version >= 3.3.1 required!])]) [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no]); AC_MSG_ERROR([SQLite version >= 3.3.1 required!])])
fi fi
@@ -1168,7 +1168,7 @@ if test x$integrity_test = xtrue; then
AC_TRY_COMPILE( AC_TRY_COMPILE(
[#define _GNU_SOURCE [#define _GNU_SOURCE
#include <dlfcn.h>], #include <dlfcn.h>],
[Dl_info info; dladdr(main, &info);], [Dl_info info; dladdr(main, &info);],
[AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no]); [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no]);
AC_MSG_ERROR([dladdr() not supported, required by integrity-test!])] AC_MSG_ERROR([dladdr() not supported, required by integrity-test!])]
) )
@@ -1176,7 +1176,7 @@ if test x$integrity_test = xtrue; then
AC_TRY_COMPILE( AC_TRY_COMPILE(
[#define _GNU_SOURCE [#define _GNU_SOURCE
#include <link.h>], #include <link.h>],
[dl_iterate_phdr((void*)0, (void*)0);], [dl_iterate_phdr((void*)0, (void*)0);],
[AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no]); [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no]);
AC_MSG_ERROR([dl_iterate_phdr() not supported, required by integrity-test!])] AC_MSG_ERROR([dl_iterate_phdr() not supported, required by integrity-test!])]
) )
src/Makefile.am
+1 -1
View File
@@ -50,6 +50,6 @@ endif
EXTRA_DIST = strongswan.conf EXTRA_DIST = strongswan.conf
install-exec-local : install-exec-local :
test -e "$(DESTDIR)${sysconfdir}" || $(INSTALL) -d "$(DESTDIR)$(sysconfdir)" test -e "$(DESTDIR)${sysconfdir}" || $(INSTALL) -d "$(DESTDIR)$(sysconfdir)"
test -e "$(DESTDIR)$(sysconfdir)/strongswan.conf" || $(INSTALL) -o ${ipsecuid} -g ${ipsecgid} -m 640 $(srcdir)/strongswan.conf $(DESTDIR)$(sysconfdir)/strongswan.conf || true test -e "$(DESTDIR)$(sysconfdir)/strongswan.conf" || $(INSTALL) -o ${ipsecuid} -g ${ipsecgid} -m 640 $(srcdir)/strongswan.conf $(DESTDIR)$(sysconfdir)/strongswan.conf || true
src/_updown/_updown.in
+10 -10
View File
@@ -5,12 +5,12 @@
# Copyright (C) 2003-2004 Tuomo Soini # Copyright (C) 2003-2004 Tuomo Soini
# Copyright (C) 2002-2004 Michael Richardson # Copyright (C) 2002-2004 Michael Richardson
# Copyright (C) 2005-2007 Andreas Steffen <[email protected]> # Copyright (C) 2005-2007 Andreas Steffen <[email protected]>
# #
# This program is free software; you can redistribute it and/or modify it # 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 # under the terms of the GNU General Public License as published by the
# Free Software Foundation; either version 2 of the License, or (at your # Free Software Foundation; either version 2 of the License, or (at your
# option) any later version. See <http://www.fsf.org/copyleft/gpl.txt>. # option) any later version. See <http://www.fsf.org/copyleft/gpl.txt>.
# #
# This program is distributed in the hope that it will be useful, but # This program is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY # WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License # or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
@@ -231,7 +231,7 @@ doroute() {
parms2="via $PLUTO_NEXT_HOP" parms2="via $PLUTO_NEXT_HOP"
else else
parms2="via $PLUTO_PEER" parms2="via $PLUTO_PEER"
fi fi
parms2="$parms2 dev $PLUTO_INTERFACE" parms2="$parms2 dev $PLUTO_INTERFACE"
parms3= parms3=
@@ -251,7 +251,7 @@ doroute() {
case "$PLUTO_PEER_CLIENT_NET/$PLUTO_PEER_CLIENT_MASK" in case "$PLUTO_PEER_CLIENT_NET/$PLUTO_PEER_CLIENT_MASK" in
"0.0.0.0/0.0.0.0") "0.0.0.0/0.0.0.0")
# opportunistic encryption work around # opportunistic encryption work around
# need to provide route that eclipses default, without # need to provide route that eclipses default, without
# replacing it. # replacing it.
it="ip route $1 0.0.0.0/1 $parms2 $parms3 && it="ip route $1 0.0.0.0/1 $parms2 $parms3 &&
ip route $1 128.0.0.0/1 $parms2 $parms3" ip route $1 128.0.0.0/1 $parms2 $parms3"
@@ -271,8 +271,8 @@ doroute() {
fi fi
return $st return $st
} }
# in the presence of KLIPS and ipsecN interfaces do not use IPSEC_POLICY # in the presence of KLIPS and ipsecN interfaces do not use IPSEC_POLICY
if [ `echo "$PLUTO_INTERFACE" | grep "ipsec"` ] if [ `echo "$PLUTO_INTERFACE" | grep "ipsec"` ]
then then
KLIPS=1 KLIPS=1
@@ -314,7 +314,7 @@ prepare-host:*|prepare-client:*)
# delete possibly-existing route (preliminary to adding a route) # delete possibly-existing route (preliminary to adding a route)
case "$PLUTO_PEER_CLIENT_NET/$PLUTO_PEER_CLIENT_MASK" in case "$PLUTO_PEER_CLIENT_NET/$PLUTO_PEER_CLIENT_MASK" in
"0.0.0.0/0.0.0.0") "0.0.0.0/0.0.0.0")
# need to provide route that eclipses default, without # need to provide route that eclipses default, without
# replacing it. # replacing it.
parms1="0.0.0.0/1" parms1="0.0.0.0/1"
parms2="128.0.0.0/1" parms2="128.0.0.0/1"
@@ -333,7 +333,7 @@ prepare-host:*|prepare-client:*)
oops="silent error, exit status $status" oops="silent error, exit status $status"
fi fi
case "$oops" in case "$oops" in
*'RTNETLINK answers: No such process'*) *'RTNETLINK answers: No such process'*)
# This is what route (currently -- not documented!) gives # This is what route (currently -- not documented!) gives
# for "could not find such a route". # for "could not find such a route".
oops= oops=
@@ -392,7 +392,7 @@ up-host:iptables)
logger -t $TAG -p $FAC_PRIO \ logger -t $TAG -p $FAC_PRIO \
"+ $PLUTO_PEER_ID $PLUTO_PEER_CLIENT == $PLUTO_PEER -- $PLUTO_ME" "+ $PLUTO_PEER_ID $PLUTO_PEER_CLIENT == $PLUTO_PEER -- $PLUTO_ME"
fi fi
fi fi
;; ;;
down-host:iptables) down-host:iptables)
# connection to me, with (left/right)firewall=yes, going down # connection to me, with (left/right)firewall=yes, going down
@@ -551,7 +551,7 @@ up-host-v6:iptables)
logger -t $TAG -p $FAC_PRIO \ logger -t $TAG -p $FAC_PRIO \
"+ $PLUTO_PEER_ID $PLUTO_PEER_CLIENT == $PLUTO_PEER -- $PLUTO_ME" "+ $PLUTO_PEER_ID $PLUTO_PEER_CLIENT == $PLUTO_PEER -- $PLUTO_ME"
fi fi
fi fi
;; ;;
down-host-v6:iptables) down-host-v6:iptables)
# connection to me, with (left/right)firewall=yes, going down # connection to me, with (left/right)firewall=yes, going down
src/charon/Makefile.am
+1 -1
View File
@@ -137,7 +137,7 @@ endif
# build optional plugins # build optional plugins
######################## ########################
SUBDIRS = . SUBDIRS = .
PLUGINS = ${libstrongswan_plugins} PLUGINS = ${libstrongswan_plugins}
if USE_LOAD_TESTS if USE_LOAD_TESTS
src/charon/plugins/resolv_conf/Makefile.am
+1 -1
View File
@@ -7,7 +7,7 @@ AM_CFLAGS = -rdynamic \
plugin_LTLIBRARIES = libstrongswan-resolv-conf.la plugin_LTLIBRARIES = libstrongswan-resolv-conf.la
libstrongswan_resolv_conf_la_SOURCES = \ libstrongswan_resolv_conf_la_SOURCES = \
resolv_conf_plugin.h resolv_conf_plugin.c \ resolv_conf_plugin.h resolv_conf_plugin.c \
resolv_conf_handler.h resolv_conf_handler.c resolv_conf_handler.h resolv_conf_handler.c
libstrongswan_resolv_conf_la_LDFLAGS = -module -avoid-version libstrongswan_resolv_conf_la_LDFLAGS = -module -avoid-version
src/charon/plugins/updown/Makefile.am
+1 -1
View File
@@ -6,7 +6,7 @@ AM_CFLAGS = -rdynamic
plugin_LTLIBRARIES = libstrongswan-updown.la plugin_LTLIBRARIES = libstrongswan-updown.la
libstrongswan_updown_la_SOURCES = \ libstrongswan_updown_la_SOURCES = \
updown_plugin.h updown_plugin.c \ updown_plugin.h updown_plugin.c \
updown_listener.h updown_listener.c updown_listener.h updown_listener.c
libstrongswan_updown_la_LDFLAGS = -module -avoid-version libstrongswan_updown_la_LDFLAGS = -module -avoid-version
src/libstrongswan/plugins/blowfish/Makefile.am
+1 -1
View File
@@ -7,6 +7,6 @@ plugin_LTLIBRARIES = libstrongswan-blowfish.la
libstrongswan_blowfish_la_SOURCES = \ libstrongswan_blowfish_la_SOURCES = \
blowfish_plugin.h blowfish_plugin.c blowfish_crypter.c blowfish_crypter.h \ blowfish_plugin.h blowfish_plugin.c blowfish_crypter.c blowfish_crypter.h \
bf_skey.c blowfish.h bf_pi.h bf_locl.h bf_enc.c bf_skey.c blowfish.h bf_pi.h bf_locl.h bf_enc.c
libstrongswan_blowfish_la_LDFLAGS = -module -avoid-version libstrongswan_blowfish_la_LDFLAGS = -module -avoid-version
src/medsrv/Makefile.am
+2 -2
View File
@@ -24,10 +24,10 @@ medsrv_templates_DATA = templates/header.cs templates/footer.cs
medsrv_templates_userdir = ${medsrv_templatesdir}/user medsrv_templates_userdir = ${medsrv_templatesdir}/user
medsrv_templates_user_DATA = templates/user/add.cs templates/user/edit.cs \ medsrv_templates_user_DATA = templates/user/add.cs templates/user/edit.cs \
templates/user/login.cs templates/user/help.cs templates/user/login.cs templates/user/help.cs
medsrv_templates_peerdir = ${medsrv_templatesdir}/peer medsrv_templates_peerdir = ${medsrv_templatesdir}/peer
medsrv_templates_peer_DATA = templates/peer/add.cs templates/peer/edit.cs \ medsrv_templates_peer_DATA = templates/peer/add.cs templates/peer/edit.cs \
templates/peer/list.cs templates/peer/list.cs
medsrv_templates_staticdir = ${medsrv_templatesdir}/static medsrv_templates_staticdir = ${medsrv_templatesdir}/static
medsrv_templates_static_DATA = templates/header.cs templates/footer.cs \ medsrv_templates_static_DATA = templates/header.cs templates/footer.cs \
src/scepclient/Makefile.am
+1 -1
View File
@@ -1,5 +1,5 @@
ipsec_PROGRAMS = scepclient ipsec_PROGRAMS = scepclient
scepclient_SOURCES = scepclient.c pkcs10.c pkcs10.h scep.c scep.h loglite.c scepclient_SOURCES = scepclient.c pkcs10.c pkcs10.h scep.c scep.h loglite.c
PLUTODIR=$(top_srcdir)/src/pluto PLUTODIR=$(top_srcdir)/src/pluto
OPENACDIR=$(top_srcdir)/src/openac OPENACDIR=$(top_srcdir)/src/openac
src/starter/Makefile.am
+2 -2
View File
@@ -37,7 +37,7 @@ if USE_CHARON
endif endif
lex.yy.c: $(srcdir)/parser.l $(srcdir)/parser.y $(srcdir)/parser.h lex.yy.c: $(srcdir)/parser.l $(srcdir)/parser.y $(srcdir)/parser.h
$(LEX) $(srcdir)/parser.l $(LEX) $(srcdir)/parser.l
y.tab.c: $(srcdir)/parser.y $(srcdir)/parser.l $(srcdir)/parser.h y.tab.c: $(srcdir)/parser.y $(srcdir)/parser.l $(srcdir)/parser.h
$(YACC) -v -d $(srcdir)/parser.y $(YACC) -v -d $(srcdir)/parser.y
@@ -51,7 +51,7 @@ keywords.c: $(srcdir)/keywords.txt $(srcdir)/keywords.h
defs.o: $(PLUTODIR)/defs.c $(PLUTODIR)/defs.h defs.o: $(PLUTODIR)/defs.c $(PLUTODIR)/defs.h
$(COMPILE) -c -o $@ $(PLUTODIR)/defs.c $(COMPILE) -c -o $@ $(PLUTODIR)/defs.c
install-exec-local : install-exec-local :
test -e "$(DESTDIR)${sysconfdir}/ipsec.d" || $(INSTALL) -o ${ipsecuid} -g ${ipsecgid} -d "$(DESTDIR)$(sysconfdir)/ipsec.d" || true test -e "$(DESTDIR)${sysconfdir}/ipsec.d" || $(INSTALL) -o ${ipsecuid} -g ${ipsecgid} -d "$(DESTDIR)$(sysconfdir)/ipsec.d" || true
test -e "$(DESTDIR)${sysconfdir}/ipsec.d/cacerts" || $(INSTALL) -o ${ipsecuid} -g ${ipsecgid} -d "$(DESTDIR)$(sysconfdir)/ipsec.d/cacerts" || true test -e "$(DESTDIR)${sysconfdir}/ipsec.d/cacerts" || $(INSTALL) -o ${ipsecuid} -g ${ipsecgid} -d "$(DESTDIR)$(sysconfdir)/ipsec.d/cacerts" || true
test -e "$(DESTDIR)${sysconfdir}/ipsec.d/ocspcerts" || $(INSTALL) -o ${ipsecuid} -g ${ipsecgid} -d "$(DESTDIR)$(sysconfdir)/ipsec.d/ocspcerts" || true test -e "$(DESTDIR)${sysconfdir}/ipsec.d/ocspcerts" || $(INSTALL) -o ${ipsecuid} -g ${ipsecgid} -d "$(DESTDIR)$(sysconfdir)/ipsec.d/ocspcerts" || true