[svn-commits] seanbright: branch seanbright/editline-update r279388 - in /team/seanbright/e...

Sun Jul 25 11:37:06 CDT 2010

Author: seanbright
Date: Sun Jul 25 11:37:02 2010
New Revision: 279388

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=279388
Log:
Only look for -lbsd if we have vis.h and we are going to use the bundled editline (libedit).

Modified:
    team/seanbright/editline-update/configure
    team/seanbright/editline-update/configure.ac
    team/seanbright/editline-update/include/asterisk/autoconfig.h.in

Modified: team/seanbright/editline-update/configure.ac
URL: http://svnview.digium.com/svn/asterisk/team/seanbright/editline-update/configure.ac?view=diff&rev=279388&r1=279387&r2=279388
==============================================================================

--- team/seanbright/editline-update/configure.ac (original)
+++ team/seanbright/editline-update/configure.ac Sun Jul 25 11:37:02 2010
@@ -506,29 +506,6 @@
    AC_DEFINE([HAVE_SYS_POLL_H], 1, [Define to 1 if your system has working sys/poll.h]),
    )
 
-AC_CHECK_HEADER([vis.h], [HAS_VIS_H=yes], [HAS_VIS_H=no])
-LIBEDIT_EXTRA_LIB=""
-if test "${HAS_VIS_H}" = "yes"; then
-   # We may need -lbsd
-   old_LIBS=${LIBS}
-   LIBS=""
-   AC_LINK_IFELSE(
-      AC_LANG_PROGRAM(
-         [#include <stdlib.h>
-          #include <vis.h>], [vis(NULL,0,0,0)]),
-      ,
-      LIBS="-lbsd"
-      AC_LINK_IFELSE(
-         AC_LANG_PROGRAM(
-            [#include <stdlib.h>
-             #include <vis.h>], [vis(NULL,0,0,0)]),
-         LIBEDIT_EXTRA_LIB=$LIBS
-      )
-   )
-   LIBS=${old_LIBS}
-fi
-AC_SUBST(LIBEDIT_EXTRA_LIB)
-
 AC_ARG_ENABLE([internal-poll],
 	[AS_HELP_STRING([--enable-internal-poll],
 		[Use Asterisk's poll implementation])],
@@ -1972,6 +1949,7 @@
 PBX_LIBEDIT=0
 LIBEDIT_INCLUDE="-Ieditline -Ieditline/readline"
 LIBEDIT_LIB=
+LIBEDIT_EXTRA_LIB=
 LIBEDIT_OBJ=editline/libedit.a
 if test "${USE_LIBEDIT}" != "no"; then
    AC_CHECK_TOOL(PKGCONFIG, pkg-config, no)
@@ -1985,9 +1963,32 @@
       fi
    fi
 fi
+if test "${PBX_LIBEDIT}" != "1"; then
+   AC_CHECK_HEADER([vis.h], [HAS_VIS_H=yes], [HAS_VIS_H=no])
+   if test "${HAS_VIS_H}" = "yes"; then
+      # We may need -lbsd
+      old_LIBS=${LIBS}
+      LIBS=""
+      AC_LINK_IFELSE(
+         AC_LANG_PROGRAM(
+            [#include <stdlib.h>
+             #include <vis.h>], [vis(NULL,0,0,0)]),
+         ,
+         LIBS="-lbsd"
+         AC_LINK_IFELSE(
+            AC_LANG_PROGRAM(
+               [#include <stdlib.h>
+                #include <vis.h>], [vis(NULL,0,0,0)]),
+            LIBEDIT_EXTRA_LIB=$LIBS
+         )
+      )
+      LIBS=${old_LIBS}
+   fi
+fi
 AC_SUBST(PBX_LIBEDIT)
 AC_SUBST(LIBEDIT_INCLUDE)
 AC_SUBST(LIBEDIT_LIB)
+AC_SUBST(LIBEDIT_EXTRA_LIB)
 AC_SUBST(LIBEDIT_OBJ)
 
 # build a GENERIC_ODBC result based on the presence of either UnixODBC (preferred)

Modified: team/seanbright/editline-update/include/asterisk/autoconfig.h.in
URL: http://svnview.digium.com/svn/asterisk/team/seanbright/editline-update/include/asterisk/autoconfig.h.in?view=diff&rev=279388&r1=279387&r2=279388
==============================================================================
--- team/seanbright/editline-update/include/asterisk/autoconfig.h.in (original)
+++ team/seanbright/editline-update/include/asterisk/autoconfig.h.in Sun Jul 25 11:37:02 2010
@@ -806,7 +806,7 @@
 /* Define to 1 if you have the `strtoq' function. */
 #undef HAVE_STRTOQ
 
-/* Define to 1 if `st_blksize' is member of `struct stat'. */
+/* Define to 1 if `st_blksize' is a member of `struct stat'. */
 #undef HAVE_STRUCT_STAT_ST_BLKSIZE
 
 /* Define to 1 if you have the mISDN Supplemental Services library. */
@@ -1074,11 +1074,11 @@
 /* Define to the one symbol short name of this package. */
 #undef PACKAGE_TARNAME
 
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION
-
-/* Define to 1 if the C compiler supports function prototypes. */
-#undef PROTOTYPES
 
 /* Define to necessary symbol if this constant uses a non-standard name on
    your system. */
@@ -1098,11 +1098,6 @@
 
 /* Define to the type of arg 5 for `select'. */
 #undef SELECT_TYPE_ARG5
-
-/* Define to 1 if the `setvbuf' function takes the buffering type as its
-   second argument and the buffer pointer as the third, as on System V before
-   release 3. */
-#undef SETVBUF_REVERSED
 
 /* The size of `char *', as computed by sizeof. */
 #undef SIZEOF_CHAR_P
@@ -1133,20 +1128,30 @@
 /* Define to 1 if your <sys/time.h> declares `struct tm'. */
 #undef TM_IN_SYS_TIME
 
-/* Define to 1 if on AIX 3.
-   System headers sometimes define this.
-   We just want to avoid a redefinition error message.  */
+/* Enable extensions on AIX 3, Interix.  */
 #ifndef _ALL_SOURCE
 # undef _ALL_SOURCE
 #endif
-
-/* Number of bits in a file offset, on hosts where this is settable. */
-#undef _FILE_OFFSET_BITS
-
 /* Enable GNU extensions on systems that have them.  */
 #ifndef _GNU_SOURCE
 # undef _GNU_SOURCE
 #endif
+/* Enable threading extensions on Solaris.  */
+#ifndef _POSIX_PTHREAD_SEMANTICS
+# undef _POSIX_PTHREAD_SEMANTICS
+#endif
+/* Enable extensions on HP NonStop.  */
+#ifndef _TANDEM_SOURCE
+# undef _TANDEM_SOURCE
+#endif
+/* Enable general extensions on Solaris.  */
+#ifndef __EXTENSIONS__
+# undef __EXTENSIONS__
+#endif
+
+
+/* Number of bits in a file offset, on hosts where this is settable. */
+#undef _FILE_OFFSET_BITS
 
 /* Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2). */
 #undef _LARGEFILE_SOURCE
@@ -1163,20 +1168,6 @@
 
 /* Define to 1 if you need to in order for `stat' and other things to work. */
 #undef _POSIX_SOURCE
-
-/* Enable extensions on Solaris.  */
-#ifndef __EXTENSIONS__
-# undef __EXTENSIONS__
-#endif
-#ifndef _POSIX_PTHREAD_SEMANTICS
-# undef _POSIX_PTHREAD_SEMANTICS
-#endif
-#ifndef _TANDEM_SOURCE
-# undef _TANDEM_SOURCE
-#endif
-
-/* Define like PROTOTYPES; this can be used by system headers. */
-#undef __PROTOTYPES
 
 /* Define to empty if `const' does not conform to ANSI C. */
 #undef const


