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
Don't use subdir libcharset if libiconv is used.
[gedcom-parse.git]
/
configure.in
diff --git
a/configure.in
b/configure.in
index ef83cc941d67fc0c6b647f2491e05fd77df46921..468a67ffa31c44ca2e4943d413fd31731e14785f 100644
(file)
--- a/
configure.in
+++ b/
configure.in
@@
-28,6
+28,8
@@
AM_INIT_AUTOMAKE(${NAME},${VERSION})
AM_CONFIG_HEADER(config.h)
ALL_LINGUAS="nl"
AM_CONFIG_HEADER(config.h)
ALL_LINGUAS="nl"
+AC_CANONICAL_HOST
+
dnl =============================================================
dnl Checks for programs.
AC_PROG_CC
dnl =============================================================
dnl Checks for programs.
AC_PROG_CC
@@
-48,7
+50,7
@@
fi
dnl =============================================================
dnl Checks for libraries.
dnl =============================================================
dnl Checks for libraries.
-AM_GNU_GETTEXT
+AM_GNU_GETTEXT
([use-libtool])
AM_WITH_DMALLOC
dnl == Make statically linked test program for dmalloc tests
AM_WITH_DMALLOC
dnl == Make statically linked test program for dmalloc tests
@@
-65,7
+67,10
@@
AC_TYPE_SIZE_T
dnl ==========================================================
dnl Checks for library functions.
dnl ==========================================================
dnl Checks for library functions.
-AC_CHECK_FUNCS(vsnprintf vsprintf)
+AC_CHECK_HEADERS(stddef.h stdlib.h string.h)
+AC_CHECK_FUNCS(setlocale vsnprintf vsprintf)
+jm_LANGINFO_CODESET
+jm_GLIBC21
dnl ==========================================================
dnl My local stuff
dnl ==========================================================
dnl My local stuff
@@
-106,7
+111,8
@@
README).
])
fi
])
fi
-AC_OUTPUT(Makefile
+AC_OUTPUT(GNUmakefile
+ Makefile
gedcom/Makefile
gedcom/calendar/Makefile
gom/Makefile
gedcom/Makefile
gedcom/calendar/Makefile
gom/Makefile
@@
-114,6
+120,7
@@
AC_OUTPUT(Makefile
iconv/glibc/Makefile
iconv/libiconv/Makefile
utf8/Makefile
iconv/glibc/Makefile
iconv/libiconv/Makefile
utf8/Makefile
+ utf8/libcharset/Makefile
t/Makefile
t/src/Makefile
t/input/Makefile
t/Makefile
t/src/Makefile
t/input/Makefile
@@
-121,6
+128,7
@@
AC_OUTPUT(Makefile
data/new.ged
doc/Makefile
doc/images/Makefile
data/new.ged
doc/Makefile
doc/images/Makefile
+ doc/index.html
include/Makefile
include/gedcom.h
intl/Makefile
include/Makefile
include/gedcom.h
intl/Makefile