summaryrefslogtreecommitdiff
path: root/databases/mysql-server/patches/patch-ae
blob: a1a778f976c32deb1972667bfbd22f6c5201df3b (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
$NetBSD: patch-ae,v 1.5 2001/07/06 15:27:18 bad Exp $

--- configure.in.orig	Fri Mar 16 01:51:51 2001
+++ configure.in	Fri Jul  6 16:37:36 2001
@@ -581,7 +581,10 @@
         AC_MSG_RESULT(yes)
         AC_DEFINE(LIBWRAP)
         AC_DEFINE(HAVE_LIBWRAP)
-        WRAPLIBS="-L$with_libwrap/lib -lwrap",
+	if test "$with_libwrap" != "yes"; then
+	    WRAPLIBS="-L${with_libwrap}/lib"
+	fi
+	WRAPLIBS="${WRAPLIBS} -lwrap",
         AC_MSG_RESULT(no)
         CPPFLAGS=${_cppflags} LDFLAGS=${_ldflags}),
       CPPFLAGS=${_cppflags} LDFLAGS=${_ldflags})
@@ -1589,7 +1592,11 @@
   # This requires readline to be in a standard place. Mosty for linux
   # there readline may be a shared library.
   readline_dir=""
-  readline_link="-lreadline"
+  if test -z "$readline_lib"
+  then
+    readline_lib="readline"
+  fi
+  readline_link="-l$readline_lib"
 fi
 AC_SUBST(readline_dir)
 AC_SUBST(readline_link)
@@ -1951,15 +1958,15 @@
     AC_DEFINE(HAVE_mit_thread)
     MT_INCLUDES="-I\$(top_srcdir)/mit-pthreads/include"
     AC_SUBST(MT_INCLUDES)
-    MT_LD_ADD="-L \$(top_srcdir)/mit-pthreads/obj/ -lpthread"
+    MT_LD_ADD="\$(top_srcdir)/mit-pthreads/obj/libpthread.a"
     AC_SUBST(MT_LD_ADD)
-    LIBS="$MT_LD_ADD $LIBS"
     echo ""
     echo "Configuring MIT Pthreads"
     # We will never install so installation paths are not needed.
     (cd mit-pthreads; sh ./configure)
     echo "End of MIT Pthreads configuration"
     echo ""
+    LIBS="$MT_LD_ADD $LIBS"
   fi
 fi
 AC_SUBST(sql_server_dirs)