[svn-commits] seanbright: branch seanbright/editline-update r278689 - in /team/seanbright/e...
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Thu Jul 22 12:01:02 CDT 2010
Author: seanbright
Date: Thu Jul 22 12:00:57 2010
New Revision: 278689
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=278689
Log:
Fix compilation when libbsd is installed and using the internal editline.
libbsd being installed will cause the bundled editline to find vis/unvis in vis.h, but
we need to link in -lbsd during final linking. Check for all of that in configure.
Modified:
team/seanbright/editline-update/configure
team/seanbright/editline-update/configure.ac
team/seanbright/editline-update/include/asterisk/autoconfig.h.in
team/seanbright/editline-update/main/Makefile
team/seanbright/editline-update/makeopts.in
Modified: team/seanbright/editline-update/configure.ac
URL: http://svnview.digium.com/svn/asterisk/team/seanbright/editline-update/configure.ac?view=diff&rev=278689&r1=278688&r2=278689
==============================================================================
--- team/seanbright/editline-update/configure.ac (original)
+++ team/seanbright/editline-update/configure.ac Thu Jul 22 12:00:57 2010
@@ -506,6 +506,29 @@
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])],
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=278689&r1=278688&r2=278689
==============================================================================
--- team/seanbright/editline-update/include/asterisk/autoconfig.h.in (original)
+++ team/seanbright/editline-update/include/asterisk/autoconfig.h.in Thu Jul 22 12:00:57 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
Modified: team/seanbright/editline-update/main/Makefile
URL: http://svnview.digium.com/svn/asterisk/team/seanbright/editline-update/main/Makefile?view=diff&rev=278689&r1=278688&r2=278689
==============================================================================
--- team/seanbright/editline-update/main/Makefile (original)
+++ team/seanbright/editline-update/main/Makefile Thu Jul 22 12:00:57 2010
@@ -179,11 +179,11 @@
$(MAIN_TGT): $(OBJS) $(LIBEDIT_OBJ) db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS)
@$(CC) -c -o buildinfo.o $(_ASTCFLAGS) buildinfo.c $(ASTCFLAGS)
- $(ECHO_PREFIX) echo " [LD] $(OBJS) editline/src/.libs/libedit.a db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS) -> $@"
+ $(ECHO_PREFIX) echo " [LD] $(OBJS) editline/src/.libs/libedit.a db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS) $(LIBEDIT_EXTRA_LIB) -> $@"
ifneq ($(findstring chan_h323,$(MENUSELECT_CHANNELS)),)
- $(CMD_PREFIX) $(CC) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(_ASTLDFLAGS) $(ASTLDFLAGS) $(OBJS) $(LIBEDIT_OBJ) db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS) buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(GMIMELDFLAGS) $(LIBEDIT_LIB)
-else
- $(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(_ASTLDFLAGS) $(ASTLDFLAGS) $(H323LDFLAGS) $(OBJS) $(LIBEDIT_OBJ) db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS) buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(H323LDLIBS) $(GMIMELDFLAGS) $(LIBEDIT_LIB)
+ $(CMD_PREFIX) $(CC) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(_ASTLDFLAGS) $(ASTLDFLAGS) $(OBJS) $(LIBEDIT_OBJ) db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS) buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(GMIMELDFLAGS) $(LIBEDIT_LIB) $(LIBEDIT_EXTRA_LIB)
+else
+ $(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(_ASTLDFLAGS) $(ASTLDFLAGS) $(H323LDFLAGS) $(OBJS) $(LIBEDIT_OBJ) db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS) buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(H323LDLIBS) $(GMIMELDFLAGS) $(LIBEDIT_LIB) $(LIBEDIT_EXTRA_LIB)
endif
ifeq ($(GNU_LD),1)
Modified: team/seanbright/editline-update/makeopts.in
URL: http://svnview.digium.com/svn/asterisk/team/seanbright/editline-update/makeopts.in?view=diff&rev=278689&r1=278688&r2=278689
==============================================================================
--- team/seanbright/editline-update/makeopts.in (original)
+++ team/seanbright/editline-update/makeopts.in Thu Jul 22 12:00:57 2010
@@ -292,3 +292,4 @@
LIBEDIT_INCLUDE=@LIBEDIT_INCLUDE@
LIBEDIT_LIB=@LIBEDIT_LIB@
LIBEDIT_OBJ=@LIBEDIT_OBJ@
+LIBEDIT_EXTRA_LIB=@LIBEDIT_EXTRA_LIB@
More information about the svn-commits
mailing list