[asterisk-scf-commits] asterisk-scf/integration/gitall.git branch "master" updated.

[Commits to the Asterisk SCF project code repositories]

branch "master" has been updated
       via  6047d4b3db7ea313c49c8126be2db96f065ee451 (commit)
       via  e635134a3cc9aa770d3a1d4c70ac41a035f15cc4 (commit)
       via  50dd6cef19228f8c29f239fc12970a500b7b13ca (commit)
       via  3b24fe35dae8b7f3fb3386662cb06b6225beee02 (commit)
      from  507b25e4587c093df162505572d8f80e9bc42eac (commit)

Summary of changes:
 cmake/modules/pjproject-configure.cmake.in |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


- Log -----------------------------------------------------------------
commit 6047d4b3db7ea313c49c8126be2db96f065ee451
Merge: 50dd6ce e635134
Author: Brent Eagles <beagles at digium.com>
Date:   Tue Jul 24 14:55:54 2012 -0230

    Merge cmake


commit e635134a3cc9aa770d3a1d4c70ac41a035f15cc4
Author: Brent Eagles <beagles at digium.com>
Date:   Tue Jul 24 14:51:52 2012 -0230

    Fix silly typo in last commit

diff --git a/modules/pjproject-configure.cmake.in b/modules/pjproject-configure.cmake.in
index 79142d0..bad5709 100644
--- a/modules/pjproject-configure.cmake.in
+++ b/modules/pjproject-configure.cmake.in
@@ -1,2 +1,2 @@
 set(ENV{CFLAGS} "${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS_${CMAKE_BUILD_TYPE}} ${ADDITIONAL_CFLAGS}")
-execute_process(COMMAND "./configure" "--disable-sound" "--epoll")
+execute_process(COMMAND "./configure" "--disable-sound" "--enable-epoll")

commit 50dd6cef19228f8c29f239fc12970a500b7b13ca
Merge: 507b25e 3b24fe3
Author: Brent Eagles <beagles at digium.com>
Date:   Tue Jul 24 14:45:49 2012 -0230

    Merge cmake


commit 3b24fe35dae8b7f3fb3386662cb06b6225beee02
Author: Brent Eagles <beagles at digium.com>
Date:   Tue Jul 24 14:42:55 2012 -0230

    Enable epoll on linux.

diff --git a/modules/pjproject-configure.cmake.in b/modules/pjproject-configure.cmake.in
index f4f17de..79142d0 100644
--- a/modules/pjproject-configure.cmake.in
+++ b/modules/pjproject-configure.cmake.in
@@ -1,2 +1,2 @@
 set(ENV{CFLAGS} "${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS_${CMAKE_BUILD_TYPE}} ${ADDITIONAL_CFLAGS}")
-execute_process(COMMAND "./configure" "--disable-sound")
+execute_process(COMMAND "./configure" "--disable-sound" "--epoll")

-----------------------------------------------------------------------


-- 
asterisk-scf/integration/gitall.git