[27296] trunk/base

[source_changes at macosforge.org]

Revision: 27296
          http://trac.macosforge.org/projects/macports/changeset/27296
Author:   sfiera at macports.org
Date:     2007-07-27 13:20:48 -0700 (Fri, 27 Jul 2007)

Log Message:
-----------
Fixed readline, added STLIB_LD

Modified Paths:
--------------
    trunk/base/Mk/macports.autoconf.mk.in
    trunk/base/configure
    trunk/base/configure.ac
    trunk/base/src/config.h.in
    trunk/base/src/pextlib1.0/Makefile

Modified: trunk/base/Mk/macports.autoconf.mk.in
===================================================================
--- trunk/base/Mk/macports.autoconf.mk.in	2007-07-27 20:20:41 UTC (rev 27295)
+++ trunk/base/Mk/macports.autoconf.mk.in	2007-07-27 20:20:48 UTC (rev 27296)
@@ -27,6 +27,7 @@
 
 TCL_CC			= @TCL_CC@
 SHLIB_LD		= @SHLIB_LD@
+STLIB_LD		= @STLIB_LD@
 LDFLAGS			= -L/usr/local/lib @LDFLAGS@
 SHLIB_LDFLAGS		= @SHLIB_LDFLAGS@ ${LDFLAGS}
 SHLIB_SUFFIX		= @SHLIB_SUFFIX@

Modified: trunk/base/configure
===================================================================
--- trunk/base/configure	2007-07-27 20:20:41 UTC (rev 27295)
+++ trunk/base/configure	2007-07-27 20:20:48 UTC (rev 27296)
@@ -10389,7 +10389,14 @@
 { echo "$as_me:$LINENO: result: $ac_cv_lib_readline_readline" >&5
 echo "${ECHO_T}$ac_cv_lib_readline_readline" >&6; }
 if test $ac_cv_lib_readline_readline = yes; then
-  READLINE_LIBS=-lreadline
+
+              READLINE_LIBS=-lreadline
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_LIBREADLINE 1
+_ACEOF
+
+
 fi
 
 { echo "$as_me:$LINENO: checking whether rl_username_completion_function is declared" >&5

Modified: trunk/base/configure.ac
===================================================================
--- trunk/base/configure.ac	2007-07-27 20:20:41 UTC (rev 27295)
+++ trunk/base/configure.ac	2007-07-27 20:20:48 UTC (rev 27296)
@@ -95,7 +95,10 @@
 MP_CHECK_X11
 
 # Check for readline
-AC_CHECK_LIB([readline], [readline], [READLINE_LIBS=-lreadline])
+AC_CHECK_LIB([readline], [readline], [
+              READLINE_LIBS=-lreadline
+              AC_DEFINE([HAVE_LIBREADLINE], [1], [Define to 1 if you have the `readline' library (-lreadline).])
+              ])
 AC_CHECK_DECLS([rl_username_completion_function,rl_filename_completion_function,rl_completion_matches,username_completion_function,filename_completion_function,completion_matches], [], [],
 [
 #include <stdio.h>

Modified: trunk/base/src/config.h.in
===================================================================
--- trunk/base/src/config.h.in	2007-07-27 20:20:41 UTC (rev 27295)
+++ trunk/base/src/config.h.in	2007-07-27 20:20:48 UTC (rev 27296)
@@ -102,6 +102,9 @@
 /* Define if you have the `md' library (-lmd). */
 #undef HAVE_LIBMD
 
+/* Define to 1 if you have the `readline' library (-lreadline). */
+#undef HAVE_LIBREADLINE
+
 /* Define to 1 if you have the <limits.h> header file. */
 #undef HAVE_LIMITS_H
 

Modified: trunk/base/src/pextlib1.0/Makefile
===================================================================
--- trunk/base/src/pextlib1.0/Makefile	2007-07-27 20:20:41 UTC (rev 27295)
+++ trunk/base/src/pextlib1.0/Makefile	2007-07-27 20:20:48 UTC (rev 27296)
@@ -9,7 +9,7 @@
 include ../../Mk/macports.autoconf.mk
 include ../../Mk/macports.tea.mk
 
-LIBS+= ${CURL_LIBS} ${MD5_LIBS}
+LIBS+= ${CURL_LIBS} ${MD5_LIBS} ${READLINE_LIBS}
 
 .PHONY: test
 

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070727/19aab637/attachment.html