| 1 | --- a/configure.in |
| 2 | +++ b/configure.in |
| 3 | @@ -64,25 +64,14 @@ else |
| 4 | AC_MSG_RESULT(no) |
| 5 | fi |
| 6 | |
| 7 | -if test ! -f ../rpm.c |
| 8 | -then |
| 9 | - AC_MSG_CHECKING(for GNU xgettext) |
| 10 | - xgettext --version 2>&1 | grep 'GNU gettext' >/dev/null 2>&1 || AC_MSG_ERROR([ |
| 11 | - *** GNU gettext is required. The latest version |
| 12 | - *** is always available from ftp://ftp.gnu.org/gnu/gettext/.]) |
| 13 | - AC_MSG_RESULT(yes) |
| 14 | -fi |
| 15 | - |
| 16 | AC_CHECK_FUNCS(strerror mtrace getuid geteuid) |
| 17 | AC_CHECK_FUNC(setreuid, [], [ |
| 18 | AC_CHECK_LIB(ucb, setreuid, [if echo $LIBS | grep -- -lucb >/dev/null ;then :; else LIBS="$LIBS -lc -lucb" USEUCB=y;fi]) |
| 19 | ]) |
| 20 | |
| 21 | -AM_GNU_GETTEXT |
| 22 | - |
| 23 | POPT_SOURCE_PATH="`pwd`" |
| 24 | AC_DEFINE_UNQUOTED(POPT_SOURCE_PATH, "$POPT_SOURCE_PATH", |
| 25 | [Full path to popt top_sourcedir.]) |
| 26 | AC_SUBST(POPT_SOURCE_PATH) |
| 27 | |
| 28 | -AC_OUTPUT([Doxyfile Makefile intl/Makefile po/Makefile.in]) |
| 29 | +AC_OUTPUT([Doxyfile Makefile]) |
| 30 | --- a/Makefile.am |
| 31 | +++ b/Makefile.am |
| 32 | @@ -4,10 +4,9 @@ AUTOMAKE_OPTIONS = 1.4 foreign |
| 33 | |
| 34 | EXTRA_DIST = autogen.sh CHANGES $(man_MANS) popt.spec \ |
| 35 | testit.sh test-poptrc \ |
| 36 | - po/*.in po/*.po po/popt.pot \ |
| 37 | popt.ps |
| 38 | |
| 39 | -SUBDIRS = intl po |
| 40 | +SUBDIRS = |
| 41 | |
| 42 | INCLUDES = -I. -I$(top_srcdir) |
| 43 | |
| 44 | --- a/Makefile.in |
| 45 | +++ b/Makefile.in |
| 46 | @@ -124,7 +124,7 @@ EXTRA_DIST = autogen.sh CHANGES $(man_MA |
| 47 | popt.ps |
| 48 | |
| 49 | |
| 50 | -SUBDIRS = intl po |
| 51 | +SUBDIRS = |
| 52 | |
| 53 | INCLUDES = -I. -I$(top_srcdir) |
| 54 | |
| 55 | @@ -160,7 +160,7 @@ subdir = . |
| 56 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 |
| 57 | mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs |
| 58 | CONFIG_HEADER = config.h |
| 59 | -CONFIG_CLEAN_FILES = Doxyfile intl/Makefile |
| 60 | +CONFIG_CLEAN_FILES = Doxyfile |
| 61 | LTLIBRARIES = $(lib_LTLIBRARIES) |
| 62 | |
| 63 | libpopt_la_LDFLAGS = |
| 64 | @@ -261,8 +261,6 @@ distclean-hdr: |
| 65 | -rm -f config.h stamp-h1 |
| 66 | Doxyfile: $(top_builddir)/config.status Doxyfile.in |
| 67 | cd $(top_builddir) && $(SHELL) ./config.status $@ |
| 68 | -intl/Makefile: $(top_builddir)/config.status $(top_srcdir)/intl/Makefile.in |
| 69 | - cd $(top_builddir) && $(SHELL) ./config.status $@ |
| 70 | libLTLIBRARIES_INSTALL = $(INSTALL) |
| 71 | install-libLTLIBRARIES: $(lib_LTLIBRARIES) |
| 72 | @$(NORMAL_INSTALL) |
| 73 | @@ -584,7 +582,7 @@ distcleancheck_listfiles = find . -type |
| 74 | distdir: $(DISTFILES) |
| 75 | $(am__remove_distdir) |
| 76 | mkdir $(distdir) |
| 77 | - $(mkinstalldirs) $(distdir)/. $(distdir)/intl $(distdir)/po |
| 78 | + $(mkinstalldirs) $(distdir)/. |
| 79 | @list='$(DISTFILES)'; for file in $$list; do \ |
| 80 | if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ |
| 81 | dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ |
| 82 | |
