Changing autogen.sh for use in macos according to https://github.com/PerryWernec…

…k/pw3270/issues/63#issuecomment-1979258212

Changing autogen.sh for use in macos according to https://github.com/PerryWernec…
…k/pw3270/issues/63#issuecomment-1979258212
Perry Werneck
1 parent 2a635216
Showing 2 changed files with 18 additions and 21 deletions Show diff stats
autogen.sh
src/include/config.h.in
@@ -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
@@ -24,12 +24,12 @@
 /* do we have malloc.h? */
 #undef HAVE_MALLOC_H
  
+/* Define to 1 if you have the <memory.h> header file. */
+#undef HAVE_MEMORY_H
+
 /* Define to 1 if you have the <stdint.h> header file. */
 #undef HAVE_STDINT_H
  
-/* Define to 1 if you have the <stdio.h> header file. */
-#undef HAVE_STDIO_H
-
 /* Define to 1 if you have the <stdlib.h> 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 */
...	...	@@ -10,21 +10,20 @@ cd ${srcdir}
10	10	mkdir -p ./scripts
11	11	mkdir -p m4
12	12
13		-case `uname` in
14		-Darwin*)
15		- glibtoolize --force
16		- if test $? != 0 ; then
17		- echo "glibtoolize failed."
18		- exit -1
19		- fi
20		- ;;
21		-*)
22		- libtoolize --force
23		- if test $? != 0 ; then
24		- echo "libtoolize failed."
25		- exit -1
26		- fi
27		-esac
	13	+LIBTOOLIZE=$(which libtoolize)
	14	+if [ -z ${LIBTOOLIZE} ]; then
	15	+ LIBTOOLIZE=$(which glibtoolize)
	16	+fi
	17	+if [ -z ${LIBTOOLIZE} ]; then
	18	+ echo "Can't find libtoolize"
	19	+ exit -1
	20	+fi
	21	+
	22	+${LIBTOOLIZE} --force
	23	+if test $? != 0 ; then
	24	+ echo "libtoolize failed."
	25	+ exit -1
	26	+fi
28	27
29	28	aclocal
30	29	if test $? != 0 ; then
...	...
...	...	@@ -24,12 +24,12 @@
24	24	/* do we have malloc.h? */
25	25	#undef HAVE_MALLOC_H
26	26
	27	+/* Define to 1 if you have the <memory.h> header file. */
	28	+#undef HAVE_MEMORY_H
	29	+
27	30	/* Define to 1 if you have the <stdint.h> header file. */
28	31	#undef HAVE_STDINT_H
29	32
30		-/* Define to 1 if you have the <stdio.h> header file. */
31		-#undef HAVE_STDIO_H
32		-
33	33	/* Define to 1 if you have the <stdlib.h> header file. */
34	34	#undef HAVE_STDLIB_H
35	35
...	...	@@ -105,9 +105,7 @@
105	105	/* The schema path */
106	106	#undef PRODUCT_PATH
107	107
108		-/* Define to 1 if all of the C90 standard headers exist (not just the ones
109		- required in a freestanding environment). This macro is provided for
110		- backward compatibility; new code need not use it. */
	108	+/* Define to 1 if you have the ANSI C header files. */
111	109	#undef STDC_HEADERS
112	110
113	111	/* Version number of package */
...	...