1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-11 02:50:24 +00:00

Remove unneeded patch: configure.in is no longer being patched as

patch-configure.ac takes care of configure.ac.
This commit is contained in:
Dejan Lesjak 2005-05-04 09:19:42 +00:00
parent 982527e2ec
commit 324ebf355f
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=134585

View File

@ -1,53 +0,0 @@
--- configure.in.orig Fri Feb 14 14:31:16 2003
+++ configure.in Tue Apr 29 21:52:41 2003
@@ -1133,6 +1133,7 @@
dnl Straightforward OS determination
case "$canonical" in
*-*-linux* ) opsys=linux ;;
+ *-*-freebsd* ) opsys=freebsd ;;
*-*-netbsd* ) opsys=netbsd ;;
*-*-openbsd* ) opsys=openbsd ;;
*-*-nextstep* ) opsys=nextstep ;;
@@ -3920,20 +3921,24 @@
test "$ac_cv_func_crypt" != "yes" && { AC_CHECK_LIB(crypt, crypt) }
fi
dnl Back to our regularly scheduled wnn hunting
- if test -z "$with_wnn" -o "$with_wnn" = "yes"; then
- AC_CHECK_LIB(wnn,jl_dic_list_e,libwnn=wnn,
- AC_CHECK_LIB(wnn4,jl_dic_list_e,libwnn=wnn4,
- AC_CHECK_LIB(wnn6,jl_dic_list_e,libwnn=wnn6,
- AC_CHECK_LIB(wnn6_fromsrc,dic_list_e,libwnn=wnn6_fromsrc,with_wnn=no))))
+ if test "$with_wnn6" = "yes"; then
+ AC_CHECK_LIB(wnn6,jl_fi_dic_list_e,libwnn=wnn6,
+ AC_CHECK_LIB(wnn6_fromsrc,jl_fi_dic_list_e,libwnn=wnn6_fromsrc,
+AC_CHECK_LIB(wnn,jl_fi_dic_list_e,libwnn=wnn, [with_wnn6=no; with_wnn=no])))
+ else
+ if test -z "$with_wnn" -o "$with_wnn" = "yes"; then
+ AC_CHECK_LIB(wnn,jl_dic_list_e,libwnn=wnn,
+AC_CHECK_LIB(wnn4,jl_dic_list_e,libwnn=wnn4,
+ AC_CHECK_LIB(wnn6,jl_fi_dic_list_e,[libwnn=wnn6; with_wnn6=yes],
+ AC_CHECK_LIB(wnn6_fromsrc,jl_fi_dic_list_e, [libwnn=wnn6_fromsrc; with_wnn6=yes],with_wnn=no))))
+ fi
fi
test -z "$with_wnn" && with_wnn=yes
if test "$with_wnn" = "yes"; then
AC_DEFINE(HAVE_WNN)
XE_PREPEND(-l$libwnn, libs_x)
- if test "$with_wnn6" != "no"; then
- AC_CHECK_LIB($libwnn, jl_fi_dic_list, with_wnn6=yes)
- test "$with_wnn6" = "yes" && AC_DEFINE(WNN6)
- fi
+ dnl XE_ADD_OBJS(mule-wnnfns.o) missing here
+ test "$with_wnn6" = "yes" && AC_DEFINE(WNN6)
fi
dnl Autodetect canna
@@ -4526,7 +4531,7 @@
dnl Check for Berkeley DB.
if test "$with_database_berkdb" != "no"; then
AC_MSG_CHECKING(for Berkeley db.h)
- for header in "db/db.h" "db.h"; do
+ for header in "/usr/include/db.h" "db/db.h" "db.h"; do
AC_TRY_COMPILE([
#include <stdlib.h>
#if !(defined __GLIBC__ && __GLIBC_MINOR__ >= 1)