lobotomize gnulib

master
Ariadne Conill 2021-12-04 08:48:53 -06:00
parent 350cdd9827
commit 4ff5c696e9
5 changed files with 7 additions and 52 deletions

View File

@ -1,6 +1,6 @@
AUTOMAKE_OPTIONS = gnu no-dependencies AUTOMAKE_OPTIONS = gnu no-dependencies
SUBDIRS = doc lib m4 po src SUBDIRS = doc m4 po src
if USE_COLOR if USE_COLOR
SUBDIRS += syntax SUBDIRS += syntax

View File

@ -1,49 +1,4 @@
#!/bin/sh #!/bin/sh
# Generate configure & friends for GIT users. # Generate configure & friends for GIT users.
gnulib_url="git://git.sv.gnu.org/gnulib.git"
gnulib_hash="135414a7f543e4d40ad0a7cbd51885e159a6e0f4"
modules="
futimens
getdelim
getline
getopt-gnu
glob
isblank
iswblank
lstat
mkstemps
nl_langinfo
regex
sigaction
snprintf-posix
stdarg
strcase
strcasestr-simple
strnlen
sys_wait
vsnprintf-posix
wchar
wctype-h
wcwidth
"
# Make sure the local gnulib git repo is up-to-date.
if [ ! -d "gnulib" ]; then
git clone --depth=1111 ${gnulib_url}
fi
cd gnulib >/dev/null || exit 1
curr_hash=$(git log -1 --format=%H)
if [ "${gnulib_hash}" != "${curr_hash}" ]; then
git pull
git checkout -f ${gnulib_hash}
fi
cd .. >/dev/null || exit 1
rm -rf lib
./gnulib/gnulib-tool \
--import \
${modules}
autoreconf -f -i -s autoreconf -f -i -s

View File

@ -38,8 +38,6 @@ dnl Checks for programs.
AC_USE_SYSTEM_EXTENSIONS AC_USE_SYSTEM_EXTENSIONS
AC_PROG_CC AC_PROG_CC
gl_EARLY
gl_INIT
AC_PROG_LN_S AC_PROG_LN_S
AC_SEARCH_LIBS([strerror], [cposix]) AC_SEARCH_LIBS([strerror], [cposix])
AC_SYS_LARGEFILE AC_SYS_LARGEFILE
@ -551,7 +549,6 @@ AC_CONFIG_FILES([
Makefile Makefile
doc/Makefile doc/Makefile
doc/sample.nanorc doc/sample.nanorc
lib/Makefile
m4/Makefile m4/Makefile
po/Makefile.in po/Makefile.in
src/Makefile src/Makefile

View File

@ -1,5 +1,4 @@
AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\" -DSYSCONFDIR=\"$(sysconfdir)\" \ AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\" -DSYSCONFDIR=\"$(sysconfdir)\"
-I$(top_builddir)/lib -I$(top_srcdir)/lib
CLEANFILES = revision.h CLEANFILES = revision.h
@ -41,7 +40,7 @@ nano_SOURCES = \
utils.c \ utils.c \
winio.c winio.c
nano_LDADD = @LIBINTL@ $(top_builddir)/lib/libgnu.a \ nano_LDADD = @LIBINTL@ \
$(LIB_CLOCK_GETTIME) $(LIBTHREAD) $(LIB_CLOCK_GETTIME) $(LIBTHREAD)
install-exec-hook: install-exec-hook:

View File

@ -28,6 +28,10 @@
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
#ifndef REG_STARTEND
#define REG_STARTEND (0)
#endif
/* Return the user's home directory. We use $HOME, and if that fails, /* Return the user's home directory. We use $HOME, and if that fails,
* we fall back on the home directory of the effective user ID. */ * we fall back on the home directory of the effective user ID. */
void get_homedir(void) void get_homedir(void)