Revision: 2568
http://tmux.svn.sourceforge.net/tmux/?rev=2568&view=rev
Author: nicm
Date: 2011-07-27 09:31:08 +0000 (Wed, 27 Jul 2011)
Log Message:
-----------
Fix --enable-static and add a different check for b64_ntop that might work on
OS X.
Modified Paths:
--------------
trunk/Makefile.am
trunk/configure.ac
Modified: trunk/Makefile.am
===================================================================
--- trunk/Makefile.am 2011-07-25 09:56:43 UTC (rev 2567)
+++ trunk/Makefile.am 2011-07-27 09:31:08 UTC (rev 2568)
@@ -43,11 +43,6 @@
endif
endif
-# Set flags for static.
-if IS_STATIC
-LDFLAGS += -static
-endif
-
# Set flags for Solaris.
if IS_SUNOS
CPPFLAGS += -D_XPG4_2 -D__EXTENSIONS__ -D_POSIX_PTHREAD_SEMANTICS
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2011-07-25 09:56:43 UTC (rev 2567)
+++ trunk/configure.ac 2011-07-27 09:31:08 UTC (rev 2568)
@@ -12,6 +12,7 @@
# autoconf will automatically use CFLAGS="-O2 -g". Prevent that by using an
# empty default.
: ${CFLAGS=""}
+
# Set up the compiler in two different ways and say yes we may want to install.
AC_PROG_CC
AM_PROG_CC_C_O
@@ -52,9 +53,8 @@
AC_ARG_ENABLE(
static,
AC_HELP_STRING(--enable-static, create a static build),
- [found_static=$enable_static]
+ [LDFLAGS="$LDFLAGS -static"]
)
-AM_CONDITIONAL(IS_STATIC, test "x" = xyes)
# Is this gcc?
AM_CONDITIONAL(IS_GCC, test "x$GCC" = xyes)
@@ -126,15 +126,44 @@
AC_MSG_ERROR("curses not found")
fi
-# Look for networking libraries.
-AC_SEARCH_LIBS(b64_ntop, resolv, found_b64_ntop=yes, found_b64_ntop=no)
-AC_SEARCH_LIBS(__b64_ntop, resolv, found___b64_ntop=yes, found___b64_ntop=no)
-if test "x$found_b64_ntop" = xyes -o "x$found___b64_ntop" = xyes; then
+# Check for b64_ntop.
+AC_MSG_CHECKING(for b64_ntop)
+AC_TRY_LINK(
+ [
+ #include <sys/types.h>
+ #include <netinet/in.h>
+ #include <resolv.h>
+ ],
+ [b64_ntop(NULL, 0, NULL, 0);],
+ found_b64_ntop=yes,
+ found_b64_ntop=no
+)
+if test "x$found_b64_ntop" = xno; then
+ AC_MSG_RESULT(no)
+
+ AC_MSG_CHECKING(for b64_ntop with -lresolv)
+ LIBS="$LIBS -lresolv"
+ AC_TRY_LINK(
+ [
+ #include <sys/types.h>
+ #include <netinet/in.h>
+ #include <resolv.h>
+ ],
+ [b64_ntop(NULL, 0, NULL, 0);],
+ found_b64_ntop=yes,
+ found_b64_ntop=no
+ )
+ if test "x$found_b64_ntop" = xno; then
+ AC_MSG_RESULT(no)
+ fi
+fi
+if test "x$found_b64_ntop" = xyes; then
AC_DEFINE(HAVE_B64_NTOP)
+ AC_MSG_RESULT(yes)
fi
-AM_CONDITIONAL(
- NO_B64_NTOP,
- [test "x$found_b64_ntop" = xno -a "x$found___b64_ntop" = xno])
+AM_CONDITIONAL(NO_B64_NTOP, [test "x$found_b64_ntop" = xno])
+
+# Look for networking libraries.
AC_SEARCH_LIBS(inet_ntoa, nsl)
AC_SEARCH_LIBS(socket, socket)
AC_CHECK_LIB(xnet, socket)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Got Input? Slashdot Needs You.
Take our quick survey online. Come on, we don't ask for help often.
Plus, you'll get a chance to win $100 to spend on ThinkGeek.
http://p.sf.net/sfu/slashdot-survey
_______________________________________________
tmux-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tmux-cvs
