594dc20e48
Make sure only the external libpopt is used, instead of a mix between external and internal. from Brad with some tweaks
84 lines
2.3 KiB
Plaintext
84 lines
2.3 KiB
Plaintext
$OpenBSD: patch-configure_in,v 1.1 2011/10/16 07:03:12 ajacoutot Exp $
|
|
--- configure.in.orig Wed Sep 13 15:39:40 2000
|
|
+++ configure.in Sun Sep 4 06:18:45 2011
|
|
@@ -215,34 +215,6 @@ addlib() {
|
|
esac
|
|
}
|
|
|
|
-localdone=
|
|
-for dir in $prefix /usr/local
|
|
-do
|
|
- case $dir in
|
|
- NONE|/usr) continue;;
|
|
- /usr/local)
|
|
- if test X$localdone != X ; then continue; fi
|
|
- localdone="$dir"
|
|
- ;;
|
|
- esac
|
|
-
|
|
- AC_MSG_CHECKING(for $dir/lib in LIBS)
|
|
- if test -d $dir/lib ; then
|
|
- addlib $dir/lib
|
|
- AC_MSG_RESULT(yes)
|
|
- else
|
|
- AC_MSG_RESULT(no)
|
|
- fi
|
|
-
|
|
- AC_MSG_CHECKING(for $dir/include in INCPATH)
|
|
- if test -d $dir/include ; then
|
|
- INCPATH="$INCPATH -I$dir/include"
|
|
- AC_MSG_RESULT(yes)
|
|
- else
|
|
- AC_MSG_RESULT(no)
|
|
- fi
|
|
-done
|
|
-
|
|
AC_MSG_CHECKING(for /usr/ucblib in LIBS)
|
|
if test -d /usr/ucblib ; then
|
|
if test "$build" = "mips-sni-sysv4" ; then
|
|
@@ -344,14 +316,10 @@ AM_FUNC_ERROR_AT_LINE
|
|
dnl ==> AM_GNU_GETTEXT does this (and more)
|
|
dnl AC_CHECK_HEADERS(unistd.h limits.h locale.h malloc.h string.h sys/param.h)
|
|
|
|
+save_LIBS="$LIBS"
|
|
+LIBS="-liconv $LIBS"
|
|
AM_GNU_GETTEXT
|
|
-dnl TVM:
|
|
-dnl horrible *temporary* hack to make sure that if we found gettext() in
|
|
-dnl -lintl that we add -lintl *back* to $LIBS.
|
|
-dnl
|
|
-if test X$gt_cv_func_gettext_libintl = Xyes ; then
|
|
- LIBS="-lintl $LIBS"
|
|
-fi
|
|
+LIBS="$save_LIBS"
|
|
|
|
dnl Checks for header files we can live without.
|
|
AC_HEADER_STDC
|
|
@@ -359,7 +327,6 @@ AC_HEADER_MAJOR
|
|
AC_HEADER_DIRENT
|
|
AC_HEADER_TIME
|
|
|
|
-AC_CHECK_HEADERS(db_185.h db1/db.h)
|
|
AC_CHECK_HEADERS(fcntl.h getopt.h grp.h memory.h netdb.h pwd.h utime.h)
|
|
|
|
AC_CHECK_HEADERS(sys/socket.h sys/select.h)
|
|
@@ -911,16 +878,14 @@ dnl XXX this causes popt to depend on zlib et al
|
|
dnl # XXX Propagate -lucb to popt ...
|
|
dnl export LIBS INCPATH CONFIG_SITE
|
|
|
|
-AC_CONFIG_SUBDIRS(popt)
|
|
AC_OUTPUT([Doxyfile Makefile rpmrc macros platform rpmpopt scripts/brp-redhat
|
|
lib/Makefile build/Makefile tools/Makefile scripts/Makefile
|
|
tests/Makefile tests/rpmrc tests/macros tests/hello-test/Makefile
|
|
misc/Makefile po/Makefile.in intl/Makefile
|
|
doc/Makefile doc/manual/Makefile
|
|
doc/ja/Makefile doc/pl/Makefile doc/ru/Makefile doc/sk/Makefile
|
|
- python/Makefile perl/Makefile perl/Makefile.PL],
|
|
- [echo timestamp > popt/stamp-h.in
|
|
- echo timestamp > stamp-h.in])
|
|
+ python/Makefile],
|
|
+ [echo timestamp > stamp-h.in])
|
|
dnl touch Makefile.in
|
|
dnl sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile])
|
|
|