[asterisk-commits] trunk r22415 - /trunk/acinclude.m4

asterisk-commits at lists.digium.com asterisk-commits at lists.digium.com
Tue Apr 25 10:22:38 MST 2006


Author: russell
Date: Tue Apr 25 12:22:38 2006
New Revision: 22415

URL: http://svn.digium.com/view/asterisk?rev=22415&view=rev
Log:
if an external library is found, but the associated header file is not, just
move on without including support for this library.  However, if --with-lib
is explicitly specified, then error out noting the situation.

Modified:
    trunk/acinclude.m4

Modified: trunk/acinclude.m4
URL: http://svn.digium.com/view/asterisk/trunk/acinclude.m4?rev=22415&r1=22414&r2=22415&view=diff
==============================================================================
--- trunk/acinclude.m4 (original)
+++ trunk/acinclude.m4 Tue Apr 25 12:22:38 2006
@@ -38,19 +38,26 @@
 	 fi
       fi
       if test "x${$4_HEADER_FOUND}" = "x0" ; then
-        echo " ***"
-        echo " *** It appears that you do not have the $5 development package installed."
-        echo " *** Please install it to include $5 support, or re-run configure"
-        echo " *** with the argument --without-$1"
-        exit 1
+         if test ! -z "${$1_MANDATORY}" ;
+         then
+            echo " ***"
+            echo " *** It appears that you do not have the $1 development package installed."
+            echo " *** Please install it to include $5 support, or re-run configure"
+            echo " *** without explicitly specifying --with-$1"
+            exit 1
+         fi
+         $1_LIB=""
+         $1_INCLUDE=""
+         PBX_LIB$1=0
+      else
+         PBX_LIB$1=1
       fi
-      PBX_LIB$1=1 
    elif test ! -z "${$1_MANDATORY}";
    then
       echo "***"
       echo "*** The $5 installation on this system appears to be broken."
       echo "*** Either correct the installation, or run configure"
-      echo "*** including --without-$1"
+      echo "*** without explicity specifying --with-$1"
       exit 1
    fi
 fi



More information about the asterisk-commits mailing list