diff options
Diffstat (limited to 'accel-pppd')
-rw-r--r-- | accel-pppd/CMakeLists.txt | 8 | ||||
-rw-r--r-- | accel-pppd/radius/dm_coa.c | 2 | ||||
-rw-r--r-- | accel-pppd/radius/packet.c | 2 | ||||
-rw-r--r-- | accel-pppd/radius/radius.c | 2 | ||||
-rw-r--r-- | accel-pppd/radius/req.c | 2 | ||||
-rw-r--r-- | accel-pppd/radius/stat_accm.c | 2 |
6 files changed, 9 insertions, 9 deletions
diff --git a/accel-pppd/CMakeLists.txt b/accel-pppd/CMakeLists.txt index 7b53d920..c9d05f92 100644 --- a/accel-pppd/CMakeLists.txt +++ b/accel-pppd/CMakeLists.txt @@ -14,7 +14,7 @@ ENDIF (NOT HAVE_SSL) SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -fvisibility=hidden -fno-strict-aliasing -D_GNU_SOURCE -DPTHREAD_SPINLOCK -fPIC") -IF (EXISTS ${CMAKE_HOME_DIRECTORY}/.git) +IF (EXISTS ${CMAKE_HOME_DIRECTORY}/.git AND NOT DEFINED IGNORE_GIT) EXECUTE_PROCESS( COMMAND git log COMMAND head -n1 @@ -23,9 +23,9 @@ IF (EXISTS ${CMAKE_HOME_DIRECTORY}/.git) OUTPUT_VARIABLE ACCEL_PPP_VERSION ) STRING(STRIP ${ACCEL_PPP_VERSION} ACCEL_PPP_VERSION) -ELSE (EXISTS ${CMAKE_HOME_DIRECTORY}/.git) - SET (ACCEL_PPP_VERSION 1.3.5) -ENDIF (EXISTS ${CMAKE_HOME_DIRECTORY}/.git) +ELSE (EXISTS ${CMAKE_HOME_DIRECTORY}/.git AND NOT DEFINED IGNORE_GIT) + SET (ACCEL_PPP_VERSION 1.3.6) +ENDIF (EXISTS ${CMAKE_HOME_DIRECTORY}/.git AND NOT DEFINED IGNORE_GIT) ADD_DEFINITIONS(-DACCEL_PPP_VERSION="${ACCEL_PPP_VERSION}") diff --git a/accel-pppd/radius/dm_coa.c b/accel-pppd/radius/dm_coa.c index 005ecfd1..481f2f50 100644 --- a/accel-pppd/radius/dm_coa.c +++ b/accel-pppd/radius/dm_coa.c @@ -294,4 +294,4 @@ static void init(void) triton_context_wakeup(&serv.ctx); } -DEFINE_INIT(101, init); +DEFINE_INIT(52, init); diff --git a/accel-pppd/radius/packet.c b/accel-pppd/radius/packet.c index db45c6a9..892cc497 100644 --- a/accel-pppd/radius/packet.c +++ b/accel-pppd/radius/packet.c @@ -655,4 +655,4 @@ static void init(void) buf_pool = mempool_create(REQ_LENGTH_MAX); } -DEFINE_INIT(101, init); +DEFINE_INIT(50, init); diff --git a/accel-pppd/radius/radius.c b/accel-pppd/radius/radius.c index 2bf9bd47..d3f1248a 100644 --- a/accel-pppd/radius/radius.c +++ b/accel-pppd/radius/radius.c @@ -579,4 +579,4 @@ static void radius_init(void) stat_interim_query_5m = stat_accm_create(5 * 60); } -DEFINE_INIT(100, radius_init); +DEFINE_INIT(51, radius_init); diff --git a/accel-pppd/radius/req.c b/accel-pppd/radius/req.c index 7464ac9a..7b865038 100644 --- a/accel-pppd/radius/req.c +++ b/accel-pppd/radius/req.c @@ -277,4 +277,4 @@ static void req_init(void) } } -DEFINE_INIT(101, req_init); +DEFINE_INIT(50, req_init); diff --git a/accel-pppd/radius/stat_accm.c b/accel-pppd/radius/stat_accm.c index 53c23cbd..3de86fca 100644 --- a/accel-pppd/radius/stat_accm.c +++ b/accel-pppd/radius/stat_accm.c @@ -95,4 +95,4 @@ static void init(void) item_pool = mempool_create(sizeof(struct item_t)); } -DEFINE_INIT(101, init); +DEFINE_INIT(50, init); |