projects / packages / cvs-nserver.git / blame
| Commit | Line | Data |
|---|---|---|
| dbeb7d9d JB |
1 | diff -urN cvs-nserver-1.11.1.52.orig/configure.in cvs-nserver-1.11.1.52/configure.in |
| 2 | --- cvs-nserver-1.11.1.52.orig/configure.in Sun May 19 11:06:44 2002 | |
| 3 | +++ cvs-nserver-1.11.1.52/configure.in Sun May 19 11:10:49 2002 | |
| 4 | @@ -10,7 +10,6 @@ | |
| 5 | # initialize test framework | |
| 6 | AC_CONFIG_TESTDIR(tests) | |
| 7 | AC_CONFIG_FILES([tests/Makefile \ | |
| 8 | - tests/atconfig \ | |
| 9 | tests/package.m4 \ | |
| 10 | tests/cvs:tests/wrapsh.in], | |
| 11 | [chmod +x tests/cvs]) | |
| 12 | @@ -22,10 +21,7 @@ | |
| 13 | # their path, the installer can configure with a path that has GNU m4 | |
| 14 | # first and get that path embedded in the installed autoconf and | |
| 15 | # autoheader scripts. | |
| 16 | -AC_PROG_GNU_M4 | |
| 17 | -if test x"$ac_cv_prog_gnu_m4" != xyes; then | |
| 18 | - AC_MSG_ERROR([GNU m4 1.4 is required]) | |
| 19 | -fi | |
| 20 | +AC_CHECK_PROG(M4,m4) | |
| 21 | # This is needed because Automake does not seem to realize there is | |
| 22 | # a AC-SUBST inside AC-PROG-GNU-M4. Grmph! | |
| 23 | AC_SUBST(M4) | |
| 9680e81b AM |
24 | @@ -172,7 +172,7 @@ |
| 25 | ||
| 26 | AC_FUNC_FNMATCH | |
| 27 | if test "$ac_cv_func_fnmatch_works" = no; then | |
| 28 | - LIBOBJS="$LIBOBJS fnmatch.o" | |
| 29 | + AC_LIBOBJ([fnmatch]) | |
| 30 | fi | |
| 31 | ||
| 32 | # Try to find connect and gethostbyname. | |
| 33 | @@ -277,7 +277,7 @@ | |
| 34 | AC_DEFINE(ENCRYPTION) | |
| 35 | fi | |
| 36 | ||
| 37 | -AC_CHECK_FUNC(gethostname, :, LIBOBJS="$LIBOBJS hostname.o") | |
| 1e48b643 | 38 | +AC_CHECK_FUNC(gethostname, :, [AC_LIBOBJ([hostname])]) |
| 9680e81b AM |
39 | |
| 40 | # Check for options requesting client and server feature. If none are | |
| 41 | # given and we have connect(), we want the full client & server arrangement. | |
| 42 | @@ -361,7 +361,7 @@ | |
| 43 | [AC_TRY_COMPILE([], [return __CYGWIN32__;], | |
| 44 | ccvs_cv_sys_cygwin32=yes, ccvs_cv_sys_cygwin32=no)]) | |
| 45 | if test $ccvs_cv_sys_cygwin32 = yes; then | |
| 46 | - LIBOBJS="$LIBOBJS fncase.o" | |
| 47 | + AC_LIBOBJ([fncase]) | |
| 48 | LIBS="$LIBS -ladvapi32" | |
| 49 | ||
| 50 | dnl On Windows you can only change file times if you can write to | |
| dbeb7d9d JB |
51 | @@ -453,7 +453,6 @@ |
| 52 | lib/Makefile \ | |
| 53 | man/Makefile \ | |
| 54 | os2/Makefile \ | |
| 55 | - scripts/Makefile \ | |
| 56 | src/Makefile \ | |
| 57 | src/tests/Makefile \ | |
| 58 | tools/Makefile \ | |
| 9680e81b AM |
59 | diff -urN cvs-nserver-1.11.1.4.org/doc/Makefile.am cvs-nserver-1.11.1.4/doc/Makefile.am |
| 60 | --- cvs-nserver-1.11.1.4.org/doc/Makefile.am Sun May 19 11:06:44 2002 | |
| 61 | +++ cvs-nserver-1.11.1.4/doc/Makefile.am Sun May 19 11:13:13 2002 | |
| 62 | @@ -14,7 +14,7 @@ | |
| 63 | ||
| 64 | #DISTFILES = \ | |
| 65 | # .cvsignore \ | |
| 66 | -# RCSFILES \ | |
| 67 | +# RCSFILES | |
| 68 | ||
| 69 | # AUTOMAKE_OPTIONS = no-texinfo.tex | |
| 70 |