Download as
Browse Code »

Commit f94aecce7adf45b5effd0e8283bff8076e15b714

Authored by Perry Werneck
2 parents ed4c42b1 b5df356c
Exists in develop

Merge branch 'develop' into macos

Showing 2 changed files with 18 additions and 21 deletions   Show diff stats
@@ -10,21 +10,20 @@ cd ${srcdir} @@ -10,21 +10,20 @@ cd ${srcdir}
10 mkdir -p ./scripts 10 mkdir -p ./scripts
11 mkdir -p m4 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 aclocal 28 aclocal
30 if test $? != 0 ; then 29 if test $? != 0 ; then
src/include/config.h.in
  Diff comments   View file @f94aecc
@@ -24,12 +24,12 @@ @@ -24,12 +24,12 @@
24 /* do we have malloc.h? */ 24 /* do we have malloc.h? */
25 #undef HAVE_MALLOC_H 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 /* Define to 1 if you have the <stdint.h> header file. */ 30 /* Define to 1 if you have the <stdint.h> header file. */
28 #undef HAVE_STDINT_H 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 /* Define to 1 if you have the <stdlib.h> header file. */ 33 /* Define to 1 if you have the <stdlib.h> header file. */
34 #undef HAVE_STDLIB_H 34 #undef HAVE_STDLIB_H
35 35
@@ -105,9 +105,7 @@ @@ -105,9 +105,7 @@
105 /* The schema path */ 105 /* The schema path */
106 #undef PRODUCT_PATH 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 #undef STDC_HEADERS 109 #undef STDC_HEADERS
112 110
113 /* Version number of package */ 111 /* Version number of package */