From f92200e4ed760a237078bea1a6cbb1f95388d1d9 Mon Sep 17 00:00:00 2001
From: "Patrick S. Gardella" <patrick@FreeBSD.org>
Date: Tue, 29 Jan 2002 13:42:57 +0000
Subject: Update to 0.55

---
 lang/tinycobol/files/patch-aa | 73 ++++++++++++-------------------------------
 1 file changed, 20 insertions(+), 53 deletions(-)

(limited to 'lang/tinycobol/files/patch-aa')

diff --git a/lang/tinycobol/files/patch-aa b/lang/tinycobol/files/patch-aa
index df00062364f4..7bc66d1f3665 100644
--- a/lang/tinycobol/files/patch-aa
+++ b/lang/tinycobol/files/patch-aa
@@ -1,61 +1,28 @@
---- configure.orig	Tue Dec  5 20:13:21 2000
-+++ configure	Wed Dec  6 20:03:52 2000
-@@ -1768,7 +1768,7 @@
- if test "${db_version}" = "2" ; then
-   echo -n "checking library db for version 1.85 compatibility..."
-   LIBS_BK="$LIBS"
--  LIBS="$LIBS -ldb"
-+  LIBS="$LIBS -ldb2"
- cat > conftest.$ac_ext <<EOF
- #line 1774 "configure"
- #include "confdefs.h"
-@@ -1876,13 +1876,13 @@
- rm -f conftest*
-  
-                  
--  echo $ac_n "checking for -ldb""... $ac_c" 1>&6
-+  echo $ac_n "checking for -ldb2""... $ac_c" 1>&6
- ac_lib_var=`echo db'_'dbopen | tr './+\055' '__p_'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   ac_save_LIBS="$LIBS"
--LIBS="-ldb  $LIBS"
-+LIBS="-ldb2  $LIBS"
- cat > conftest.$ac_ext <<EOF
- #line 1888 "configure"
- #include "confdefs.h"
-@@ -1924,13 +1924,13 @@
+--- configure.orig	Sun Oct 28 22:39:13 2001
++++ configure	Tue Jan 29 08:13:45 2002
+@@ -65,6 +65,7 @@
+ # Initialize some other variables.
+ subdirs=
+ MFLAGS= MAKEFLAGS=
++LDFLAGS='-L /usr/local/lib'
  
- # if header db.h found check library db1 is version 1.85 
- if test "${db_version}" = "3" ; then
--  echo $ac_n "checking for -ldb""... $ac_c" 1>&6
-+  echo $ac_n "checking for -ldb2""... $ac_c" 1>&6
- ac_lib_var=`echo db'_'dbopen | tr './+\055' '__p_'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+ ac_prev=
+ for ac_option
+@@ -512,7 +513,7 @@
+ ac_ext=c
+ # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
++ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext 1>&5'
+ ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ 
+ if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
+@@ -2024,7 +2025,7 @@
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    ac_save_LIBS="$LIBS"
 -LIBS="-ldb  $LIBS"
 +LIBS="-ldb2  $LIBS"
  cat > conftest.$ac_ext <<EOF
- #line 1936 "configure"
+ #line 2030 "configure"
  #include "confdefs.h"
-@@ -2104,7 +2104,7 @@
- fi
- 
- # check for header and library for readline
--htg_ld_args_default2="-lhtcobol -ldb -lncurses -lm"
-+htg_ld_args_default2="-lhtcobol -ldb2 -lncurses -lm"
- # Check whether --with-readline or --without-readline was given.
- if test "${with_readline+set}" = set; then
-   withval="$with_readline"
-@@ -2178,7 +2178,7 @@
- fi
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
--  htg_ld_args_default2="-lhtcobol -ldb -lncurses -lreadline -lm"
-+  htg_ld_args_default2="-lhtcobol -ldb2 -lncurses -lreadline -lm"
- else
-   echo "$ac_t""no" 1>&6
- { echo "configure: error: "readline lib is required by create COBOL executable... aborting"" 1>&2; exit 1; }
-- 
cgit v1.2.3