File lukemftp-1.5.dif of Package lukemftp

Overview Repositories Revisions Requests Users Attributes Meta

File lukemftp-1.5.dif of Package lukemftp (Revision cfcc69037665c4d4e4526bfa3e147f26)

Currently displaying revision cfcc69037665c4d4e4526bfa3e147f26 , Show latest

--- configure.in
+++ configure.in
@@ -41,7 +41,7 @@
 AC_CHECK_LIB(util, fparseln)
 if test $opt_editcomplete = yes; then
 	AC_CHECK_LIB(tinfo, tgetent, ,
-	    AC_CHECK_LIB(termcap, tgetent, ,
+	    AC_CHECK_LIB(ncurses, tgetent, ,
 	    AC_CHECK_LIB(curses, tgetent, ,  
 	    AC_CHECK_LIB(ncurses, tgetent))))
 	AC_SEARCH_LIBS(el_init, edit, have_libedit=yes, have_libedit=no)
@@ -55,14 +55,29 @@
 AC_CONFIG_HEADER(config.h)
 AC_HEADER_DIRENT
 AC_HEADER_STDC
-AC_CHECK_HEADERS(err.h regex.h paths.h poll.h sys/poll.h termcap.h util.h vis.h)
+AC_CHECK_HEADERS(err.h regex.h paths.h poll.h sys/poll.h ncurses.h util.h vis.h)
 
 
 dnl Checks for typedefs, structures, and compiler characteristics.
 dnl
 AC_HEADER_TIME
 AC_TYPE_OFF_T
-AC_CHECK_SIZEOF(off_t, 0)
+dnl AC_CHECK_SIZEOF(off_t, 0)
+dnl Like above, but include <sys/types.h>
+AC_MSG_CHECKING(size of off_t)
+AC_CACHE_VAL(ac_cv_sizeof_off_t,
+[AC_TRY_RUN([#include <stdio.h>
+#include <sys/types.h>
+main()
+{
+  FILE *f=fopen("conftestval", "w");
+  if (!f) exit(1);
+  fprintf(f, "%d\n", sizeof(off_t));
+  exit(0);
+}], ac_cv_sizeof_off_t=`cat conftestval`, ac_cv_sizeof_off_t=0, ac_cv_sizeof_off_t=0)])dnl
+AC_MSG_RESULT($ac_cv_sizeof_off_t)
+AC_DEFINE_UNQUOTED(SIZEOF_OFF_T, $ac_cv_sizeof_off_t)
+dnl
 AC_MSG_TRY_LINK(for long long, ftp_cv_HAVE_LONG_LONG, [
 #include <sys/types.h>] , [
 long long X = 2, Y = 1, Z;
@@ -172,7 +187,7 @@
 	AC_MSG_RESULT(yes)
 else
 	AC_MSG_RESULT([no, using my own])
-	LIBOBJS="$LIBOBJS glob.o"
+	AC_LIBOBJ([glob])
 fi
 
 if test $have_long_long = yes -a $ac_cv_sizeof_off_t -ge 8; then
@@ -199,7 +214,7 @@
 			have_snprintf_lld=no
 		])
 		if test $have_snprintf_lld = no; then
-			LIBOBJS="$LIBOBJS snprintf.o"
+			AC_LIBOBJ([snprintf])
 		fi
 	else
 		AC_MSG_RESULT(using local version)
@@ -233,7 +248,7 @@
 if test $ac_cv_func_sl_init = yes; then
 	AC_MSG_TRY_COMPILE(if sl_add() returns int, ftp_cv_INT_SL_ADD, [
 	#include <stringlist.h> ], [ int f = sl_add((StringList *)0, "foo") ],
-	[:] , [LIBOBJS="$LIBOBJS sl_init.o"])
+	[:] , [AC_LIBOBJ([sl_init.o])])
 fi
 
 
@@ -249,7 +264,7 @@
 	AC_DEFINE(HAVE_RFC2553_NETDB, 1)
 else
 	if test $ac_cv_func_getaddrinfo = yes; then
-		LIBOBJS="$LIBOBJS getaddrinfo.o"
+		AC_LIBOBJ([getaddrinfo])
 	fi
 fi
 
@@ -263,7 +278,7 @@
 fi
 
 
-if test -n "$LIBOBJS"; then
+if test -n "$LIB@&t@OBJS"; then
 	INCLUDES="$INCLUDES -I\${srcdir}/../libukem"
 	LDFLAGS="$LDFLAGS -L../libukem"
 	LIBS="$LIBS -lukem"
--- src/Makefile.in
+++ src/Makefile.in
@@ -12,7 +12,7 @@
 mandir	= @mandir@
 transform = @program_transform_name@
 
-mandircat1 = ${mandir}/cat1
+mandirman1 = ${mandir}/man1
 
 CC	= @CC@
 CFLAGS	= -I${srcdir} -I${srcdir}/.. -I. -I.. @INCLUDES@ @CFLAGS@
@@ -28,10 +28,10 @@
 all:	${PROG}
 
 install: all
-	-mkdir -p ${bindir}
-	${INSTALL} -m 555 ${PROG} ${bindir}/`echo ${PROG}|sed '$(transform)'`
-	-mkdir -p ${mandircat1}
-	${INSTALL} -m 444 ${srcdir}/${PROG}.cat1 ${mandircat1}/`echo ${PROG}|sed '$(transform)'`.1
+	-mkdir -p ${DESTDIR}${bindir}
+	${INSTALL} -m 555 ${PROG} ${DESTDIR}${bindir}/`echo ${PROG}|sed '$(transform)'`
+	-mkdir -p ${DESTDIR}${mandirman1}
+	${INSTALL} -m 444 ${srcdir}/${PROG}.1 ${DESTDIR}${mandirman1}/`echo ${PROG}|sed '$(transform)'`.1
 
 ${PROG}: ${OBJS} @LIBDEPENDS@
 	${CC} ${CFLAGS} ${LDFLAGS} -o ${PROG} ${OBJS} ${LIBS}

Places

File lukemftp-1.5.dif of Package lukemftp (Revision cfcc69037665c4d4e4526bfa3e147f26)

Places