diff options
| author | Panu Matilainen <pmatilai@redhat.com> | 2007-06-06 12:50:56 +0300 |
|---|---|---|
| committer | Panu Matilainen <pmatilai@redhat.com> | 2007-06-06 12:50:56 +0300 |
| commit | 98d634bc7f5b438b9707c78194cc548ccfce12b7 (patch) | |
| tree | 9e4b2108199ac89dba57833d1b6e2d49e41d2199 | |
| parent | c7f7ebe61c1593049bc80651ce4db7fbbfb9a828 (diff) | |
| download | librpm-tizen-98d634bc7f5b438b9707c78194cc548ccfce12b7.tar.gz librpm-tizen-98d634bc7f5b438b9707c78194cc548ccfce12b7.tar.bz2 librpm-tizen-98d634bc7f5b438b9707c78194cc548ccfce12b7.zip | |
Make peace with auto*foo.
- Remove checks for internal zlib
- Don't try to auto*foo'ize nonexistent zlib, sqlite subdirs. Db3 subdir
isn't auto*-enabled
- Set AM_GNU_GETTEXT_VERSION to make auto"#ยค"# to realize we're using gettext
- Don't stomp into auto*** namespace with LUA_SPLINT stuff (from JBJ)
| -rw-r--r-- | configure.ac | 15 | ||||
| -rw-r--r-- | lua/Makefile.am | 6 |
2 files changed, 5 insertions, 16 deletions
diff --git a/configure.ac b/configure.ac index 45d66eb3b..b6a0c6cdf 100644 --- a/configure.ac +++ b/configure.ac @@ -281,17 +281,6 @@ addlib() { WITH_ZLIB_SUBDIR= WITH_ZLIB_INCLUDE= WITH_ZLIB_LIB= -if test -d zlib ; then - WITH_ZLIB_SUBDIR=zlib - addlib \${top_builddir}/zlib - WITH_ZLIB_INCLUDE="-I\${top_srcdir}/${WITH_ZLIB_SUBDIR}" - INCPATH="$INCPATH -I\${top_srcdir}/${WITH_ZLIB_SUBDIR}" - WITH_ZLIB_LIB="\${top_builddir}/${WITH_ZLIB_SUBDIR}/libz.la" - AC_DEFINE(HAVE_GZSEEK, 1, [Define as 1 if your zlib has gzseek()]) -fi -AC_SUBST(WITH_ZLIB_SUBDIR) -AC_SUBST(WITH_ZLIB_INCLUDE) -AC_SUBST(WITH_ZLIB_LIB) if test -z "${WITH_ZLIB_LIB}" ; then for zlib in z gz ; do @@ -624,7 +613,7 @@ dnl AmigaOS and IXEmul have a fork() dummy ;; esac -AM_GNU_GETTEXT +AM_GNU_GETTEXT_VERSION([0.11.2]) AM_GNU_GETTEXT([external]) dnl Checks for header files we can live without. @@ -1343,7 +1332,7 @@ dnl XXX this causes popt to depend on zlib et al dnl # XXX Propagate -lucb to popt ... dnl export LIBS INCPATH CONFIG_SITE -AC_CONFIG_SUBDIRS(popt zlib file sqlite db3) +AC_CONFIG_SUBDIRS(popt file) AC_CONFIG_FILES([ Doxyfile Makefile rpmrc macros platform rpmpopt rpm.spec rpmio/Makefile rpmdb/Makefile lib/Makefile build/Makefile diff --git a/lua/Makefile.am b/lua/Makefile.am index 26e7d69a3..72ffba878 100644 --- a/lua/Makefile.am +++ b/lua/Makefile.am @@ -88,7 +88,7 @@ local/linit.lch: local/linit.lua # local/linit.c \ # lib/lstrlib.c \ # -LUA_SPLINT_SOURCES = \ +LUA_SPLINT_SRCS = \ lua/lua.c \ include/lauxlib.h \ include/lua.h \ @@ -146,9 +146,9 @@ LUA_SPLINT_SOURCES = \ .PHONY: sources sources: - @echo $(LUA_SPLINT_SOURCES:%=lua/%) + @echo $(LUA_SPLINT_SRCS:%=lua/%) .PHONY: lint lint: - $(LINT) $(DEFS) $(INCLUDES) $(LUA_SPLINT_SOURCES) + $(LINT) $(DEFS) $(INCLUDES) $(LUA_SPLINT_SRCS) |