|
 |
04356f |
diff -ru bas-2.6.orig/configure.in bas-2.6/configure.in
|
|
|
04356f |
--- bas-2.6.orig/configure.in 2020-07-26 20:41:00.000000000 +0000
|
|
|
04356f |
+++ bas-2.6/configure.in 2021-08-13 23:00:26.683776300 +0000
|
|
|
04356f |
@@ -23,7 +23,7 @@
|
|
|
04356f |
EXTRA_LDFLAGS='-Wl,-z '
|
|
|
04356f |
;;
|
|
|
04356f |
*-cygwin)
|
|
|
04356f |
- AC_DEFINE(USE_SELECT)
|
|
|
04356f |
+ AC_DEFINE([USE_SELECT], [], [Description])
|
|
|
04356f |
;;
|
|
|
04356f |
*)
|
|
|
04356f |
prefix=$ac_default_prefix
|
|
|
04356f |
@@ -78,15 +78,13 @@
|
|
|
04356f |
AC_CHECK_HEADERS(curses.h,have_curses_h=yes)
|
|
|
04356f |
fi
|
|
|
04356f |
|
|
|
04356f |
-AC_MSG_CHECKING(for tputs return type)
|
|
|
04356f |
-AC_TRY_COMPILE([#ifdef HAVE_TERMCAP_H
|
|
|
04356f |
-#include <termcap.h>
|
|
|
04356f |
-#else
|
|
|
04356f |
-#include <curses.h>
|
|
|
04356f |
-#endif
|
|
|
04356f |
-static int outc(int c){ return c; }
|
|
|
04356f |
-],[return tputs((char*)0,0,outc);
|
|
|
04356f |
-],AC_MSG_RESULT(int),AC_DEFINE(TPUTS_RETURNS_VOID) AC_MSG_RESULT(void))
|
|
|
04356f |
+if test "$have_curses_h" != yes; then
|
|
|
04356f |
+ AC_CHECK_HEADERS(ncurses.h,have_ncurses_h=yes)
|
|
|
04356f |
+fi
|
|
|
04356f |
+
|
|
|
04356f |
+if test "$have_ncurses_term_h" != yes; then
|
|
|
04356f |
+ AC_CHECK_HEADERS(ncurses/term.h,have_ncurses_term_h=yes)
|
|
|
04356f |
+fi
|
|
|
04356f |
|
|
|
04356f |
AC_CHECK_HEADERS(tgmath.h,have_tgmath_h=yes)
|
|
|
04356f |
|
|
|
04356f |
@@ -112,6 +110,9 @@
|
|
|
04356f |
if test "$have_tgetent" != yes; then
|
|
|
04356f |
AC_CHECK_LIB(ncurses, tgetent, AC_DEFINE(HAVE_TGETENT) [have_tgetent=yes; LIBS="-lncurses $LIBS"])
|
|
|
04356f |
fi
|
|
|
04356f |
+if test "$have_tgetent" != yes; then
|
|
|
04356f |
+ AC_CHECK_LIB(tinfo, tgetent, AC_DEFINE(HAVE_TGETENT) [have_tgetent=yes; LIBS="-ltinfo $LIBS"])
|
|
|
04356f |
+fi
|
|
|
04356f |
|
|
|
04356f |
AC_CHECK_TYPES([ssize_t])
|
|
|
04356f |
|
|
|
04356f |
@@ -120,7 +121,7 @@
|
|
|
04356f |
[CPPFLAGS="$CPPFLAGS -I$with_dmalloc/include"
|
|
|
04356f |
LDFLAGS="$LDFLAGS -L$with_dmalloc/lib"
|
|
|
04356f |
LIBS="$LIBS -ldmalloc"
|
|
|
04356f |
- AC_DEFINE(USE_DMALLOC)]
|
|
|
04356f |
+ AC_DEFINE([USE_DMALLOC], [], [Description])]
|
|
|
04356f |
)
|
|
|
04356f |
|
|
|
04356f |
AC_ARG_WITH(efence,
|
|
|
04356f |
@@ -143,7 +144,7 @@
|
|
|
04356f |
AC_CHECK_HEADERS(libintl.h,[LIBINTL=yes])
|
|
|
04356f |
if test "$LIBINTL" = yes
|
|
|
04356f |
then
|
|
|
04356f |
- AC_SEARCH_LIBS(gettext,intl,[AC_DEFINE(HAVE_GETTEXT) USE_NLS=yes])
|
|
|
04356f |
+ AC_SEARCH_LIBS(gettext,intl,[AC_DEFINE([HAVE_GETTEXT], [], [Description]) USE_NLS=yes])
|
|
|
04356f |
fi
|
|
|
04356f |
fi
|
|
|
04356f |
|
|
|
04356f |
@@ -151,8 +152,6 @@
|
|
|
04356f |
|
|
|
04356f |
AC_PROG_INSTALL
|
|
|
04356f |
|
|
|
04356f |
-AC_DEFINE_UNQUOTED(VERSION,"$VERSION")
|
|
|
04356f |
-AC_SUBST(VERSION)
|
|
|
04356f |
AC_SUBST(UPDATED)
|
|
|
04356f |
AC_SUBST(USE_NLS)
|
|
|
04356f |
AC_OUTPUT(Makefile bas.1 test/runbas)
|
|
|
04356f |
--- bas-2.6.orig/Makefile.in 2019-11-30 10:56:25.000000000 +0000
|
|
|
04356f |
+++ bas-2.6/Makefile.in 2021-08-13 23:17:24.406426500 +0000
|
|
|
04356f |
@@ -18,8 +18,8 @@
|
|
|
04356f |
all-po-no:
|
|
|
04356f |
all-po-yes: $(CATALOGS)
|
|
|
04356f |
|
|
|
04356f |
-bas: main.o libbas.a getopt.o getopt1.o
|
|
|
04356f |
- $(CC) -o $@ $(LDFLAGS) main.o libbas.a getopt.o getopt1.o $(LIBS)
|
|
|
04356f |
+bas: main.o libbas.a
|
|
|
04356f |
+ $(CC) -o $@ $(LDFLAGS) main.o libbas.a $(LIBS)
|
|
|
04356f |
|
|
|
04356f |
test60: test60.o libbas.a
|
|
|
04356f |
$(CC) -o $@ $(LDFLAGS) test60.o libbas.a $(LIBS)
|
|
|
04356f |
@@ -30,7 +30,7 @@
|
|
|
04356f |
libbas.a: auto.o bas.o fs.o global.o token.o program.o \
|
|
|
04356f |
str.o value.o var.o
|
|
|
04356f |
rm -f $@
|
|
|
04356f |
- ar cq $@ auto.o bas.o fs.o global.o token.o program.o \
|
|
|
04356f |
+ $(AR) cq $@ auto.o bas.o fs.o global.o token.o program.o \
|
|
|
04356f |
str.o value.o var.o
|
|
|
04356f |
@RANLIB@ libbas.a
|
|
|
04356f |
|
|
|
04356f |
@@ -41,7 +41,7 @@
|
|
|
04356f |
install-po-no:
|
|
|
04356f |
install-po-yes: $(CATALOGS)
|
|
|
04356f |
for cat in $(CATALOGS); do \
|
|
|
04356f |
- dir=$(localedir)/`basename $$cat .mo`/LC_MESSAGES; \
|
|
|
04356f |
+ dir=$(DESTDIR)/$(localedir)/`basename $$cat .mo`/LC_MESSAGES; \
|
|
|
04356f |
[ -d $$dir ] || @INSTALL@ -m 755 -d $$dir; \
|
|
|
04356f |
@INSTALL@ -m 644 $$cat $$dir/bas.mo; \
|
|
|
04356f |
done
|
|
|
04356f |
@@ -50,14 +50,14 @@
|
|
|
04356f |
for i in test/test*; do ./$$i || break; done
|
|
|
04356f |
|
|
|
04356f |
install: all
|
|
|
04356f |
- @INSTALL@ -m 755 -d @bindir@
|
|
|
04356f |
- @INSTALL@ bas @bindir@/bas
|
|
|
04356f |
- @INSTALL@ -m 755 -d @libdir@
|
|
|
04356f |
- @INSTALL@ -m 644 libbas.a @libdir@/libbas.a
|
|
|
04356f |
- @RANLIB@ @libdir@/libbas.a
|
|
|
04356f |
- @INSTALL@ -m 755 -d @mandir@/man1
|
|
|
04356f |
- @INSTALL@ -m 644 bas.1 @mandir@/man1/bas.1
|
|
|
04356f |
- make install-po
|
|
|
04356f |
+ @INSTALL@ -m 755 -d $(DESTDIR)/@bindir@
|
|
|
04356f |
+ @INSTALL@ bas $(DESTDIR)/@bindir@/bas
|
|
|
04356f |
+ @INSTALL@ -m 755 -d $(DESTDIR)/@libdir@
|
|
|
04356f |
+ @INSTALL@ -m 644 libbas.a $(DESTDIR)/@libdir@/libbas.a
|
|
|
04356f |
+ @RANLIB@ $(DESTDIR)/@libdir@/libbas.a
|
|
|
04356f |
+ @INSTALL@ -m 755 -d $(DESTDIR)/@mandir@/man1
|
|
|
04356f |
+ @INSTALL@ -m 644 bas.1 $(DESTDIR)/@mandir@/man1/bas.1
|
|
|
04356f |
+ $(MAKE) install-po
|
|
|
04356f |
|
|
|
04356f |
.c.o:
|
|
|
04356f |
$(CC) -c $(CPPFLAGS) $(CFLAGS) $<
|