Home | History | Annotate | Download | only in patches
      1 --- ekiga-3.2.5/configure.ac.orig	2009-07-07 03:09:34.000000000 +0800
      2 +++ ekiga-3.2.5/configure.ac	2009-07-13 10:50:41.167182000 +0800
      3 @@ -319,6 +319,7 @@
      4  
      5    AC_ARG_WITH(ldap-dir, AS_HELP_STRING([--with-ldap-dir=PFX],[location of LDAP]), with_ldap_dir="$withval", with_ldap_dir="/usr")
      6  
      7 +  if test "x${gm_platform}" != "xsolaris"; then
      8    dnl Check for the includes presence
      9    AC_MSG_CHECKING(for LDAP includes in ${with_ldap_dir}/include/)
     10    AC_MSG_RESULT()
     11 @@ -344,6 +345,31 @@
     12    else
     13    	AC_MSG_ERROR(You need the LDAP library to compile Ekiga with LDAP support)
     14    fi
     15 +  else dnl solaris
     16 +  dnl Check for the includes presence
     17 +  AC_MSG_CHECKING(for LDAP includes in /usr/include/openldap)
     18 +  AC_MSG_RESULT()
     19 +
     20 +
     21 +  if test -f /usr/include/openldap/ldap.h; then
     22 +  	LDAP_CFLAGS="-I/usr/include/openldap"
     23 +  else
     24 +  	AC_MSG_ERROR(You need the LDAP headers to compile Ekiga with LDAP support)
     25 +  fi
     26 +
     27 +  dnl Checking for the library presence
     28 +  LIBS_save="$LIBS"
     29 +  LIBS="-L/usr/${libname}/ -lldap-2.4 -llber-2.4"
     30 +  AC_CHECK_LIB(ldap, ldap_initialize, ldap_libs="yes", ldap_libs="no")
     31 +  LIBS="${LIBS_save}"
     32 +
     33 +  if test "x${ldap_libs}" != "xno"; then
     34 +  	LDAP_LIBS="-L/usr/${libname} -lldap-2.4 -llber-2.4"
     35 +  else
     36 +  	AC_MSG_ERROR(You need the LDAP library to compile Ekiga with LDAP support)
     37 +  fi
     38 +  fi dnl solaris 
     39 +
     40  
     41    dnl Checking for libsasl2
     42    AC_ARG_WITH(libsasl2-dir, AS_HELP_STRING([--with-libsasl2-dir=PFX],[location of LIBSASL2]), with_libsasl2_dir="$withval", with_libsasl2_dir="/usr")
     43 @@ -357,7 +383,7 @@
     44    else
     45    	AC_MSG_ERROR(*** libsasl2 headers not found)
     46    fi
     47 -  LDAP_LIBS="$LDAP_LIBS -lsasl2"
     48 +  LDAP_LIBS="$LDAP_LIBS -lsasl"
     49  
     50    dnl Checking for libresolv
     51    if test ${gm_platform} = "linux" ; then
     52