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_ac | |
| 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_ac')
| -rw-r--r-- | package/ipsec-tools/patches/patch-configure_ac | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/package/ipsec-tools/patches/patch-configure_ac b/package/ipsec-tools/patches/patch-configure_ac deleted file mode 100644 index d28f9afb7..000000000 --- a/package/ipsec-tools/patches/patch-configure_ac +++ /dev/null @@ -1,12 +0,0 @@ -$Id$ ---- ipsec-tools-0.6.4.orig/configure.ac 2005-12-09 10:00:28.000000000 +0100 -+++ ipsec-tools-0.6.4/configure.ac 2007-06-28 16:58:31.000000000 +0200 -@@ -183,7 +183,7 @@ AC_MSG_RESULT(${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 - AC_MSG_CHECKING(openssl version) - |