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
Only link in libcharset when libiconv is not used.
[gedcom-parse.git]
/
configure.in
diff --git
a/configure.in
b/configure.in
index 2b11a74829fc7caa72496d727b087db4a853dff2..cf0506748b1e802468cc88fdb111cb49eddf6c36 100644
(file)
--- a/
configure.in
+++ b/
configure.in
@@
-50,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
@@
-90,10
+90,16
@@
fi
AC_MSG_CHECKING(for location of iconv)
if test "$am_cv_lib_iconv" = yes; then
AC_MSG_RESULT(libiconv)
AC_MSG_CHECKING(for location of iconv)
if test "$am_cv_lib_iconv" = yes; then
AC_MSG_RESULT(libiconv)
-
AC
_LIBICONV_HAS_ANSEL
+
gedcom
_LIBICONV_HAS_ANSEL
else
AC_MSG_RESULT(libc)
else
AC_MSG_RESULT(libc)
- AC_GLIBC_ICONV
+ LCS_SUBDIRS=libcharset
+ LCS_INCLUDES='-I $(srcdir)/libcharset'
+ LCS_LIBADD=libcharset/libcharset.la
+ AC_SUBST(LCS_SUBDIRS)
+ AC_SUBST(LCS_INCLUDES)
+ AC_SUBST(LCS_LIBADD)
+ gedcom_GLIBC_ICONV
if test "$is_glibc_iconv" = yes; then
DIRS="glibc"
is_ansel_supported=yes
if test "$is_glibc_iconv" = yes; then
DIRS="glibc"
is_ansel_supported=yes
@@
-111,8
+117,8
@@
README).
])
fi
])
fi
-AC_OUTPUT(
M
akefile
- README
+AC_OUTPUT(
GNUm
akefile
+ Makefile
gedcom/Makefile
gedcom/calendar/Makefile
gom/Makefile
gedcom/Makefile
gedcom/calendar/Makefile
gom/Makefile