From 3d70bc099db343c37f5f75cd093a755062afccfa Mon Sep 17 00:00:00 2001 From: Perry Werneck Date: Tue, 5 Mar 2024 17:00:05 -0300 Subject: [PATCH] Changing autogen.sh for use in macos according to https://github.com/PerryWerneck/pw3270/issues/63#issuecomment-1979258212 --- autogen.sh | 29 ++++++++++++++--------------- src/include/config.h.in | 10 ++++------ 2 files changed, 18 insertions(+), 21 deletions(-) diff --git a/autogen.sh b/autogen.sh index b0a2299..316fc82 100755 --- a/autogen.sh +++ b/autogen.sh @@ -10,21 +10,20 @@ cd ${srcdir} mkdir -p ./scripts mkdir -p m4 -case `uname` in -Darwin*) - glibtoolize --force - if test $? != 0 ; then - echo "glibtoolize failed." - exit -1 - fi - ;; -*) - libtoolize --force - if test $? != 0 ; then - echo "libtoolize failed." - exit -1 - fi -esac +LIBTOOLIZE=$(which libtoolize) +if [ -z ${LIBTOOLIZE} ]; then + LIBTOOLIZE=$(which glibtoolize) +fi +if [ -z ${LIBTOOLIZE} ]; then + echo "Can't find libtoolize" + exit -1 +fi + +${LIBTOOLIZE} --force +if test $? != 0 ; then + echo "libtoolize failed." + exit -1 +fi aclocal if test $? != 0 ; then diff --git a/src/include/config.h.in b/src/include/config.h.in index 955a717..6234a28 100644 --- a/src/include/config.h.in +++ b/src/include/config.h.in @@ -24,12 +24,12 @@ /* do we have malloc.h? */ #undef HAVE_MALLOC_H +/* Define to 1 if you have the header file. */ +#undef HAVE_MEMORY_H + /* Define to 1 if you have the header file. */ #undef HAVE_STDINT_H -/* Define to 1 if you have the header file. */ -#undef HAVE_STDIO_H - /* Define to 1 if you have the header file. */ #undef HAVE_STDLIB_H @@ -105,9 +105,7 @@ /* The schema path */ #undef PRODUCT_PATH -/* Define to 1 if all of the C90 standard headers exist (not just the ones - required in a freestanding environment). This macro is provided for - backward compatibility; new code need not use it. */ +/* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS /* Version number of package */ -- libgit2 0.21.2