diff options
| author | Kozlov Dmitry <dima@server> | 2010-10-19 10:29:33 +0400 |
|---|---|---|
| committer | Kozlov Dmitry <dima@server> | 2010-10-19 10:29:33 +0400 |
| commit | f7ac3aa1be2fe2a5bf987728e98544c4a20e57fb (patch) | |
| tree | 91e404b775b28da65260eb4ee56fa6c00eb47054 | |
| parent | 64f19d20a0af4416d7d5ccfb5400cd0b4c04d956 (diff) | |
| parent | c97932993f6f5a811f9516066ed6edad48fa6b00 (diff) | |
| download | accel-ppp-xebd-f7ac3aa1be2fe2a5bf987728e98544c4a20e57fb.tar.gz accel-ppp-xebd-f7ac3aa1be2fe2a5bf987728e98544c4a20e57fb.zip | |
Merge branch 'master' of ssh://accel-pptp.git.sourceforge.net/gitroot/accel-pptp/accel-pptp
| -rw-r--r-- | README | 4 | ||||
| -rw-r--r-- | accel-pptpd/ctrl/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | contrib/gentoo/net-dialup/accel-pptp/accel-pptp-9999.ebuild | 7 |
3 files changed, 4 insertions, 13 deletions
@@ -41,9 +41,9 @@ or specify other location via KDIR. 1. cd /path/to/accel-pptp-1.1 2. mkdir build 3. cd build -4. cmake [-DBUILD_DRIVER=TRUE] [-DKDIR=/usr/src/linux] [-DCMAKE_INSTALL_PREFIX=/usr/local] [-DCMAKE_BUILD_TYPE=Debug] [-DLOG_PGSQL=TRUE] [-DL2TP=TRUE] [-DSHAPER=TRUE] .. +4. cmake [-DBUILD_DRIVER=TRUE] [-DKDIR=/usr/src/linux] [-DCMAKE_INSTALL_PREFIX=/usr/local] [-DCMAKE_BUILD_TYPE=Debug] [-DLOG_PGSQL=TRUE] [-DSHAPER=TRUE] .. Please note that the double dot record in the end of the command is essential. You'll get error if you miss it. - BUILD_DRIVER, KDIR, CMAKE_INSTALL_PREFIX, CMAKE_BUILD_TYPE, LOG_PGSQL, L2TP, SHAPER are optional, + BUILD_DRIVER, KDIR, CMAKE_INSTALL_PREFIX, CMAKE_BUILD_TYPE, LOG_PGSQL, SHAPER are optional, but while pptp is not present in mainline kernel you probably need BUILD_DRIVER. 5. make 6. make install diff --git a/accel-pptpd/ctrl/CMakeLists.txt b/accel-pptpd/ctrl/CMakeLists.txt index 1ba3b2a..6b37bc4 100644 --- a/accel-pptpd/ctrl/CMakeLists.txt +++ b/accel-pptpd/ctrl/CMakeLists.txt @@ -1,7 +1,3 @@ ADD_SUBDIRECTORY(pptp) ADD_SUBDIRECTORY(pppoe) - -IF (L2TP) - ADD_SUBDIRECTORY(l2tp) -ENDIF (L2TP) - +ADD_SUBDIRECTORY(l2tp) diff --git a/contrib/gentoo/net-dialup/accel-pptp/accel-pptp-9999.ebuild b/contrib/gentoo/net-dialup/accel-pptp/accel-pptp-9999.ebuild index e926e29..645132d 100644 --- a/contrib/gentoo/net-dialup/accel-pptp/accel-pptp-9999.ebuild +++ b/contrib/gentoo/net-dialup/accel-pptp/accel-pptp-9999.ebuild @@ -14,12 +14,11 @@ HOMEPAGE="http://accel-pptp.sourceforge.net/" SLOT="0" LICENSE="GPL" KEYWORDS="~amd64 ~x86" -IUSE="postgres debug l2tp shaper" +IUSE="postgres debug shaper" DEPEND=">=sys-libs/glibc-2.8 dev-libs/openssl dev-libs/libaio - l2tp? ( =dev-libs/libnl-9999 ) shaper? ( =dev-libs/libnl-9999 ) postgres? ( >=dev-db/postgresql-base-8.1 )" @@ -51,10 +50,6 @@ src_configure() { mycmakeargs+=( "-DLOG_PGSQL=TRUE" ) fi - if use l2tp; then - mycmakeargs+=( "-DL2TP=TRUE" ) - fi - if use shaper; then mycmakeargs+=( "-DSHAPER=TRUE" ) fi |