diff options
Diffstat (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/libnbcompat/Makefile | 4 | ||||
| -rw-r--r-- | pkgtools/libnbcompat/PLIST | 5 | ||||
| -rw-r--r-- | pkgtools/libnbcompat/files/Makefile.in | 8 | ||||
| -rwxr-xr-x | pkgtools/libnbcompat/files/configure | 65 | ||||
| -rw-r--r-- | pkgtools/libnbcompat/files/configure.ac | 3 | ||||
| -rw-r--r-- | pkgtools/libnbcompat/files/nbconfig.h.in | 3 | ||||
| -rw-r--r-- | pkgtools/libnbcompat/files/util.h | 15 |
7 files changed, 83 insertions, 20 deletions
diff --git a/pkgtools/libnbcompat/Makefile b/pkgtools/libnbcompat/Makefile index cdf77ae57f6..5eae0ce064a 100644 --- a/pkgtools/libnbcompat/Makefile +++ b/pkgtools/libnbcompat/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.13 2003/09/01 15:31:14 jlam Exp $ +# $NetBSD: Makefile,v 1.14 2003/09/03 03:28:28 jlam Exp $ # -DISTNAME= libnbcompat-20030823 +DISTNAME= libnbcompat-20030824 CATEGORIES= pkgtools MASTER_SITES= # empty DISTFILES= # empty diff --git a/pkgtools/libnbcompat/PLIST b/pkgtools/libnbcompat/PLIST index 72c1dc136a9..8d164b27065 100644 --- a/pkgtools/libnbcompat/PLIST +++ b/pkgtools/libnbcompat/PLIST @@ -1,12 +1,10 @@ -@comment $NetBSD: PLIST,v 1.5 2003/09/01 15:31:14 jlam Exp $ -include/libnbcompat/extern.h +@comment $NetBSD: PLIST,v 1.6 2003/09/03 03:28:28 jlam Exp $ include/libnbcompat/err.h include/libnbcompat/ftpglob.h include/libnbcompat/fts.h include/libnbcompat/getopt.h include/libnbcompat/md5.h include/libnbcompat/mtree.h -include/libnbcompat/namespace.h include/libnbcompat/nbcompat.h include/libnbcompat/nbconfig.h include/libnbcompat/nbtypes.h @@ -15,7 +13,6 @@ include/libnbcompat/pwcache.h include/libnbcompat/rmd160.h include/libnbcompat/sha1.h include/libnbcompat/sha2.h -include/libnbcompat/stat_flags.h include/libnbcompat/util.h include/libnbcompat/vis.h lib/libnbcompat.a diff --git a/pkgtools/libnbcompat/files/Makefile.in b/pkgtools/libnbcompat/files/Makefile.in index db156856f2f..a048bc30a08 100644 --- a/pkgtools/libnbcompat/files/Makefile.in +++ b/pkgtools/libnbcompat/files/Makefile.in @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.in,v 1.10 2003/09/02 01:54:39 jlam Exp $ +# $NetBSD: Makefile.in,v 1.11 2003/09/03 03:28:29 jlam Exp $ # srcdir= @srcdir@ @@ -19,9 +19,9 @@ RANLIB= @RANLIB@ LIB= libnbcompat.a -INCS= extern.h err.h ftpglob.h fts.h getopt.h md5.h mtree.h \ - namespace.h nbcompat.h nbtypes.h pack_dev.h pwcache.h \ - rmd160.h sha1.h sha2.h stat_flags.h util.h vis.h +INCS= err.h ftpglob.h fts.h getopt.h md5.h mtree.h \ + nbcompat.h nbtypes.h pack_dev.h pwcache.h \ + rmd160.h sha1.h sha2.h util.h vis.h OBJS= @LIBOBJS@ \ md5c.o md5hl.o rmd160.o rmd160hl.o sha1.o sha1hl.o \ diff --git a/pkgtools/libnbcompat/files/configure b/pkgtools/libnbcompat/files/configure index 52ec1293922..d68b9a75da5 100755 --- a/pkgtools/libnbcompat/files/configure +++ b/pkgtools/libnbcompat/files/configure @@ -2521,6 +2521,71 @@ AUTOHEADER=${AUTOHEADER-"$srcdir/missing --run autoheader"} + +echo "$as_me:$LINENO: checking for fparseln in -lutil" >&5 +echo $ECHO_N "checking for fparseln in -lutil... $ECHO_C" >&6 +if test "${ac_cv_lib_util_fparseln+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lutil $LIBS" +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char fparseln (); +int +main () +{ +fparseln (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_util_fparseln=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_util_fparseln=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_lib_util_fparseln" >&5 +echo "${ECHO_T}$ac_cv_lib_util_fparseln" >&6 +if test $ac_cv_lib_util_fparseln = yes; then + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBUTIL 1 +_ACEOF + + LIBS="-lutil $LIBS" + +fi + + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' diff --git a/pkgtools/libnbcompat/files/configure.ac b/pkgtools/libnbcompat/files/configure.ac index a4c4413c179..8adabf362fd 100644 --- a/pkgtools/libnbcompat/files/configure.ac +++ b/pkgtools/libnbcompat/files/configure.ac @@ -23,6 +23,9 @@ AC_SUBST(AUTOCONF) AUTOHEADER=${AUTOHEADER-"$srcdir/missing --run autoheader"} AC_SUBST(AUTOHEADER) +dnl Checks for libraries +AC_CHECK_LIB(util, fparseln) + dnl Checks for header files. AC_HEADER_STDC AC_HEADER_TIME diff --git a/pkgtools/libnbcompat/files/nbconfig.h.in b/pkgtools/libnbcompat/files/nbconfig.h.in index 54de00be691..b30c5b636ad 100644 --- a/pkgtools/libnbcompat/files/nbconfig.h.in +++ b/pkgtools/libnbcompat/files/nbconfig.h.in @@ -109,6 +109,9 @@ /* Define to 1 if you have the `lchown' function. */ #undef HAVE_LCHOWN +/* Define to 1 if you have the `util' library (-lutil). */ +#undef HAVE_LIBUTIL + /* Define to 1 if you have the <libutil.h> header file. */ #undef HAVE_LIBUTIL_H diff --git a/pkgtools/libnbcompat/files/util.h b/pkgtools/libnbcompat/files/util.h index f544fd4cf6d..9f235ab21a3 100644 --- a/pkgtools/libnbcompat/files/util.h +++ b/pkgtools/libnbcompat/files/util.h @@ -1,4 +1,4 @@ -/* $NetBSD: util.h,v 1.2 2003/09/01 15:31:21 jlam Exp $ */ +/* $NetBSD: util.h,v 1.3 2003/09/03 03:28:29 jlam Exp $ */ /*- * Copyright (c) 1995 @@ -106,19 +106,14 @@ int ttylock(const char *, int, pid_t *); char *ttymsg(struct iovec *, int, const char *, int); int ttyunlock(const char *); -#ifndef HAVE_STRSEP -char *strsep(char **, const char *); +#if !HAVE_STRSEP +char *strsep(char **, const char *); #endif -#ifndef HAVE_FGETLN -char *fgetln(FILE *, size_t *); -#define LIST_EMPTY(head) ((head)->lh_first == NULL) -#define LIST_FIRST(head) ((head)->lh_first) -#define LIST_NEXT(elm, field) ((elm)->field.le_next) +#if !HAVE_FGETLN +char *fgetln(FILE *, size_t *); #endif __END_DECLS -static int isescaped(const char *, const char *, int); - #endif /* !_UTIL_H_ */ |