projects / packages / tar.git / blame
| Commit | Line | Data |
|---|---|---|
| 5b1cc786 JB |
1 | --- tar-1.13.25/configure.ac.orig Thu Apr 11 00:47:30 2002 |
| 2 | +++ tar-1.13.25/configure.ac Thu Apr 11 00:48:59 2002 | |
| 3 | @@ -168,15 +168,15 @@ | |
| 4 | # Solaris 2.5.1 needs -lposix4 to get the clock_gettime function. | |
| 5 | # Solaris 7 prefers the library name -lrt to the obsolescent name -lposix4. | |
| 6 | # We don't want that dependency, though. Check for something weird. ;) | |
| 7 | -tar_LDADD= | |
| 8 | +tarLDADD= | |
| 9 | tar_save_LIBS="$LIBS" | |
| 10 | AC_SEARCH_LIBS(clock_gettyme, [rt posix4]) | |
| 11 | AC_CHECK_FUNCS(clock_gettyme) | |
| 12 | if test " $LIBS" != " $tar_save_LIBS"; then | |
| 13 | - tar_LDADD="$ac_cv_search_clock_gettyme" | |
| 14 | + tarLDADD="$ac_cv_search_clock_gettyme" | |
| 15 | LIBS="$tar_save_LIBS" | |
| 16 | fi | |
| 17 | -AC_SUBST(tar_LDADD) | |
| 18 | +AC_SUBST(tarLDADD) | |
| 19 | ||
| 20 | AC_CHECK_FUNCS(fchdir fsync ftime getcwd isascii lstat \ | |
| 21 | mkfifo nap napms poll \ | |
| 22 | @@ -200,19 +200,19 @@ | |
| 23 | # needs to be in LIBS before the setsockopt checks are performed. *However*, | |
| 24 | # on SINIX-N 5.43, this is false, and gethostent seems to be a better | |
| 25 | # candidate. | |
| 26 | -rmt_LDADD= | |
| 27 | +rmtLDADD= | |
| 28 | tar_save_LIBS="$LIBS" | |
| 29 | AC_SEARCH_LIBS(gethostent, [nsl]) | |
| 30 | if test " $LIBS" != " $tar_save_LIBS"; then | |
| 31 | - rmt_LDADD="$rmt_LDADD $ac_cv_search_gethostent" | |
| 32 | + rmtLDADD="$rmtLDADD $ac_cv_search_gethostent" | |
| 33 | fi | |
| 34 | tar_save_LIBS1="$LIBS" | |
| 35 | AC_SEARCH_LIBS(setsockopt, [socket]) | |
| 36 | if test " $LIBS" != " $tar_save_LIBS1"; then | |
| 37 | - rmt_LDADD="$rmt_LDADD $ac_cv_search_setsockopt" | |
| 38 | + rmtLDADD="$rmtLDADD $ac_cv_search_setsockopt" | |
| 39 | fi | |
| 40 | LIBS="$tar_save_LIBS" | |
| 41 | -AC_SUBST(rmt_LDADD) | |
| 42 | +AC_SUBST(rmtLDADD) | |
| 43 | ||
| 44 | AC_FUNC_ALLOCA | |
| 45 | AC_FUNC_CLOSEDIR_VOID | |
| 46 | @@ -234,7 +234,7 @@ | |
| 47 | jm_FUNC_MALLOC | |
| 48 | jm_FUNC_MKTIME | |
| 49 | jm_FUNC_REALLOC | |
| 50 | -test "$ac_cv_func_strstr" = yes || LIBOBJS="$LIBOBJS strstr.o" | |
| 51 | +test "$ac_cv_func_strstr" = yes || AC_LIBOBJ(strstr) | |
| 52 | ||
| 53 | AC_CACHE_CHECK(for remote shell, tar_cv_path_RSH, | |
| 54 | [if test -n "$RSH"; then | |
| 55 | --- tar-1.13.25/src/Makefile.am.orig Sun Sep 23 08:48:38 2001 | |
| 56 | +++ tar-1.13.25/src/Makefile.am Thu Apr 11 19:39:38 2002 | |
| 57 | @@ -39,5 +39,5 @@ | |
| 58 | # Also, link it before @INTTLIBS@, since unicodeio.c might invoke | |
| 59 | # locale_charset. Sigh. | |
| 60 | LDADD = ../lib/libtar.a @INTLLIBS@ ../lib/libtar.a | |
| 61 | -rmt_LDADD = $(LDADD) @rmt_LDADD@ | |
| 62 | -tar_LDADD = $(LDADD) @tar_LDADD@ | |
| 63 | +rmt_LDADD = $(LDADD) @rmtLDADD@ | |
| 64 | +tar_LDADD = $(LDADD) @tarLDADD@ |