[asterisk-commits] russell: branch group/res_config_ldap r41033 - in /team/group/res_config_ldap...

asterisk-commits at lists.digium.com asterisk-commits at lists.digium.com
Thu Aug 24 18:12:30 MST 2006 

Author: russell
Date: Thu Aug 24 20:12:29 2006
New Revision: 41033

URL: http://svn.digium.com/view/asterisk?rev=41033&view=rev
Log:
update configure script ... the module is still hosed due to loader changes, though

Modified:
    team/group/res_config_ldap/configure
    team/group/res_config_ldap/configure.ac
    team/group/res_config_ldap/include/asterisk/autoconfig.h.in

Modified: team/group/res_config_ldap/configure
URL: http://svn.digium.com/view/asterisk/team/group/res_config_ldap/configure?rev=41033&r1=41032&r2=41033&view=diff
==============================================================================
--- team/group/res_config_ldap/configure (original)
+++ team/group/res_config_ldap/configure Thu Aug 24 20:12:29 2006
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac Revision: 40949 .
+# From configure.ac Revision: 41027 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.60.
 #
@@ -710,15 +710,12 @@
 KDE_LIB
 KDE_INCLUDE
 PBX_KDE
-<<<<<<< .working
 LDAP_LIB
 LDAP_INCLUDE
 PBX_LDAP
-=======
 MISDN_LIB
 MISDN_INCLUDE
 PBX_MISDN
->>>>>>> .merge-right.r41023
 NBS_LIB
 NBS_INCLUDE
 PBX_NBS
@@ -1419,11 +1416,8 @@
   --with-imap=PATH        use UW IMAP Toolkit files in PATH
   --with-isdnnet=PATH     use ISDN4Linux Library files in PATH
   --with-kde=PATH         use KDE files in PATH
-<<<<<<< .working
   --with-ldap=PATH        use OpenLDAP files in PATH
-=======
   --with-misdn=PATH       use mISDN User Library files in PATH
->>>>>>> .merge-right.r41023
   --with-nbs=PATH         use Network Broadcast Sound files in PATH
   --with-ncurses=PATH     use ncurses files in PATH
   --with-netsnmp=PATH     use Net-SNMP files in PATH
@@ -5474,7 +5468,6 @@
 
 
 
-<<<<<<< .working
 LDAP_DESCRIP="OpenLDAP"
 LDAP_OPTION="ldap"
 
@@ -5502,7 +5495,6 @@
 
 
 
-=======
 MISDN_DESCRIP="mISDN User Library"
 MISDN_OPTION="misdn"
 
@@ -5530,7 +5522,6 @@
 
 
 
->>>>>>> .merge-right.r41023
 NBS_DESCRIP="Network Broadcast Sound"
 NBS_OPTION="nbs"
 
@@ -17239,7 +17230,6 @@
 
 
 
-<<<<<<< .working
 if test "${USE_LDAP}" != "no"; then
    pbxlibdir=""
    if test "x${LDAP_DIR}" != "x"; then
@@ -17663,10 +17653,14 @@
       if test "x${LDAP_HEADER_FOUND}" = "x0" ; then
          if test ! -z "${LDAP_MANDATORY}" ;
          then
-            echo " ***"
-            echo " *** It appears that you do not have the ldap development package installed."
-            echo " *** Please install it to include ${LDAP_DESCRIP} support, or re-run configure"
-            echo " *** without explicitly specifying --with-${LDAP_OPTION}"
+            { echo "$as_me:$LINENO: ***" >&5
+echo "$as_me: ***" >&6;}
+            { echo "$as_me:$LINENO: *** It appears that you do not have the ldap development package installed." >&5
+echo "$as_me: *** It appears that you do not have the ldap development package installed." >&6;}
+            { echo "$as_me:$LINENO: *** Please install it to include ${LDAP_DESCRIP} support" >&5
+echo "$as_me: *** Please install it to include ${LDAP_DESCRIP} support" >&or re-run configure;}
+            { echo "$as_me:$LINENO: *** without explicitly specifying --with-${LDAP_OPTION}" >&5
+echo "$as_me: *** without explicitly specifying --with-${LDAP_OPTION}" >&6;}
             exit 1
          fi
          LDAP_LIB=""
@@ -17682,17 +17676,20 @@
       fi
    elif test ! -z "${LDAP_MANDATORY}";
    then
-      echo "***"
-      echo "*** The ${LDAP_DESCRIP} installation on this system appears to be broken."
-      echo "*** Either correct the installation, or run configure"
-      echo "*** without explicitly specifying --with-${LDAP_OPTION}"
+      { echo "$as_me:$LINENO: ***" >&5
+echo "$as_me: ***" >&6;}
+      { echo "$as_me:$LINENO: *** The ${LDAP_DESCRIP} installation on this system appears to be broken." >&5
+echo "$as_me: *** The ${LDAP_DESCRIP} installation on this system appears to be broken." >&6;}
+      { echo "$as_me:$LINENO: *** Either correct the installation" >&5
+echo "$as_me: *** Either correct the installation" >&or run configure;}
+      { echo "$as_me:$LINENO: *** without explicitly specifying --with-${LDAP_OPTION}" >&5
+echo "$as_me: *** without explicitly specifying --with-${LDAP_OPTION}" >&6;}
       exit 1
    fi
 fi
 
 
 
-=======
 if test "${USE_MISDN}" != "no"; then
    pbxlibdir=""
    if test "x${MISDN_DIR}" != "x"; then
@@ -19074,7 +19071,6 @@
 fi
 
 
->>>>>>> .merge-right.r41023
 if test "${USE_NBS}" != "no"; then
    pbxlibdir=""
    if test "x${NBS_DIR}" != "x"; then
@@ -30718,15 +30714,12 @@
 KDE_LIB!$KDE_LIB$ac_delim
 KDE_INCLUDE!$KDE_INCLUDE$ac_delim
 PBX_KDE!$PBX_KDE$ac_delim
-<<<<<<< .working
 LDAP_LIB!$LDAP_LIB$ac_delim
 LDAP_INCLUDE!$LDAP_INCLUDE$ac_delim
 PBX_LDAP!$PBX_LDAP$ac_delim
-=======
 MISDN_LIB!$MISDN_LIB$ac_delim
 MISDN_INCLUDE!$MISDN_INCLUDE$ac_delim
 PBX_MISDN!$PBX_MISDN$ac_delim
->>>>>>> .merge-right.r41023
 NBS_LIB!$NBS_LIB$ac_delim
 NBS_INCLUDE!$NBS_INCLUDE$ac_delim
 PBX_NBS!$PBX_NBS$ac_delim
@@ -30807,18 +30800,6 @@
 PBX_ZAPTEL!$PBX_ZAPTEL$ac_delim
 ALLOCA!$ALLOCA$ac_delim
 EGREP!$EGREP$ac_delim
-LIBOBJS!$LIBOBJS$ac_delim
-POW_LIB!$POW_LIB$ac_delim
-<<<<<<< .working
-KDEINIT!$KDEINIT$ac_delim
-KDEDIR!$KDEDIR$ac_delim
-NETSNMP_CONFIG!$NETSNMP_CONFIG$ac_delim
-PG_CONFIG!$PG_CONFIG$ac_delim
-QTMOC!$QTMOC$ac_delim
-EDITLINE_LIB!$EDITLINE_LIB$ac_delim
-=======
-GSM_INTERNAL!$GSM_INTERNAL$ac_delim
->>>>>>> .merge-right.r41023
 _ACEOF
 
   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -30860,11 +30841,9 @@
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   cat >conf$$subs.sed <<_ACEOF
-<<<<<<< .working
-PBX_H323!$PBX_H323$ac_delim
-PBX_IXJUSER!$PBX_IXJUSER$ac_delim
-GTKCONFIG!$GTKCONFIG$ac_delim
-=======
+LIBOBJS!$LIBOBJS$ac_delim
+POW_LIB!$POW_LIB$ac_delim
+GSM_INTERNAL!$GSM_INTERNAL$ac_delim
 KDEINIT!$KDEINIT$ac_delim
 KDEDIR!$KDEDIR$ac_delim
 NETSNMP_CONFIG!$NETSNMP_CONFIG$ac_delim
@@ -30874,7 +30853,6 @@
 PBX_H323!$PBX_H323$ac_delim
 PBX_IXJUSER!$PBX_IXJUSER$ac_delim
 GTKCONFIG!$GTKCONFIG$ac_delim
->>>>>>> .merge-right.r41023
 PBX_GTK!$PBX_GTK$ac_delim
 GTK_INCLUDE!$GTK_INCLUDE$ac_delim
 GTK_LIB!$GTK_LIB$ac_delim
@@ -30885,11 +30863,7 @@
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-<<<<<<< .working
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 10; then
-=======
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 17; then
->>>>>>> .merge-right.r41023
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 20; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5

Modified: team/group/res_config_ldap/configure.ac
URL: http://svn.digium.com/view/asterisk/team/group/res_config_ldap/configure.ac?rev=41033&r1=41032&r2=41033&view=diff
==============================================================================
--- team/group/res_config_ldap/configure.ac (original)
+++ team/group/res_config_ldap/configure.ac Thu Aug 24 20:12:29 2006
@@ -140,11 +140,8 @@
 AST_EXT_LIB_SETUP([IMAP_TK], [UW IMAP Toolkit], [imap])
 AST_EXT_LIB_SETUP([ISDNNET], [ISDN4Linux Library], [isdnnet])
 AST_EXT_LIB_SETUP([KDE], [KDE], [kde])
-<<<<<<< .working
 AST_EXT_LIB_SETUP([LDAP], [OpenLDAP], [ldap])
-=======
 AST_EXT_LIB_SETUP([MISDN], [mISDN User Library], [misdn])
->>>>>>> .merge-right.r41023
 AST_EXT_LIB_SETUP([NBS], [Network Broadcast Sound], [nbs])
 AST_EXT_LIB_SETUP([NCURSES], [ncurses], [ncurses])
 AST_EXT_LIB_SETUP([NETSNMP], [Net-SNMP], [netsnmp])
@@ -514,10 +511,8 @@
 
 AC_LANG_POP
 
-<<<<<<< .working
 AST_EXT_LIB_CHECK([LDAP], [ldap], [ldap_first_attribute], [ldap.h])
 
-=======
 AST_EXT_LIB_CHECK([MISDN], [mISDN], [mISDN_open], [mISDNuser/mISDNlib.h])
 
 if test "${PBX_MISDN}" = 1; then
@@ -525,7 +520,6 @@
    AST_EXT_LIB_CHECK([SUPPSERV], [suppserv], [encodeFac], [mISDNuser/suppserv.h])
 fi
 
->>>>>>> .merge-right.r41023
 AST_EXT_LIB_CHECK([NBS], [nbs], [nbs_connect], [nbs.h])
 
 AST_EXT_LIB_CHECK([NCURSES], [ncurses], [initscr], [curses.h])

Modified: team/group/res_config_ldap/include/asterisk/autoconfig.h.in
URL: http://svn.digium.com/view/asterisk/team/group/res_config_ldap/include/asterisk/autoconfig.h.in?rev=41033&r1=41032&r2=41033&view=diff
==============================================================================
--- team/group/res_config_ldap/include/asterisk/autoconfig.h.in (original)
+++ team/group/res_config_ldap/include/asterisk/autoconfig.h.in Thu Aug 24 20:12:29 2006
@@ -150,15 +150,12 @@
 /* Define to 1 if you have the `isascii' function. */
 #undef HAVE_ISASCII
 
-<<<<<<< .working
+/* Define to indicate the ${ISDNNET_DESCRIP} library */
+#undef HAVE_ISDNNET
+
 /* Define to indicate the ${LDAP_DESCRIP} library */
 #undef HAVE_LDAP
 
-=======
-/* Define to indicate the ${ISDNNET_DESCRIP} library */
-#undef HAVE_ISDNNET
-
->>>>>>> .merge-right.r41023
 /* Define to 1 if you have the <libintl.h> header file. */
 #undef HAVE_LIBINTL_H

More information about the asterisk-commits mailing list