Ticket #12310: libs.patch

base/Mk/macports.autoconf.mk.in

@@ -5 +5 @@
 VPATH                   = @srcdir@
 
 CC                      = @CC@
-CFLAGS                  = @CFLAGS@ $(CFLAGS_QUICHEEATERS) $(CFLAGS_WERROR) $(CFLAGS_DEBUG) $(CFLAGS_OPTIMIZE) $(CPPFLAGS) $(CFLAGS_LIBCURL)
-OBJCFLAGS               = @OBJCFLAGS@ $(CFLAGS_WERROR) ${CFLAGS_DEBUG}  $(CFLAGS_OPTIMIZE) $(CPPFLAGS) $(CFLAGS_LIBCURL)
+CFLAGS                  = @CFLAGS@ $(CFLAGS_QUICHEEATERS) $(CFLAGS_WERROR) $(CFLAGS_DEBUG) $(CFLAGS_OPTIMIZE) $(CPPFLAGS)
+OBJCFLAGS               = @OBJCFLAGS@ $(CFLAGS_WERROR) ${CFLAGS_DEBUG} $(CFLAGS_OPTIMIZE) $(CPPFLAGS)
 CPPFLAGS                = @CPPFLAGS@ @DEFS@ @INCLUDES@ @TCL_INCLUDES@
 TCL_DEFS                = @TCL_DEFS@
 SHLIB_CFLAGS            = @SHLIB_CFLAGS@
@@ -14 +14 @@
 CFLAGS_OPTIMIZE         = @CFLAGS_OPTIMIZE@
 CFLAGS_QUICHEEATERS     = @CFLAGS_QUICHEEATERS@
 CFLAGS_WERROR           = @CFLAGS_WERROR@
-CFLAGS_LIBCURL          = @CFLAGS_LIBCURL@
+
+READLINE_CFLAGS         =
+MD5_CFLAGS              =
+SQLITE3_CFLAGS          =
+CURL_CFLAGS             = @CFLAGS_LIBCURL@
 
 OBJC_RUNTIME            = @OBJC_RUNTIME@
 OBJC_RUNTIME_FLAGS      = @OBJC_RUNTIME_FLAGS@
@@ -27 +31 @@
 
 TCL_CC                  = @TCL_CC@
 SHLIB_LD                = @SHLIB_LD@
-LDFLAGS_LIBCURL         = @LDFLAGS_LIBCURL@
-LDFLAGS                 =  -L/usr/local/lib @LDFLAGS@ $(LDFLAGS_LIBCURL)
+STLIB_LD                = @STLIB_LD@
+LDFLAGS                 = -L/usr/local/lib @LDFLAGS@
 SHLIB_LDFLAGS           = @SHLIB_LDFLAGS@ ${LDFLAGS}
 SHLIB_SUFFIX            = @SHLIB_SUFFIX@
 TCL_STUB_LIB_SPEC       = @TCL_STUB_LIB_SPEC@
 
 LIBS                    = @LIBS@
+READLINE_LIBS           = @READLINE_LIBS@
 MD5_LIBS                = @MD5_LIBS@
 SQLITE3_LIBS            = @SQLITE3_LIBS@
+CURL_LIBS               = @LDFLAGS_LIBCURL@
 INSTALL                 = @INSTALL@
 MTREE                   = @MTREE@
 LN_S                    = @LN_S@

base/Mk/macports.tea.mk

@@ -7 +7 @@
         ${CC} -c -DUSE_TCL_STUBS ${CFLAGS} ${TCL_DEFS} ${SHLIB_CFLAGS} $< -o $@
 
 $(SHLIB_NAME):: ${OBJS}
-        ${SHLIB_LD} ${OBJS} -o ${SHLIB_NAME} ${TCL_STUB_LIB_SPEC} ${SHLIB_LDFLAGS} ${LIBS} ${MD5_LIBS} ${SQLITE3_LIBS}
+        ${SHLIB_LD} ${OBJS} -o ${SHLIB_NAME} ${TCL_STUB_LIB_SPEC} ${SHLIB_LDFLAGS} ${LIBS}
 
 all:: ${SHLIB_NAME}
 

base/configure

@@ -729 +729 @@
 X_PRE_LIBS
 X_LIBS
 X_EXTRA_LIBS
+READLINE_LIBS
 TCL_VERSION
 TCL_BIN_DIR
 TCL_SRC_DIR
@@ -10326 +10327 @@
 
 
 # Check for readline
-
 { echo "$as_me:$LINENO: checking for readline in -lreadline" >&5
 echo $ECHO_N "checking for readline in -lreadline... $ECHO_C" >&6; }
 if test "${ac_cv_lib_readline_readline+set}" = set; then
@@ -10389 +10389 @@
 { 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
-  cat >>confdefs.h <<_ACEOF
+
+              READLINE_LIBS=-lreadline
+
+cat >>confdefs.h <<\_ACEOF
 #define HAVE_LIBREADLINE 1
 _ACEOF
 
-  LIBS="-lreadline $LIBS"
 
 fi
 
@@ -10832 +10834 @@
 
 
 
+
 # Lowest non-system-reserved uid and gid (Apple claims <500)
 
 cat >>confdefs.h <<\_ACEOF
@@ -12474 +12477 @@
 X_PRE_LIBS!$X_PRE_LIBS$ac_delim
 X_LIBS!$X_LIBS$ac_delim
 X_EXTRA_LIBS!$X_EXTRA_LIBS$ac_delim
+READLINE_LIBS!$READLINE_LIBS$ac_delim
 TCL_VERSION!$TCL_VERSION$ac_delim
 TCL_BIN_DIR!$TCL_BIN_DIR$ac_delim
 TCL_SRC_DIR!$TCL_SRC_DIR$ac_delim
@@ -12510 +12514 @@
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 50; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 51; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5

base/configure.ac

@@ -95 +95 @@
 MP_CHECK_X11
 
 # Check for readline
-AC_CHECK_LIB([readline], [readline])
+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>
@@ -103 +106 @@
 # include <readline/readline.h>
 #endif
 ])
+AC_SUBST(READLINE_LIBS)
 
 # Lowest non-system-reserved uid and gid (Apple claims <500)
 AC_DEFINE([MIN_USABLE_UID], [500], [Lowest non-system-reserved UID.])

base/src/pextlib1.0/Makefile

@@ -9 +9 @@
 include ../../Mk/macports.autoconf.mk
 include ../../Mk/macports.tea.mk
 
+CFLAGS+= ${CURL_CFLAGS} ${MD5_CFLAGS} ${READLINE_CFLAGS}
+LIBS+= ${CURL_LIBS} ${MD5_LIBS} ${READLINE_LIBS}
+
 .PHONY: test
 
 test:: ${SHLIB_NAME}