diff options
| author | An-Cheng Huang <ancheng@vyatta.com> | 2010-08-27 16:02:11 -0700 |
|---|---|---|
| committer | An-Cheng Huang <ancheng@vyatta.com> | 2010-08-27 16:02:11 -0700 |
| commit | f115660c12a27434fccf8dc36c1cd4b6c2f3db19 (patch) | |
| tree | 605885544f595dec880f0e27698fe2a675be2b12 | |
| parent | 1d83ac927f533200b5f1453ea681dbe3c58b1eda (diff) | |
| download | vyatta-op-vpn-f115660c12a27434fccf8dc36c1cd4b6c2f3db19.tar.gz vyatta-op-vpn-f115660c12a27434fccf8dc36c1cd4b6c2f3db19.zip | |
fix squeeze build issues
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | Makefile.am | 7 | ||||
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | debian/control | 3 | ||||
| -rwxr-xr-x | debian/rules | 1 | ||||
| -rw-r--r-- | src/command_proc_show_vpn.cc | 1 |
6 files changed, 9 insertions, 5 deletions
@@ -20,6 +20,7 @@ libtool /debian/vyatta-op-vpn /debian/vyatta-op-vpn.postinst /debian/vyatta-op-vpn.debhelper.log +/debian/vyatta-op-vpn.substvars /INSTALL /Makefile.in /Makefile diff --git a/Makefile.am b/Makefile.am index bc91675..c18efd9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -6,8 +6,6 @@ bin_sudo_usersdir = $(bindir)/sudo-users xsl_DATA = -bin_sudo_users_SCRIPTS = - xsl_DATA += src/xsl/show_vpn_ike_sa.xsl xsl_DATA += src/xsl/show_vpn_ike_secrets.xsl xsl_DATA += src/xsl/show_vpn_ike_status.xsl @@ -17,7 +15,10 @@ xsl_DATA += src/xsl/show_vpn_ipsec_status.xsl bin_sudo_users_PROGRAMS = command_proc_show_vpn -bin_sudo_users_SCRIPTS = scripts/gen_local_rsa_key.pl scripts/vyatta-show-vpn.pl scripts/vyatta-vpn-op.pl scripts/vyatta-show-ipsec-status.pl +bin_sudo_users_SCRIPTS = scripts/gen_local_rsa_key.pl +bin_sudo_users_SCRIPTS += scripts/vyatta-show-vpn.pl +bin_sudo_users_SCRIPTS += scripts/vyatta-vpn-op.pl +bin_sudo_users_SCRIPTS += scripts/vyatta-show-ipsec-status.pl command_proc_show_vpn_SOURCES = src/command_proc_base.hh command_proc_show_vpn_SOURCES += src/command_proc_show_vpn.cc diff --git a/configure.ac b/configure.ac index 7574e12..aec4fb7 100644 --- a/configure.ac +++ b/configure.ac @@ -19,6 +19,7 @@ XSLDIR=/opt/vyatta/share/xsl/ AC_PROG_CC +AC_PROG_CXX AM_PROG_AS AM_PROG_CC_C_O AC_PROG_LIBTOOL diff --git a/debian/control b/debian/control index 4928de2..6f5cdbb 100644 --- a/debian/control +++ b/debian/control @@ -10,9 +10,8 @@ Architecture: any Depends: vyatta-op, vyatta-bash | bash (>= 3.1), vyatta-cfg-vpn, - libc6, vyatta-ipsec, - libsablot0 (>= 1.0.3-1) + ${shlibs:Depends} Suggests: util-linux (>= 2.13-5), net-tools, ethtool, diff --git a/debian/rules b/debian/rules index 7154caf..1b0510c 100755 --- a/debian/rules +++ b/debian/rules @@ -90,6 +90,7 @@ binary-indep: build install dh_compress dh_fixperms dh_installdeb + dh_shlibdeps if [ -f "../.VYATTA_DEV_BUILD" ]; then \ dh_gencontrol -- -v999.dev; \ else \ diff --git a/src/command_proc_show_vpn.cc b/src/command_proc_show_vpn.cc index f96b0b4..7e1d43d 100644 --- a/src/command_proc_show_vpn.cc +++ b/src/command_proc_show_vpn.cc @@ -23,6 +23,7 @@ * Copyright 2008, Vyatta, Inc. */ +#include <stdio.h> #include <iostream> #include <list> #include <string> |