[IMP] voip: change some command line

crm/leads/voip/setup.rst

@@ -12,15 +12,16 @@ Before installing Asterisk you need to install the following dependencies:
 
 - wget
 - gcc
-- gcc-c++
+- g++
 - ncurses-devel
 - libxml2-devel
 - sqlite-devel
 - libsrtp-devel
 - libuuid-devel
 - openssl-devel
+- pkg-config
 
-If libsrtp is not available in the repo install it from source.
+In order to install libsrtp, follow the instructions below:
 
 .. code-block:: console
 
@@ -28,7 +29,7 @@ If libsrtp is not available in the repo install it from source.
     wget http://srtp.sourceforge.net/srtp-1.4.2.tgz 
     tar zxvf srtp-1.4.2.tgz
     cd /usr/local/src/srtp
-    ./configure CFLAGS=-fPIC
+    ./configure CFLAGS=-fPIC --prefix=/usr/local/lib
     make && make install
 
 You also need to install PJSIP, you can download the source `here <http://www.pjsip.org/download.htm>`_. Once the source directory is extracted:
@@ -69,7 +70,17 @@ You also need to install PJSIP, you can download the source `here <http://www.pj
     
 .. code-block:: console
 
-    libpjsua.so (libc6,x86-64) => /usr/lib/libpjsua.so libpjsip.so (libc6,x86-64) => /usr/lib/libpjsip.so libpjsip-ua.so (libc6,x86-64) => /usr/lib/libpjsip-ua.so libpjsip-simple.so (libc6,x86-64) => /usr/lib/libpjsip-simple.so libpjnath.so (libc6,x86-64) => /usr/lib/libpjnath.so libpjmedia.so (libc6,x86-64) => /usr/lib/libpjmedia.so libpjmedia-videodev.so (libc6,x86-64) => /usr/lib/libpjmedia-videodev.so libpjmedia-codec.so (libc6,x86-64) => /usr/lib/libpjmedia-codec.so libpjmedia-audiodev.so (libc6,x86-64) => /usr/lib/libpjmedia-audiodev.so libpjlib-util.so (libc6,x86-64) => /usr/lib/libpjlib-util.so libpj.so (libc6,x86-64) => /usr/lib/libpj.so
+    libpjsua.so (libc6,x86-64) => /usr/lib/libpjsua.so
+    libpjsip.so (libc6,x86-64) => /usr/lib/libpjsip.so
+    libpjsip-ua.so (libc6,x86-64) => /usr/lib/libpjsip-ua.so
+    libpjsip-simple.so (libc6,x86-64) => /usr/lib/libpjsip-simple.so
+    libpjnath.so (libc6,x86-64) => /usr/lib/libpjnath.so
+    libpjmedia.so (libc6,x86-64) => /usr/lib/libpjmedia.so
+    libpjmedia-videodev.so (libc6,x86-64) => /usr/lib/libpjmedia-videodev.so
+    libpjmedia-codec.so (libc6,x86-64) => /usr/lib/libpjmedia-codec.so
+    libpjmedia-audiodev.so (libc6,x86-64) => /usr/lib/libpjmedia-audiodev.so
+    libpjlib-util.so (libc6,x86-64) => /usr/lib/libpjlib-util.so
+    libpj.so (libc6,x86-64) => /usr/lib/libpj.so
 
 Asterisk
 ~~~~~~~~
@@ -80,25 +91,25 @@ Asterisk
 
 .. code-block:: console
     
-    tar zxvf asterisk*.
+    tar zxvf asterisk*
 
 - Enter the Asterisk directory:
 
 .. code-block:: console
 
-    cd /usr/local/src/asterisk*.
+    cd ./asterisk*
 
 - Run the Asterisk configure script: 
 
 .. code-block:: console
 
-    ./configure --libdir=/usr/lib64.
+    ./configure --with-pjproject --with-ssl --with-srtp
 
 - Run the Asterisk menuselect tool:
 
 .. code-block:: console
 
-    make menuselect.
+    make menuselect
 
 - In the menuselect, go to the resources option and ensure that res_srtp is enabled. If there are 3 x’s next to res_srtp, there is a problem with the srtp library and you must reinstall it. Save the configuration (press x). You should also see stars in front of the res_pjsip lines.
 
@@ -106,9 +117,9 @@ Asterisk
 
 .. code-block:: console
 
-    make && make install.
+    make && make install
 
-- If you need the sample configs you can run make samples to install the sample configs. If you need to install the Asterisk startup script you can run make config.
+- If you need the sample configs you can run 'make samples' to install the sample configs. If you need to install the Asterisk startup script you can run 'make config'.
 
 DTLS Certificates
 ~~~~~~~~~~~~~~~~~
@@ -123,7 +134,7 @@ DTLS Certificates
 
 .. code-block:: console
 
-    cd /usr/local/src/asterisk*/contrib/scripts.
+    cd /asterisk*/contrib/scripts
 
 - Create the DTLS certificates (replace pbx.mycompany.com with your ip address or dns name, replace My Super Company with your company name):