Changeset 1713


Ignore:
Timestamp:
2000-11-29T11:30:14+13:00 (23 years ago)
Author:
jrm21
Message:

Tidied up YAZ Makefiles and Makefiles.ins

Location:
trunk/gsdl/packages/yaz
Files:
1 deleted
16 edited

Legend:

Unmodified
Added
Removed
  • trunk/gsdl/packages/yaz/Makefile.in

    r1531 r1713  
    1111# PARTICULAR PURPOSE.
    1212
     13#######
     14# Modified for the NZDL Greenstone project. The original is still in
     15# Makefile.am, for processing with automake.
     16#######
    1317
    1418SHELL = @SHELL@
     
    4145top_builddir = .
    4246
    43 ACLOCAL = @ACLOCAL@
    44 AUTOCONF = @AUTOCONF@
    45 AUTOMAKE = @AUTOMAKE@
    46 AUTOHEADER = @AUTOHEADER@
    47 
    48 INSTALL = @INSTALL@
    49 INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
    50 INSTALL_DATA = @INSTALL_DATA@
    51 INSTALL_SCRIPT = @INSTALL_SCRIPT@
    52 transform = @program_transform_name@
    53 
    54 NORMAL_INSTALL = :
    55 PRE_INSTALL = :
    56 POST_INSTALL = :
    57 NORMAL_UNINSTALL = :
    58 PRE_UNINSTALL = :
    59 POST_UNINSTALL = :
    6047ASNMODULE = @ASNMODULE@
    6148CC = @CC@
     
    7259have_sgml2txt = @have_sgml2txt@
    7360
    74 AUTOMAKE_OPTIONS = foreign
    75 
    7661DIST_SUBDIRS = util odr z39.50 asn ill zutil comstack ccl tab retrieval server lib include client ztest doc
    7762
    7863SUBDIRS = @SUBDIRS_VAR@
    7964
    80 noinst_SCRIPTS = yaz-config
    8165SPEC_FILE = $(PACKAGE).spec
    8266EXTRA_DIST = $(SPEC_FILE) README LICENSE CHANGELOG TODO windows.txt
    8367ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
    8468mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
    85 CONFIG_CLEAN_FILES =
    86 SCRIPTS =  $(noinst_SCRIPTS)
     69CONFIG_CLEAN_FILES = config.status config.cache config.log
    8770
    8871DIST_COMMON =  Makefile.am Makefile.in TODO aclocal.m4 configure \
     
    9275DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
    9376
    94 TAR = tar
    95 GZIP_ENV = --best
    96 all: all-redirect
    9777
    98 # DON'T WANT IT AUTOMATICALLY REGENERATING ITSELF!!!
     78
     79all: all-recursive
     80# make install should not do anything for greenstone (I hope...)
     81install:
     82clean: clean-recursive
     83distclean: distclean-recursive
     84    -rm -f Makefile $(CONFIG_CLEAN_FILES)
     85
     86
     87# Don't want Makefile.in automatically re-generated from Makefile.am...
     88#
    9989# .SUFFIXES:
    10090# $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
     
    120110# (2) otherwise, pass the desired values on the `make' command line.
    121111
    122 @SET_MAKE@
     112# @SET_MAKE@
    123113
    124 all-recursive install-data-recursive install-exec-recursive \
    125 installdirs-recursive install-recursive uninstall-recursive  \
    126 check-recursive installcheck-recursive info-recursive dvi-recursive:
    127     @set fnord $(MAKEFLAGS); amf=$$2; \
    128     dot_seen=no; \
     114clean-recursive all-recursive:
     115    set fnord $(MAKEFLAGS); amf=$$2; \
    129116    target=`echo $@ | sed s/-recursive//`; \
    130117    list='$(SUBDIRS)'; for subdir in $$list; do \
    131       echo "Making $$target in $$subdir"; \
    132       if test "$$subdir" = "."; then \
    133         dot_seen=yes; \
    134         local_target="$$target-am"; \
    135       else \
    136         local_target="$$target"; \
    137       fi; \
    138       (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
     118      (cd $$subdir && $(MAKE) $$target) \
    139119       || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
    140     done; \
    141     if test "$$dot_seen" = "no"; then \
    142       $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
    143     fi; test -z "$$fail"
     120    done;
     121#     echo "Making $$target in $$subdir";
    144122
    145 mostlyclean-recursive clean-recursive distclean-recursive \
    146 maintainer-clean-recursive:
    147     @set fnord $(MAKEFLAGS); amf=$$2; \
    148     dot_seen=no; \
    149     rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
    150       rev="$$subdir $$rev"; \
    151       test "$$subdir" = "." && dot_seen=yes; \
    152     done; \
    153     test "$$dot_seen" = "no" && rev=". $$rev"; \
    154     target=`echo $@ | sed s/-recursive//`; \
    155     for subdir in $$rev; do \
    156       echo "Making $$target in $$subdir"; \
    157       if test "$$subdir" = "."; then \
    158         local_target="$$target-am"; \
    159       else \
    160         local_target="$$target"; \
    161       fi; \
    162       (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
    163        || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
    164     done && test -z "$$fail"
    165 tags-recursive:
    166     list='$(SUBDIRS)'; for subdir in $$list; do \
    167       test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
    168     done
    169 
    170 tags: TAGS
    171 
    172 ID: $(HEADERS) $(SOURCES) $(LISP)
    173     list='$(SOURCES) $(HEADERS)'; \
    174     unique=`for i in $$list; do echo $$i; done | \
    175       awk '    { files[$$0] = 1; } \
    176            END { for (i in files) print i; }'`; \
    177     here=`pwd` && cd $(srcdir) \
    178       && mkid -f$$here/ID $$unique $(LISP)
    179 
    180 TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
    181     tags=; \
    182     here=`pwd`; \
    183     list='$(SUBDIRS)'; for subdir in $$list; do \
    184    if test "$$subdir" = .; then :; else \
    185         test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
    186    fi; \
    187     done; \
    188     list='$(SOURCES) $(HEADERS)'; \
    189     unique=`for i in $$list; do echo $$i; done | \
    190       awk '    { files[$$0] = 1; } \
    191            END { for (i in files) print i; }'`; \
    192     test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
    193       || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
    194 
    195 mostlyclean-tags:
    196 
    197 clean-tags:
    198 
    199 distclean-tags:
    200     -rm -f TAGS ID
    201 
    202 maintainer-clean-tags:
     123distclean-recursive:
     124    for subdir in $(SUBDIRS); do \
     125    (cd $$subdir && test -e Makefile && $(MAKE) distclean); done
    203126
    204127distdir = $(PACKAGE)-$(VERSION)
    205128top_distdir = $(distdir)
    206129
    207 # This target untars the dist file and tries a VPATH configuration.  Then
    208 # it guarantees that the distribution is self-contained by making another
    209 # tarfile.
    210 distcheck: dist
    211     -rm -rf $(distdir)
    212     GZIP=$(GZIP_ENV) $(TAR) zxf $(distdir).tar.gz
    213     mkdir $(distdir)/=build
    214     mkdir $(distdir)/=inst
    215     dc_install_base=`cd $(distdir)/=inst && pwd`; \
    216     cd $(distdir)/=build \
    217       && ../configure --srcdir=.. --prefix=$$dc_install_base \
    218       && $(MAKE) $(AM_MAKEFLAGS) \
    219       && $(MAKE) $(AM_MAKEFLAGS) dvi \
    220       && $(MAKE) $(AM_MAKEFLAGS) check \
    221       && $(MAKE) $(AM_MAKEFLAGS) install \
    222       && $(MAKE) $(AM_MAKEFLAGS) installcheck \
    223       && $(MAKE) $(AM_MAKEFLAGS) dist
    224     -rm -rf $(distdir)
    225     @banner="$(distdir).tar.gz is ready for distribution"; \
    226     dashes=`echo "$$banner" | sed s/./=/g`; \
    227     echo "$$dashes"; \
    228     echo "$$banner"; \
    229     echo "$$dashes"
    230 dist: distdir
    231     -chmod -R a+r $(distdir)
    232     GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
    233     -rm -rf $(distdir)
    234 dist-all: distdir
    235     -chmod -R a+r $(distdir)
    236     GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
    237     -rm -rf $(distdir)
    238 distdir: $(DISTFILES)
    239     -rm -rf $(distdir)
    240     mkdir $(distdir)
    241     -chmod 777 $(distdir)
    242     @for file in $(DISTFILES); do \
    243       d=$(srcdir); \
    244       if test -d $$d/$$file; then \
    245         cp -pr $$/$$file $(distdir)/$$file; \
    246       else \
    247         test -f $(distdir)/$$file \
    248         || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
    249         || cp -p $$d/$$file $(distdir)/$$file || :; \
    250       fi; \
    251     done
    252     for subdir in $(DIST_SUBDIRS); do \
    253       if test "$$subdir" = .; then :; else \
    254         test -d $(distdir)/$$subdir \
    255         || mkdir $(distdir)/$$subdir \
    256         || exit 1; \
    257         chmod 777 $(distdir)/$$subdir; \
    258         (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(distdir) distdir=../$(distdir)/$$subdir distdir) \
    259           || exit 1; \
    260       fi; \
    261     done
    262     $(MAKE) $(AM_MAKEFLAGS) top_distdir="$(top_distdir)" distdir="$(distdir)" dist-hook
    263 info-am:
    264 info: info-recursive
    265 dvi-am:
    266 dvi: dvi-recursive
    267 check-am: all-am
    268 check: check-recursive
    269 installcheck-am:
    270 installcheck: installcheck-recursive
    271 install-exec-am:
    272 install-exec: install-exec-recursive
    273130
    274 install-data-am:
    275 install-data: install-data-recursive
    276 
    277 install-am: all-am
    278     @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
    279 install: install-recursive
    280 uninstall-am:
    281 uninstall: uninstall-recursive
    282 all-am: Makefile $(SCRIPTS)
    283 all-redirect: all-recursive
    284 install-strip:
    285     $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
    286 installdirs: installdirs-recursive
    287 installdirs-am:
    288 
    289 
    290 mostlyclean-generic:
    291 
    292 clean-generic:
    293 
    294 distclean-generic:
    295     -rm -f Makefile $(CONFIG_CLEAN_FILES)
    296     -rm -f config.cache config.log stamp-h stamp-h[0-9]*
    297 
    298 maintainer-clean-generic:
    299 mostlyclean-am:  mostlyclean-tags mostlyclean-generic
    300 
    301 mostlyclean: mostlyclean-recursive
    302 
    303 clean-am:  clean-tags clean-generic mostlyclean-am
    304 
    305 clean: clean-recursive
    306 
    307 distclean-am:  distclean-tags distclean-generic clean-am
    308 
    309 distclean: distclean-recursive
    310     -rm -f config.status
    311 
    312 maintainer-clean-am:  maintainer-clean-tags maintainer-clean-generic \
    313         distclean-am
    314     @echo "This command is intended for maintainers to use;"
    315     @echo "it deletes files that may require special tools to rebuild."
    316 
    317 maintainer-clean: maintainer-clean-recursive
    318     -rm -f config.status
    319 
    320 .PHONY: install-data-recursive uninstall-data-recursive \
    321 install-exec-recursive uninstall-exec-recursive installdirs-recursive \
    322 uninstalldirs-recursive all-recursive check-recursive \
    323 installcheck-recursive info-recursive dvi-recursive \
    324 mostlyclean-recursive distclean-recursive clean-recursive \
    325 maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
    326 distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
    327 dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
    328 install-exec install-data-am install-data install-am install \
    329 uninstall-am uninstall all-redirect all-am all installdirs-am \
    330 installdirs mostlyclean-generic distclean-generic clean-generic \
    331 maintainer-clean-generic clean mostlyclean distclean maintainer-clean
    332 
     131.PHONY: all install clean distclean \
     132    all-recursive distclean-recursive clean-recursive  \
     133    distdir top_distdir yaz-config dist-hook rpm
    333134
    334135yaz-config:
  • trunk/gsdl/packages/yaz/asn/Makefile.in

    r1343 r1713  
    108108.SUFFIXES:
    109109.SUFFIXES: .S .c .o .s
    110 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
    111     cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps asn/Makefile
     110##$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
     111##  cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps asn/Makefile
    112112
    113113Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
  • trunk/gsdl/packages/yaz/ccl/Makefile.in

    r1516 r1713  
    117117.SUFFIXES:
    118118.SUFFIXES: .S .c .o .s
    119 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
    120     cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps ccl/Makefile
     119##$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
     120##  cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps ccl/Makefile
    121121
    122122Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
  • trunk/gsdl/packages/yaz/comstack/Makefile.in

    r1516 r1713  
    106106.SUFFIXES:
    107107.SUFFIXES: .S .c .o .s
    108 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
    109     cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps comstack/Makefile
     108##$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
     109##  cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps comstack/Makefile
    110110
    111111Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
  • trunk/gsdl/packages/yaz/configure

    r1531 r1713  
    528528
    529529
    530 ac_aux_dir=
    531 for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
    532   if test -f $ac_dir/install-sh; then
    533     ac_aux_dir=$ac_dir
    534     ac_install_sh="$ac_aux_dir/install-sh -c"
    535     break
    536   elif test -f $ac_dir/install.sh; then
    537     ac_aux_dir=$ac_dir
    538     ac_install_sh="$ac_aux_dir/install.sh -c"
    539     break
    540   fi
    541 done
    542 if test -z "$ac_aux_dir"; then
    543   { echo "configure: error: can not find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." 1>&2; exit 1; }
    544 fi
    545 ac_config_guess=$ac_aux_dir/config.guess
    546 ac_config_sub=$ac_aux_dir/config.sub
    547 ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
    548 
    549 # Find a good install program.  We prefer a C program (faster),
    550 # so one script is as good as another.  But avoid the broken or
    551 # incompatible versions:
    552 # SysV /etc/install, /usr/sbin/install
    553 # SunOS /usr/etc/install
    554 # IRIX /sbin/install
    555 # AIX /bin/install
    556 # AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
    557 # AFS /usr/afsws/bin/install, which mishandles nonexistent args
    558 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
    559 # ./install, which can be erroneously created by make from ./install.sh.
    560 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
    561 echo "configure:562: checking for a BSD compatible install" >&5
    562 if test -z "$INSTALL"; then
    563 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
    564   echo $ac_n "(cached) $ac_c" 1>&6
    565 else
    566     IFS="${IFS=     }"; ac_save_IFS="$IFS"; IFS=":"
    567   for ac_dir in $PATH; do
    568     # Account for people who put trailing slashes in PATH elements.
    569     case "$ac_dir/" in
    570     /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
    571     *)
    572       # OSF1 and SCO ODT 3.0 have their own names for install.
    573       # Don't use installbsd from OSF since it installs stuff as root
    574       # by default.
    575       for ac_prog in ginstall scoinst install; do
    576         if test -f $ac_dir/$ac_prog; then
    577       if test $ac_prog = install &&
    578             grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
    579         # AIX install.  It has an incompatible calling convention.
    580         :
    581       else
    582         ac_cv_path_install="$ac_dir/$ac_prog -c"
    583         break 2
    584       fi
    585     fi
    586       done
    587       ;;
    588     esac
    589   done
    590   IFS="$ac_save_IFS"
    591 
    592 fi
    593   if test "${ac_cv_path_install+set}" = set; then
    594     INSTALL="$ac_cv_path_install"
    595   else
    596     # As a last resort, use the slow shell script.  We don't cache a
    597     # path for INSTALL within a source directory, because that will
    598     # break other packages using the cache if that directory is
    599     # removed, or if the path is relative.
    600     INSTALL="$ac_install_sh"
    601   fi
    602 fi
    603 echo "$ac_t""$INSTALL" 1>&6
    604 
    605 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
    606 # It thinks the first close brace ends the variable substitution.
    607 test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
    608 
    609 test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
    610 
    611 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
    612 
    613 echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
    614 echo "configure:615: checking whether build environment is sane" >&5
    615 # Just in case
    616 sleep 1
    617 echo timestamp > conftestfile
    618 # Do `set' in a subshell so we don't clobber the current shell's
    619 # arguments.  Must try -L first in case configure is actually a
    620 # symlink; some systems play weird games with the mod time of symlinks
    621 # (eg FreeBSD returns the mod time of the symlink's containing
    622 # directory).
    623 if (
    624    set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
    625    if test "$*" = "X"; then
    626       # -L didn't work.
    627       set X `ls -t $srcdir/configure conftestfile`
    628    fi
    629    if test "$*" != "X $srcdir/configure conftestfile" \
    630       && test "$*" != "X conftestfile $srcdir/configure"; then
    631 
    632       # If neither matched, then we have a broken ls.  This can happen
    633       # if, for instance, CONFIG_SHELL is bash and it inherits a
    634       # broken ls alias from the environment.  This has actually
    635       # happened.  Such a system could not be considered "sane".
    636       { echo "configure: error: ls -t appears to fail.  Make sure there is not a broken
    637 alias in your environment" 1>&2; exit 1; }
    638    fi
    639 
    640    test "$2" = conftestfile
    641    )
    642 then
    643    # Ok.
    644    :
    645 else
    646    { echo "configure: error: newly created file is older than distributed files!
    647 Check your system clock" 1>&2; exit 1; }
    648 fi
    649 rm -f conftest*
    650 echo "$ac_t""yes" 1>&6
    651 if test "$program_transform_name" = s,x,x,; then
    652   program_transform_name=
    653 else
    654   # Double any \ or $.  echo might interpret backslashes.
    655   cat <<\EOF_SED > conftestsed
    656 s,\\,\\\\,g; s,\$,$$,g
    657 EOF_SED
    658   program_transform_name="`echo $program_transform_name|sed -f conftestsed`"
    659   rm -f conftestsed
    660 fi
    661 test "$program_prefix" != NONE &&
    662   program_transform_name="s,^,${program_prefix},; $program_transform_name"
    663 # Use a double $ so make ignores it.
    664 test "$program_suffix" != NONE &&
    665   program_transform_name="s,\$\$,${program_suffix},; $program_transform_name"
    666 
    667 # sed with no file args requires a program.
    668 test "$program_transform_name" = "" && program_transform_name="s,x,x,"
    669 
    670 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
    671 echo "configure:672: checking whether ${MAKE-make} sets \${MAKE}" >&5
    672 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
    673 if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
    674   echo $ac_n "(cached) $ac_c" 1>&6
    675 else
    676   cat > conftestmake <<\EOF
    677 all:
    678     @echo 'ac_maketemp="${MAKE}"'
    679 EOF
    680 # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
    681 eval `${MAKE-make} -f conftestmake 2>/dev/null | grep temp=`
    682 if test -n "$ac_maketemp"; then
    683   eval ac_cv_prog_make_${ac_make}_set=yes
    684 else
    685   eval ac_cv_prog_make_${ac_make}_set=no
    686 fi
    687 rm -f conftestmake
    688 fi
    689 if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
    690   echo "$ac_t""yes" 1>&6
    691   SET_MAKE=
    692 else
    693   echo "$ac_t""no" 1>&6
    694   SET_MAKE="MAKE=${MAKE-make}"
    695 fi
    696 
    697 
    698 PACKAGE=yaz
    699 
    700 VERSION=1.6
    701 
    702 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
    703   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
    704 fi
    705 cat >> confdefs.h <<EOF
    706 #define PACKAGE "$PACKAGE"
    707 EOF
    708 
    709 cat >> confdefs.h <<EOF
    710 #define VERSION "$VERSION"
    711 EOF
    712 
    713 
    714 
    715 missing_dir=`cd $ac_aux_dir && pwd`
    716 echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
    717 echo "configure:718: checking for working aclocal" >&5
    718 # Run test in a subshell; some versions of sh will print an error if
    719 # an executable is not found, even if stderr is redirected.
    720 # Redirect stdin to placate older versions of autoconf.  Sigh.
    721 if (aclocal --version) < /dev/null > /dev/null 2>&1; then
    722    ACLOCAL=aclocal
    723    echo "$ac_t""found" 1>&6
    724 else
    725    ACLOCAL="$missing_dir/missing aclocal"
    726    echo "$ac_t""missing" 1>&6
    727 fi
    728 
    729 echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
    730 echo "configure:731: checking for working autoconf" >&5
    731 # Run test in a subshell; some versions of sh will print an error if
    732 # an executable is not found, even if stderr is redirected.
    733 # Redirect stdin to placate older versions of autoconf.  Sigh.
    734 if (autoconf --version) < /dev/null > /dev/null 2>&1; then
    735    AUTOCONF=autoconf
    736    echo "$ac_t""found" 1>&6
    737 else
    738    AUTOCONF="$missing_dir/missing autoconf"
    739    echo "$ac_t""missing" 1>&6
    740 fi
    741 
    742 echo $ac_n "checking for working automake""... $ac_c" 1>&6
    743 echo "configure:744: checking for working automake" >&5
    744 # Run test in a subshell; some versions of sh will print an error if
    745 # an executable is not found, even if stderr is redirected.
    746 # Redirect stdin to placate older versions of autoconf.  Sigh.
    747 if (automake --version) < /dev/null > /dev/null 2>&1; then
    748    AUTOMAKE=automake
    749    echo "$ac_t""found" 1>&6
    750 else
    751    AUTOMAKE="$missing_dir/missing automake"
    752    echo "$ac_t""missing" 1>&6
    753 fi
    754 
    755 echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
    756 echo "configure:757: checking for working autoheader" >&5
    757 # Run test in a subshell; some versions of sh will print an error if
    758 # an executable is not found, even if stderr is redirected.
    759 # Redirect stdin to placate older versions of autoconf.  Sigh.
    760 if (autoheader --version) < /dev/null > /dev/null 2>&1; then
    761    AUTOHEADER=autoheader
    762    echo "$ac_t""found" 1>&6
    763 else
    764    AUTOHEADER="$missing_dir/missing autoheader"
    765    echo "$ac_t""missing" 1>&6
    766 fi
    767 
    768 echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
    769 echo "configure:770: checking for working makeinfo" >&5
    770 # Run test in a subshell; some versions of sh will print an error if
    771 # an executable is not found, even if stderr is redirected.
    772 # Redirect stdin to placate older versions of autoconf.  Sigh.
    773 if (makeinfo --version) < /dev/null > /dev/null 2>&1; then
    774    MAKEINFO=makeinfo
    775    echo "$ac_t""found" 1>&6
    776 else
    777    MAKEINFO="$missing_dir/missing makeinfo"
    778    echo "$ac_t""missing" 1>&6
    779 fi
    780 
    781 
    782530# Extract the first word of "gcc", so it can be a program name with args.
    783531set dummy gcc; ac_word=$2
    784532echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
    785 echo "configure:786: checking for $ac_word" >&5
     533echo "configure:534: checking for $ac_word" >&5
    786534if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
    787535  echo $ac_n "(cached) $ac_c" 1>&6
     
    813561set dummy cc; ac_word=$2
    814562echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
    815 echo "configure:816: checking for $ac_word" >&5
     563echo "configure:564: checking for $ac_word" >&5
    816564if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
    817565  echo $ac_n "(cached) $ac_c" 1>&6
     
    864612set dummy cl; ac_word=$2
    865613echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
    866 echo "configure:867: checking for $ac_word" >&5
     614echo "configure:615: checking for $ac_word" >&5
    867615if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
    868616  echo $ac_n "(cached) $ac_c" 1>&6
     
    896644
    897645echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
    898 echo "configure:899: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
     646echo "configure:647: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
    899647
    900648ac_ext=c
     
    907655cat > conftest.$ac_ext << EOF
    908656
    909 #line 910 "configure"
     657#line 658 "configure"
    910658#include "confdefs.h"
    911659
    912660main(){return(0);}
    913661EOF
    914 if { (eval echo configure:915: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     662if { (eval echo configure:663: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    915663  ac_cv_prog_cc_works=yes
    916664  # If we can't run a trivial program, we are probably using a cross compiler.
     
    938686fi
    939687echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
    940 echo "configure:941: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
     688echo "configure:689: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
    941689echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
    942690cross_compiling=$ac_cv_prog_cc_cross
    943691
    944692echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
    945 echo "configure:946: checking whether we are using GNU C" >&5
     693echo "configure:694: checking whether we are using GNU C" >&5
    946694if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
    947695  echo $ac_n "(cached) $ac_c" 1>&6
     
    952700#endif
    953701EOF
    954 if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:955: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
     702if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:703: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
    955703  ac_cv_prog_gcc=yes
    956704else
     
    971719CFLAGS=
    972720echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
    973 echo "configure:974: checking whether ${CC-cc} accepts -g" >&5
     721echo "configure:722: checking whether ${CC-cc} accepts -g" >&5
    974722if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
    975723  echo $ac_n "(cached) $ac_c" 1>&6
     
    1003751
    1004752echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
    1005 echo "configure:1006: checking how to run the C preprocessor" >&5
     753echo "configure:754: checking how to run the C preprocessor" >&5
    1006754# On Suns, sometimes $CPP names a directory.
    1007755if test -n "$CPP" && test -d "$CPP"; then
     
    1018766  # not just through cpp.
    1019767  cat > conftest.$ac_ext <<EOF
    1020 #line 1021 "configure"
     768#line 769 "configure"
    1021769#include "confdefs.h"
    1022770#include <assert.h>
     
    1024772EOF
    1025773ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
    1026 { (eval echo configure:1027: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
     774{ (eval echo configure:775: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
    1027775ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
    1028776if test -z "$ac_err"; then
     
    1035783  CPP="${CC-cc} -E -traditional-cpp"
    1036784  cat > conftest.$ac_ext <<EOF
    1037 #line 1038 "configure"
     785#line 786 "configure"
    1038786#include "confdefs.h"
    1039787#include <assert.h>
     
    1041789EOF
    1042790ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
    1043 { (eval echo configure:1044: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
     791{ (eval echo configure:792: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
    1044792ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
    1045793if test -z "$ac_err"; then
     
    1052800  CPP="${CC-cc} -nologo -E"
    1053801  cat > conftest.$ac_ext <<EOF
    1054 #line 1055 "configure"
     802#line 803 "configure"
    1055803#include "confdefs.h"
    1056804#include <assert.h>
     
    1058806EOF
    1059807ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
    1060 { (eval echo configure:1061: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
     808{ (eval echo configure:809: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
    1061809ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
    1062810if test -z "$ac_err"; then
     
    1082830echo "$ac_t""$CPP" 1>&6
    1083831
    1084 # Find a good install program.  We prefer a C program (faster),
    1085 # so one script is as good as another.  But avoid the broken or
    1086 # incompatible versions:
    1087 # SysV /etc/install, /usr/sbin/install
    1088 # SunOS /usr/etc/install
    1089 # IRIX /sbin/install
    1090 # AIX /bin/install
    1091 # AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
    1092 # AFS /usr/afsws/bin/install, which mishandles nonexistent args
    1093 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
    1094 # ./install, which can be erroneously created by make from ./install.sh.
    1095 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
    1096 echo "configure:1097: checking for a BSD compatible install" >&5
    1097 if test -z "$INSTALL"; then
    1098 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
    1099   echo $ac_n "(cached) $ac_c" 1>&6
    1100 else
    1101     IFS="${IFS=     }"; ac_save_IFS="$IFS"; IFS=":"
    1102   for ac_dir in $PATH; do
    1103     # Account for people who put trailing slashes in PATH elements.
    1104     case "$ac_dir/" in
    1105     /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
    1106     *)
    1107       # OSF1 and SCO ODT 3.0 have their own names for install.
    1108       # Don't use installbsd from OSF since it installs stuff as root
    1109       # by default.
    1110       for ac_prog in ginstall scoinst install; do
    1111         if test -f $ac_dir/$ac_prog; then
    1112       if test $ac_prog = install &&
    1113             grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
    1114         # AIX install.  It has an incompatible calling convention.
    1115         :
    1116       else
    1117         ac_cv_path_install="$ac_dir/$ac_prog -c"
    1118         break 2
    1119       fi
    1120     fi
    1121       done
    1122       ;;
    1123     esac
    1124   done
    1125   IFS="$ac_save_IFS"
    1126 
    1127 fi
    1128   if test "${ac_cv_path_install+set}" = set; then
    1129     INSTALL="$ac_cv_path_install"
    1130   else
    1131     # As a last resort, use the slow shell script.  We don't cache a
    1132     # path for INSTALL within a source directory, because that will
    1133     # break other packages using the cache if that directory is
    1134     # removed, or if the path is relative.
    1135     INSTALL="$ac_install_sh"
    1136   fi
    1137 fi
    1138 echo "$ac_t""$INSTALL" 1>&6
    1139 
    1140 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
    1141 # It thinks the first close brace ends the variable substitution.
    1142 test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
    1143 
    1144 test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
    1145 
    1146 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
    1147 
    1148832# Extract the first word of "ranlib", so it can be a program name with args.
    1149833set dummy ranlib; ac_word=$2
    1150834echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
    1151 echo "configure:1152: checking for $ac_word" >&5
     835echo "configure:836: checking for $ac_word" >&5
    1152836if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
    1153837  echo $ac_n "(cached) $ac_c" 1>&6
     
    1181865set dummy $ac_prog; ac_word=$2
    1182866echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
    1183 echo "configure:1184: checking for $ac_word" >&5
     867echo "configure:868: checking for $ac_word" >&5
    1184868if eval "test \"`echo '$''{'ac_cv_prog_have_sgml2txt'+set}'`\" = set"; then
    1185869  echo $ac_n "(cached) $ac_c" 1>&6
     
    1216900set dummy $ac_prog; ac_word=$2
    1217901echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
    1218 echo "configure:1219: checking for $ac_word" >&5
     902echo "configure:903: checking for $ac_word" >&5
    1219903if eval "test \"`echo '$''{'ac_cv_prog_have_sgml2latex'+set}'`\" = set"; then
    1220904  echo $ac_n "(cached) $ac_c" 1>&6
     
    1251935set dummy $ac_prog; ac_word=$2
    1252936echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
    1253 echo "configure:1254: checking for $ac_word" >&5
     937echo "configure:938: checking for $ac_word" >&5
    1254938if eval "test \"`echo '$''{'ac_cv_prog_have_sgml2html'+set}'`\" = set"; then
    1255939  echo $ac_n "(cached) $ac_c" 1>&6
     
    1312996checkBoth=0
    1313997echo $ac_n "checking for connect""... $ac_c" 1>&6
    1314 echo "configure:1315: checking for connect" >&5
     998echo "configure:999: checking for connect" >&5
    1315999if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then
    13161000  echo $ac_n "(cached) $ac_c" 1>&6
    13171001else
    13181002  cat > conftest.$ac_ext <<EOF
    1319 #line 1320 "configure"
     1003#line 1004 "configure"
    13201004#include "confdefs.h"
    13211005/* System header to define __stub macros and hopefully few prototypes,
     
    13401024; return 0; }
    13411025EOF
    1342 if { (eval echo configure:1343: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     1026if { (eval echo configure:1027: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    13431027  rm -rf conftest*
    13441028  eval "ac_cv_func_connect=yes"
     
    13611045if test "$ac_cv_func_connect" = "no"; then
    13621046    echo $ac_n "checking for main in -lsocket""... $ac_c" 1>&6
    1363 echo "configure:1364: checking for main in -lsocket" >&5
     1047echo "configure:1048: checking for main in -lsocket" >&5
    13641048ac_lib_var=`echo socket'_'main | sed 'y%./+-%__p_%'`
    13651049if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
     
    13691053LIBS="-lsocket  $LIBS"
    13701054cat > conftest.$ac_ext <<EOF
    1371 #line 1372 "configure"
     1055#line 1056 "configure"
    13721056#include "confdefs.h"
    13731057
     
    13761060; return 0; }
    13771061EOF
    1378 if { (eval echo configure:1379: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     1062if { (eval echo configure:1063: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    13791063  rm -rf conftest*
    13801064  eval "ac_cv_lib_$ac_lib_var=yes"
     
    14021086    LIBS="$LIBS -lsocket -lnsl"
    14031087    echo $ac_n "checking for accept""... $ac_c" 1>&6
    1404 echo "configure:1405: checking for accept" >&5
     1088echo "configure:1089: checking for accept" >&5
    14051089if eval "test \"`echo '$''{'ac_cv_func_accept'+set}'`\" = set"; then
    14061090  echo $ac_n "(cached) $ac_c" 1>&6
    14071091else
    14081092  cat > conftest.$ac_ext <<EOF
    1409 #line 1410 "configure"
     1093#line 1094 "configure"
    14101094#include "confdefs.h"
    14111095/* System header to define __stub macros and hopefully few prototypes,
     
    14301114; return 0; }
    14311115EOF
    1432 if { (eval echo configure:1433: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     1116if { (eval echo configure:1117: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    14331117  rm -rf conftest*
    14341118  eval "ac_cv_func_accept=yes"
     
    14521136fi
    14531137echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
    1454 echo "configure:1455: checking for gethostbyname" >&5
     1138echo "configure:1139: checking for gethostbyname" >&5
    14551139if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then
    14561140  echo $ac_n "(cached) $ac_c" 1>&6
    14571141else
    14581142  cat > conftest.$ac_ext <<EOF
    1459 #line 1460 "configure"
     1143#line 1144 "configure"
    14601144#include "confdefs.h"
    14611145/* System header to define __stub macros and hopefully few prototypes,
     
    14801164; return 0; }
    14811165EOF
    1482 if { (eval echo configure:1483: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     1166if { (eval echo configure:1167: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    14831167  rm -rf conftest*
    14841168  eval "ac_cv_func_gethostbyname=yes"
     
    14981182  echo "$ac_t""no" 1>&6
    14991183echo $ac_n "checking for main in -lnsl""... $ac_c" 1>&6
    1500 echo "configure:1501: checking for main in -lnsl" >&5
     1184echo "configure:1185: checking for main in -lnsl" >&5
    15011185ac_lib_var=`echo nsl'_'main | sed 'y%./+-%__p_%'`
    15021186if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
     
    15061190LIBS="-lnsl  $LIBS"
    15071191cat > conftest.$ac_ext <<EOF
    1508 #line 1509 "configure"
     1192#line 1193 "configure"
    15091193#include "confdefs.h"
    15101194
     
    15131197; return 0; }
    15141198EOF
    1515 if { (eval echo configure:1516: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     1199if { (eval echo configure:1200: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    15161200  rm -rf conftest*
    15171201  eval "ac_cv_lib_$ac_lib_var=yes"
     
    15361220
    15371221echo $ac_n "checking for readline in -lreadline""... $ac_c" 1>&6
    1538 echo "configure:1539: checking for readline in -lreadline" >&5
     1222echo "configure:1223: checking for readline in -lreadline" >&5
    15391223ac_lib_var=`echo readline'_'readline | sed 'y%./+-%__p_%'`
    15401224if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
     
    15441228LIBS="-lreadline  $LIBS"
    15451229cat > conftest.$ac_ext <<EOF
    1546 #line 1547 "configure"
     1230#line 1231 "configure"
    15471231#include "confdefs.h"
    15481232/* Override any gcc2 internal prototype to avoid an error.  */
     
    15551239; return 0; }
    15561240EOF
    1557 if { (eval echo configure:1558: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     1241if { (eval echo configure:1242: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    15581242  rm -rf conftest*
    15591243  eval "ac_cv_lib_$ac_lib_var=yes"
     
    15771261if test "$ac_cv_lib_readline_readline" = "no"; then
    15781262    echo $ac_n "checking for readline in -lreadline""... $ac_c" 1>&6
    1579 echo "configure:1580: checking for readline in -lreadline" >&5
     1263echo "configure:1264: checking for readline in -lreadline" >&5
    15801264ac_lib_var=`echo readline'_'readline | sed 'y%./+-%__p_%'`
    15811265if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
     
    15851269LIBS="-lreadline  $LIBS"
    15861270cat > conftest.$ac_ext <<EOF
    1587 #line 1588 "configure"
     1271#line 1272 "configure"
    15881272#include "confdefs.h"
    15891273/* Override any gcc2 internal prototype to avoid an error.  */
     
    15961280; return 0; }
    15971281EOF
    1598 if { (eval echo configure:1599: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     1282if { (eval echo configure:1283: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    15991283  rm -rf conftest*
    16001284  eval "ac_cv_lib_$ac_lib_var=yes"
     
    16181302fi
    16191303echo $ac_n "checking for add_history in -lhistory""... $ac_c" 1>&6
    1620 echo "configure:1621: checking for add_history in -lhistory" >&5
     1304echo "configure:1305: checking for add_history in -lhistory" >&5
    16211305ac_lib_var=`echo history'_'add_history | sed 'y%./+-%__p_%'`
    16221306if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
     
    16261310LIBS="-lhistory  $LIBS"
    16271311cat > conftest.$ac_ext <<EOF
    1628 #line 1629 "configure"
     1312#line 1313 "configure"
    16291313#include "confdefs.h"
    16301314/* Override any gcc2 internal prototype to avoid an error.  */
     
    16371321; return 0; }
    16381322EOF
    1639 if { (eval echo configure:1640: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     1323if { (eval echo configure:1324: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    16401324  rm -rf conftest*
    16411325  eval "ac_cv_lib_$ac_lib_var=yes"
     
    16621346ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
    16631347echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
    1664 echo "configure:1665: checking for $ac_hdr" >&5
     1348echo "configure:1349: checking for $ac_hdr" >&5
    16651349if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    16661350  echo $ac_n "(cached) $ac_c" 1>&6
    16671351else
    16681352  cat > conftest.$ac_ext <<EOF
    1669 #line 1670 "configure"
     1353#line 1354 "configure"
    16701354#include "confdefs.h"
    16711355#include <$ac_hdr>
    16721356EOF
    16731357ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
    1674 { (eval echo configure:1675: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
     1358{ (eval echo configure:1359: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
    16751359ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
    16761360if test -z "$ac_err"; then
     
    17071391if test "$enable_tcpd" = "yes"; then
    17081392    echo $ac_n "checking for working tcpd.h""... $ac_c" 1>&6
    1709 echo "configure:1710: checking for working tcpd.h" >&5
     1393echo "configure:1394: checking for working tcpd.h" >&5
    17101394    oldLibs=$LIBS
    17111395    LIBS="$LIBS -lwrap -lnsl"
    17121396    cat > conftest.$ac_ext <<EOF
    1713 #line 1714 "configure"
     1397#line 1398 "configure"
    17141398#include "confdefs.h"
    17151399#include <syslog.h>
     
    17221406; return 0; }
    17231407EOF
    1724 if { (eval echo configure:1725: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     1408if { (eval echo configure:1409: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    17251409  rm -rf conftest*
    17261410  tcpd_ok=1
     
    17441428fi
    17451429echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
    1746 echo "configure:1747: checking for ANSI C header files" >&5
     1430echo "configure:1431: checking for ANSI C header files" >&5
    17471431if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
    17481432  echo $ac_n "(cached) $ac_c" 1>&6
    17491433else
    17501434  cat > conftest.$ac_ext <<EOF
    1751 #line 1752 "configure"
     1435#line 1436 "configure"
    17521436#include "confdefs.h"
    17531437#include <stdlib.h>
     
    17571441EOF
    17581442ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
    1759 { (eval echo configure:1760: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
     1443{ (eval echo configure:1444: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
    17601444ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
    17611445if test -z "$ac_err"; then
     
    17741458  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
    17751459cat > conftest.$ac_ext <<EOF
    1776 #line 1777 "configure"
     1460#line 1461 "configure"
    17771461#include "confdefs.h"
    17781462#include <string.h>
     
    17921476  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
    17931477cat > conftest.$ac_ext <<EOF
    1794 #line 1795 "configure"
     1478#line 1479 "configure"
    17951479#include "confdefs.h"
    17961480#include <stdlib.h>
     
    18131497else
    18141498  cat > conftest.$ac_ext <<EOF
    1815 #line 1816 "configure"
     1499#line 1500 "configure"
    18161500#include "confdefs.h"
    18171501#include <ctype.h>
     
    18241508
    18251509EOF
    1826 if { (eval echo configure:1827: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
     1510if { (eval echo configure:1511: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
    18271511then
    18281512  :
     
    18611545ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
    18621546echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
    1863 echo "configure:1864: checking for $ac_hdr" >&5
     1547echo "configure:1548: checking for $ac_hdr" >&5
    18641548if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    18651549  echo $ac_n "(cached) $ac_c" 1>&6
    18661550else
    18671551  cat > conftest.$ac_ext <<EOF
    1868 #line 1869 "configure"
     1552#line 1553 "configure"
    18691553#include "confdefs.h"
    18701554#include <$ac_hdr>
    18711555EOF
    18721556ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
    1873 { (eval echo configure:1874: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
     1557{ (eval echo configure:1558: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
    18741558ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
    18751559if test -z "$ac_err"; then
     
    18981582
    18991583    echo $ac_n "checking for pthread_mutex_lock""... $ac_c" 1>&6
    1900 echo "configure:1901: checking for pthread_mutex_lock" >&5
     1584echo "configure:1585: checking for pthread_mutex_lock" >&5
    19011585if eval "test \"`echo '$''{'ac_cv_func_pthread_mutex_lock'+set}'`\" = set"; then
    19021586  echo $ac_n "(cached) $ac_c" 1>&6
    19031587else
    19041588  cat > conftest.$ac_ext <<EOF
    1905 #line 1906 "configure"
     1589#line 1590 "configure"
    19061590#include "confdefs.h"
    19071591/* System header to define __stub macros and hopefully few prototypes,
     
    19261610; return 0; }
    19271611EOF
    1928 if { (eval echo configure:1929: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     1612if { (eval echo configure:1613: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    19291613  rm -rf conftest*
    19301614  eval "ac_cv_func_pthread_mutex_lock=yes"
     
    19471631    if test "$ac_cv_func_pthread_mutex_lock" = "no"; then
    19481632        echo $ac_n "checking for main in -lpthread""... $ac_c" 1>&6
    1949 echo "configure:1950: checking for main in -lpthread" >&5
     1633echo "configure:1634: checking for main in -lpthread" >&5
    19501634ac_lib_var=`echo pthread'_'main | sed 'y%./+-%__p_%'`
    19511635if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
     
    19551639LIBS="-lpthread  $LIBS"
    19561640cat > conftest.$ac_ext <<EOF
    1957 #line 1958 "configure"
     1641#line 1642 "configure"
    19581642#include "confdefs.h"
    19591643
     
    19621646; return 0; }
    19631647EOF
    1964 if { (eval echo configure:1965: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     1648if { (eval echo configure:1649: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    19651649  rm -rf conftest*
    19661650  eval "ac_cv_lib_$ac_lib_var=yes"
     
    21081792
    21091793ac_given_srcdir=$srcdir
    2110 ac_given_INSTALL="$INSTALL"
    21111794
    21121795trap 'rm -fr `echo "Makefile util/Makefile odr/Makefile z39.50/Makefile asn/Makefile zutil/Makefile comstack/Makefile ccl/Makefile tab/Makefile include/Makefile include/yaz/Makefile lib/Makefile client/Makefile doc/Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
     
    21421825s%@infodir@%$infodir%g
    21431826s%@mandir@%$mandir%g
    2144 s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
    2145 s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
    2146 s%@INSTALL_DATA@%$INSTALL_DATA%g
    2147 s%@PACKAGE@%$PACKAGE%g
    2148 s%@VERSION@%$VERSION%g
    2149 s%@ACLOCAL@%$ACLOCAL%g
    2150 s%@AUTOCONF@%$AUTOCONF%g
    2151 s%@AUTOMAKE@%$AUTOMAKE%g
    2152 s%@AUTOHEADER@%$AUTOHEADER%g
    2153 s%@MAKEINFO@%$MAKEINFO%g
    2154 s%@SET_MAKE@%$SET_MAKE%g
    21551827s%@CC@%$CC%g
    21561828s%@CPP@%$CPP%g
     
    22391911  esac
    22401912
    2241   case "$ac_given_INSTALL" in
    2242   [/$]*) INSTALL="$ac_given_INSTALL" ;;
    2243   *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
    2244   esac
    22451913
    22461914  echo creating "$ac_file"
     
    22581926s%@srcdir@%$srcdir%g
    22591927s%@top_srcdir@%$top_srcdir%g
    2260 s%@INSTALL@%$INSTALL%g
    22611928" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file
    22621929fi; done
     
    22751942test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
    22761943
     1944
     1945
  • trunk/gsdl/packages/yaz/configure.in

    r1531 r1713  
    22dnl (c) Index Data 1994-2000
    33dnl See the file LICENSE for details.
     4dnl -- modified for NZDL / Greenstone
    45AC_INIT(include/yaz/yaz-version.h)
    5 AM_INIT_AUTOMAKE(yaz, 1.6)
     6dnl -- AM_INIT_AUTOMAKE(yaz, 1.6)
    67dnl
    78dnl ------ Checking programs
    89AC_PROG_CC
    910AC_PROG_CPP
    10 AC_PROG_INSTALL
     11dnl -- AC_PROG_INSTALL
    1112AC_PROG_RANLIB
    1213AC_CHECK_PROGS(have_sgml2txt,sgml2txt,no)
     
    107108dnl retrieval/Makefile ill/Makefile server/Makefile ztest/Makefile
    108109AC_OUTPUT(Makefile util/Makefile odr/Makefile z39.50/Makefile asn/Makefile zutil/Makefile comstack/Makefile ccl/Makefile tab/Makefile include/Makefile include/yaz/Makefile lib/Makefile client/Makefile doc/Makefile)
     110
     111
  • trunk/gsdl/packages/yaz/doc/Makefile.in

    r1343 r1713  
    9292all: all-redirect
    9393.SUFFIXES:
    94 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
    95     cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps doc/Makefile
     94##$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
     95##  cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps doc/Makefile
    9696
    9797Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
  • trunk/gsdl/packages/yaz/include/Makefile.in

    r1516 r1713  
    8686all: all-redirect
    8787.SUFFIXES:
    88 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
    89     cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps include/Makefile
     88##$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
     89##  cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps include/Makefile
    9090
    9191Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
     
    101101# (2) otherwise, pass the desired values on the `make' command line.
    102102
    103 @SET_MAKE@
     103# @SET_MAKE@
    104104
    105105all-recursive install-data-recursive install-exec-recursive \
  • trunk/gsdl/packages/yaz/include/yaz/Makefile.in

    r1516 r1713  
    8787all: all-redirect
    8888.SUFFIXES:
    89 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
    90     cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps include/yaz/Makefile
     89##$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
     90##  cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps include/yaz/Makefile
    9191
    9292Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
  • trunk/gsdl/packages/yaz/include/yaz/proto.h

    r1516 r1713  
    55 *
    66 * $Log$
    7  * Revision 1.2  2000/09/07 04:10:12  jrm21
    8  * Removed some files from the yaz package that we don't (currently) need.
     7 * Revision 1.3  2000/11/28 22:30:14  jrm21
     8 * Tidied up YAZ Makefiles and Makefiles.ins
    99 *
    1010 * Revision 1.1  2000/08/03 03:11:01  johnmcp
  • trunk/gsdl/packages/yaz/lib/Makefile.in

    r1531 r1713  
    114114.SUFFIXES:
    115115.SUFFIXES: .S .c .o .s
    116 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
    117     cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps lib/Makefile
     116##$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
     117##  cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps lib/Makefile
    118118
    119119Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
  • trunk/gsdl/packages/yaz/odr/Makefile.in

    r1516 r1713  
    111111.SUFFIXES:
    112112.SUFFIXES: .S .c .o .s
    113 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
    114     cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps odr/Makefile
     113##$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
     114##  cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps odr/Makefile
    115115
    116116Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
  • trunk/gsdl/packages/yaz/tab/Makefile.in

    r1516 r1713  
    9191all: all-redirect
    9292.SUFFIXES:
    93 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
    94     cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps tab/Makefile
     93##$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
     94##  cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps tab/Makefile
    9595
    9696Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
  • trunk/gsdl/packages/yaz/util/Makefile.in

    r1516 r1713  
    114114.SUFFIXES:
    115115.SUFFIXES: .S .c .o .s
    116 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
    117     cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps util/Makefile
     116
     117##$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
     118##  cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps util/Makefile
    118119
    119120Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
  • trunk/gsdl/packages/yaz/z39.50/Makefile.in

    r1516 r1713  
    113113.SUFFIXES:
    114114.SUFFIXES: .S .c .o .s
    115 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
    116     cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps z39.50/Makefile
     115##$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
     116##  cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps z39.50/Makefile
    117117
    118118Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
  • trunk/gsdl/packages/yaz/zutil/Makefile.in

    r1516 r1713  
    108108.SUFFIXES:
    109109.SUFFIXES: .S .c .o .s
    110 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
    111     cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps zutil/Makefile
     110##$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
     111##  cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps zutil/Makefile
    112112
    113113Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
Note: See TracChangeset for help on using the changeset viewer.