diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
| commit | fb6cd4f4dff71a803ba9db7751ade84fa6eac3a8 (patch) | |
| tree | 379626b7b419ac1643131a7b8ac07e9fb87b9f80 /package/ipsec-tools/patches/patch-configure | |
| parent | 5157a34410fe9eff94d5de7100cbc3659d6c4fcb (diff) | |
| parent | ba3359722cbf8aa7b0ed39e1f81d1d74ec88fecd (diff) | |
Merge branch 'master' of ssh://openadk.org/git/openadk
resolve conflicts
Conflicts:
mk/pkg-bottom.mk
package/ctorrent/Makefile
package/gcc/Makefile
package/gmp/Makefile
package/id3lib/Makefile
package/libelf/Makefile
package/libnl/patches/patch-include_netlink-local_h
package/mpd/Makefile
package/nmap/Makefile
package/rrs/Makefile
package/weechat/Makefile
scripts/rstrip.sh
target/Config.in
Diffstat (limited to 'package/ipsec-tools/patches/patch-configure')
| -rw-r--r-- | package/ipsec-tools/patches/patch-configure | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/package/ipsec-tools/patches/patch-configure b/package/ipsec-tools/patches/patch-configure index 5ff9866f7..29e65cf5b 100644 --- a/package/ipsec-tools/patches/patch-configure +++ b/package/ipsec-tools/patches/patch-configure @@ -1,12 +1,12 @@ -$Id$ ---- ipsec-tools-0.6.4.orig/configure 2005-12-09 10:03:34.000000000 +0100 -+++ ipsec-tools-0.6.4/configure 2007-06-28 16:58:31.000000000 +0200 -@@ -23147,7 +23147,7 @@ echo "${ECHO_T}${crypto_dir-default}" >& - - if test "x$crypto_dir" != "x"; then - LIBS="$LIBS -L${crypto_dir}/lib" -- CPPFLAGS="-I${crypto_dir}/include $CPPLAGS" -+ CPPFLAGS="-I${crypto_dir}/include $CPPFLAGS" - fi - echo "$as_me:$LINENO: checking openssl version" >&5 - echo $ECHO_N "checking openssl version... $ECHO_C" >&6 +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- ipsec-tools-0.7.2.orig/configure 2009-04-21 16:41:45.000000000 +0200 ++++ ipsec-tools-0.7.2/configure 2009-05-29 15:28:06.991791782 +0200 +@@ -11963,7 +11963,7 @@ echo "${ECHO_T}$ac_cv_path_EGREP" >&6; } + + + +-CFLAGS_ADD="$CFLAGS_ADD -Wall -Werror -Wno-unused" ++CFLAGS_ADD="$CFLAGS_ADD -Wall -Wno-unused" + + case $host in + *netbsd*) |