dlugolecki.net.pl
Dziennik
Polecane
Software
projects
/
gedcom-parse.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Put common code in gom_internal.h
[gedcom-parse.git]
/
configure.in
diff --git
a/configure.in
b/configure.in
index be4c412f68e2b88d3bd919a18f7473cf52790e0c..b13d759b2e1e94f80358b479b1d214078e297e48 100644
(file)
--- a/
configure.in
+++ b/
configure.in
@@
-30,6
+30,13
@@
ALL_LINGUAS="nl"
AC_CANONICAL_HOST
AC_CANONICAL_HOST
+EXTRA_CFLAGS=
+case "$host_os" in
+ darwin*) AC_MSG_WARN([Disabling smart preprocessing])
+ EXTRA_CFLAGS="-no-cpp-precomp";;
+esac
+AC_SUBST(EXTRA_CFLAGS)
+
dnl =============================================================
dnl Checks for programs.
AC_PROG_CC
dnl =============================================================
dnl Checks for programs.
AC_PROG_CC
@@
-50,20
+57,14
@@
fi
dnl =============================================================
dnl Checks for libraries.
dnl =============================================================
dnl Checks for libraries.
-AM_GNU_GETTEXT([use-libtool])
-AM_WITH_DMALLOC
-
-dnl == Make statically linked test program for dmalloc tests
-if test "$with_dmalloc" = "yes"; then
- EXTRA_PROGS=gomtest_static
-fi
-AC_SUBST(EXTRA_PROGS)
+AM_GNU_GETTEXT([use-libtool],[need-ngettext])
dnl =============================================================
dnl Checks for typedefs, structures, and compiler characteristics.
AC_C_CONST
AC_C_INLINE
AC_TYPE_SIZE_T
dnl =============================================================
dnl Checks for typedefs, structures, and compiler characteristics.
AC_C_CONST
AC_C_INLINE
AC_TYPE_SIZE_T
+AC_CHECK_SIZEOF(void *, 4)
dnl ==========================================================
dnl Checks for library functions.
dnl ==========================================================
dnl Checks for library functions.
@@
-75,14
+76,15
@@
jm_GLIBC21
dnl ==========================================================
dnl My local stuff
dnl ==========================================================
dnl My local stuff
+gedcom_SYS_NEWLINE
AM_ICONV
AM_ICONV
-
-if test "$am_cv_func_iconv" != yes; then
+gedcom_SANE_ICONV
+if test "$am_cv_func_iconv" != yes
-o "$is_iconv_sane" != yes
; then
AC_MSG_ERROR([
*******************************************************************************
AC_MSG_ERROR([
*******************************************************************************
-You need 'iconv'
to use this library, consider installing GNU libiconv or
-use --with-libiconv-prefix to point to an existing installation of that
-library (see README)
+You need 'iconv'
(with features comparable to what is in glibc 2.2) to use this
+library, consider installing GNU libiconv or use --with-libiconv-prefix to
+
point to an existing installation of that
library (see README)
*******************************************************************************
])
fi
*******************************************************************************
])
fi
@@
-99,8
+101,8
@@
else
AC_SUBST(LCS_SUBDIRS)
AC_SUBST(LCS_INCLUDES)
AC_SUBST(LCS_LIBADD)
AC_SUBST(LCS_SUBDIRS)
AC_SUBST(LCS_INCLUDES)
AC_SUBST(LCS_LIBADD)
- gedcom_GLIBC_ICONV
- if test "$is_glibc_iconv" = yes; then
+ gedcom_GLIBC
22
_ICONV
+ if test "$is_glibc
22
_iconv" = yes; then
DIRS="glibc"
is_ansel_supported=yes
AC_SUBST(DIRS)
DIRS="glibc"
is_ansel_supported=yes
AC_SUBST(DIRS)
@@
-139,4
+141,5
@@
AC_OUTPUT(GNUmakefile
include/Makefile
include/gedcom.h
intl/Makefile
include/Makefile
include/gedcom.h
intl/Makefile
- po/Makefile.in)
+ po/Makefile.in
+ m4/Makefile)