Menu
▾
▴
[Benson-commit] CVS: benson3 Makefile.in,1.10,1.11 configure,1.53,1.54 configure.ac,1.2,1.3 Makefile.am,1.9,NONE
|
From: Bob T. <bt...@us...> - 2003-09-30 03:18:09
|
Update of /cvsroot/benson/benson3
In directory sc8-pr-cvs1:/tmp/cvs-serv18133
Modified Files:
Makefile.in configure configure.ac
Removed Files:
Makefile.am
Log Message:
More changes to the build environment.
Index: Makefile.in
===================================================================
RCS file: /cvsroot/benson/benson3/Makefile.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** Makefile.in 13 Nov 2002 04:28:04 -0000 1.10
--- Makefile.in 30 Sep 2003 03:18:01 -0000 1.11
***************
*** 1,424 ****
! # Makefile.in generated automatically by automake 1.4 from Makefile.am
! # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
! # This Makefile.in is free software; the Free Software Foundation
! # gives unlimited permission to copy and/or distribute it,
! # with or without modifications, as long as this notice is preserved.
! # This program is distributed in the hope that it will be useful,
! # but WITHOUT ANY WARRANTY, to the extent permitted by law; without
! # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
! # PARTICULAR PURPOSE.
!
! SHELL = @SHELL@
!
! srcdir = @srcdir@
! top_srcdir = @top_srcdir@
! VPATH = @srcdir@
! prefix = @prefix@
! exec_prefix = @exec_prefix@
!
! bindir = @bindir@
! sbindir = @sbindir@
! libexecdir = @libexecdir@
! datadir = @datadir@
! sysconfdir = @sysconfdir@
! sharedstatedir = @sharedstatedir@
! localstatedir = @localstatedir@
! libdir = @libdir@
! infodir = @infodir@
! mandir = @mandir@
! includedir = @includedir@
! oldincludedir = /usr/include
!
! DESTDIR =
!
! pkgdatadir = $(datadir)/@PACKAGE@
! pkglibdir = $(libdir)/@PACKAGE@
! pkgincludedir = $(includedir)/@PACKAGE@
!
! top_builddir = .
!
! ACLOCAL = @ACLOCAL@
! AUTOCONF = @AUTOCONF@
! AUTOMAKE = @AUTOMAKE@
! AUTOHEADER = @AUTOHEADER@
!
! INSTALL = @INSTALL@
! INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
! INSTALL_DATA = @INSTALL_DATA@
! INSTALL_SCRIPT = @INSTALL_SCRIPT@
! transform = @program_transform_name@
!
! NORMAL_INSTALL = :
! PRE_INSTALL = :
! POST_INSTALL = :
! NORMAL_UNINSTALL = :
! PRE_UNINSTALL = :
! POST_UNINSTALL = :
! host_alias = @host_alias@
! host_triplet = @host@
! AS = @AS@
! CC = @CC@
! DLLTOOL = @DLLTOOL@
! ECHO = @ECHO@
! EXEEXT = @EXEEXT@
! HAVE_X11 = @HAVE_X11@
! LIBTOOL = @LIBTOOL@
! LIBTOOL_DEPS = @LIBTOOL_DEPS@
! LIBTOOL_VERSION = @LIBTOOL_VERSION@
! LN_S = @LN_S@
! MAINT = @MAINT@
! MAKEINFO = @MAKEINFO@
! OBJDUMP = @OBJDUMP@
! OBJEXT = @OBJEXT@
! PACKAGE = @PACKAGE@
! PERL_CFLAGS = @PERL_CFLAGS@
! PERL_LDFLAGS = @PERL_LDFLAGS@
! RANLIB = @RANLIB@
! STRIP = @STRIP@
! VERSION = @VERSION@
! perlpath = @perlpath@
! pythonpath = @pythonpath@
! sedpath = @sedpath@
! sortpath = @sortpath@
! tclpath = @tclpath@
! trpath = @trpath@
! uniqpath = @uniqpath@
!
! SUBDIRS = src include scripts conf handlers man doc
! AUTOMAKE_OPTIONS = dejagnu
! RUNTEST = ` if [ -f ${srcdir}/runtest$(EXEEXT) ] ; then echo ${srcdir}/runtest$(EXEEXT); else echo "ERROR: runtest not found" ; exit 1; fi`
!
! ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
! mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
! CONFIG_HEADER = config.h
! CONFIG_CLEAN_FILES =
! DIST_COMMON = README ./stamp-h.in AUTHORS COPYING ChangeLog INSTALL \
! Makefile.am Makefile.in NEWS acinclude.m4 aclocal.m4 config.guess \
! config.h.in config.sub configure configure.in install-sh ltconfig \
! ltmain.sh missing mkinstalldirs
!
!
! DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
!
! TAR = tar
! GZIP_ENV = --best
! EXPECT = expect
! all: all-redirect
! .SUFFIXES:
! $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
! cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile
!
! Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
! cd $(top_builddir) \
! && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
!
! $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in acinclude.m4
! cd $(srcdir) && $(ACLOCAL)
!
! config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
! $(SHELL) ./config.status --recheck
! $(srcdir)/configure: @MAINTAINER_MODE_TRUE@$(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
! cd $(srcdir) && $(AUTOCONF)
!
! config.h: stamp-h
! @if test ! -f $@; then \
! rm -f stamp-h; \
! $(MAKE) stamp-h; \
! else :; fi
! stamp-h: $(srcdir)/config.h.in $(top_builddir)/config.status
! cd $(top_builddir) \
! && CONFIG_FILES= CONFIG_HEADERS=config.h \
! $(SHELL) ./config.status
! @echo timestamp > stamp-h 2> /dev/null
! $(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@$(srcdir)/stamp-h.in
! @if test ! -f $@; then \
! rm -f $(srcdir)/stamp-h.in; \
! $(MAKE) $(srcdir)/stamp-h.in; \
! else :; fi
! $(srcdir)/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4)
! cd $(top_srcdir) && $(AUTOHEADER)
! @echo timestamp > $(srcdir)/stamp-h.in 2> /dev/null
!
! mostlyclean-hdr:
!
! clean-hdr:
!
! distclean-hdr:
! -rm -f config.h
!
! maintainer-clean-hdr:
!
! # This directory's subdirectories are mostly independent; you can cd
! # into them and run `make' without going through this Makefile.
! # To change the values of `make' variables: instead of editing Makefiles,
! # (1) if the variable is set in `config.status', edit `config.status'
! # (which will cause the Makefiles to be regenerated when you run `make');
! # (2) otherwise, pass the desired values on the `make' command line.
!
! @SET_MAKE@
!
! all-recursive install-data-recursive install-exec-recursive \
! installdirs-recursive install-recursive uninstall-recursive \
! check-recursive installcheck-recursive info-recursive dvi-recursive:
! @set fnord $(MAKEFLAGS); amf=$$2; \
! dot_seen=no; \
! target=`echo $@ | sed s/-recursive//`; \
! list='$(SUBDIRS)'; for subdir in $$list; do \
! echo "Making $$target in $$subdir"; \
! if test "$$subdir" = "."; then \
! dot_seen=yes; \
! local_target="$$target-am"; \
! else \
! local_target="$$target"; \
! fi; \
! (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
! || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
! done; \
! if test "$$dot_seen" = "no"; then \
! $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
! fi; test -z "$$fail"
!
! mostlyclean-recursive clean-recursive distclean-recursive \
! maintainer-clean-recursive:
! @set fnord $(MAKEFLAGS); amf=$$2; \
! dot_seen=no; \
! rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
! rev="$$subdir $$rev"; \
! test "$$subdir" = "." && dot_seen=yes; \
! done; \
! test "$$dot_seen" = "no" && rev=". $$rev"; \
! target=`echo $@ | sed s/-recursive//`; \
! for subdir in $$rev; do \
! echo "Making $$target in $$subdir"; \
! if test "$$subdir" = "."; then \
! local_target="$$target-am"; \
! else \
! local_target="$$target"; \
! fi; \
! (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
! || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
! done && test -z "$$fail"
! tags-recursive:
! list='$(SUBDIRS)'; for subdir in $$list; do \
! test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
! done
!
! tags: TAGS
!
! ID: $(HEADERS) $(SOURCES) $(LISP)
! list='$(SOURCES) $(HEADERS)'; \
! unique=`for i in $$list; do echo $$i; done | \
! awk ' { files[$$0] = 1; } \
! END { for (i in files) print i; }'`; \
! here=`pwd` && cd $(srcdir) \
! && mkid -f$$here/ID $$unique $(LISP)
!
! TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) $(LISP)
! tags=; \
! here=`pwd`; \
! list='$(SUBDIRS)'; for subdir in $$list; do \
! if test "$$subdir" = .; then :; else \
! test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
! fi; \
! done; \
! list='$(SOURCES) $(HEADERS)'; \
! unique=`for i in $$list; do echo $$i; done | \
! awk ' { files[$$0] = 1; } \
! END { for (i in files) print i; }'`; \
! test -z "$(ETAGS_ARGS)config.h.in$$unique$(LISP)$$tags" \
! || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags config.h.in $$unique $(LISP) -o $$here/TAGS)
!
! mostlyclean-tags:
!
! clean-tags:
!
! distclean-tags:
! -rm -f TAGS ID
!
! maintainer-clean-tags:
!
! distdir = $(PACKAGE)-$(VERSION)
! top_distdir = $(distdir)
!
! # This target untars the dist file and tries a VPATH configuration. Then
! # it guarantees that the distribution is self-contained by making another
! # tarfile.
! distcheck: dist
! -rm -rf $(distdir)
! GZIP=$(GZIP_ENV) $(TAR) zxf $(distdir).tar.gz
! mkdir $(distdir)/=build
! mkdir $(distdir)/=inst
! dc_install_base=`cd $(distdir)/=inst && pwd`; \
! cd $(distdir)/=build \
! && ../configure --srcdir=.. --prefix=$$dc_install_base \
! && $(MAKE) $(AM_MAKEFLAGS) \
! && $(MAKE) $(AM_MAKEFLAGS) dvi \
! && $(MAKE) $(AM_MAKEFLAGS) check \
! && $(MAKE) $(AM_MAKEFLAGS) install \
! && $(MAKE) $(AM_MAKEFLAGS) installcheck \
! && $(MAKE) $(AM_MAKEFLAGS) dist
! -rm -rf $(distdir)
! @banner="$(distdir).tar.gz is ready for distribution"; \
! dashes=`echo "$$banner" | sed s/./=/g`; \
! echo "$$dashes"; \
! echo "$$banner"; \
! echo "$$dashes"
! dist: distdir
! -chmod -R a+r $(distdir)
! GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
! -rm -rf $(distdir)
! dist-all: distdir
! -chmod -R a+r $(distdir)
! GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
! -rm -rf $(distdir)
! distdir: $(DISTFILES)
! -rm -rf $(distdir)
! mkdir $(distdir)
! -chmod 777 $(distdir)
! here=`cd $(top_builddir) && pwd`; \
! top_distdir=`cd $(distdir) && pwd`; \
! distdir=`cd $(distdir) && pwd`; \
! cd $(top_srcdir) \
! && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu Makefile
! @for file in $(DISTFILES); do \
! d=$(srcdir); \
! if test -d $$d/$$file; then \
! cp -pr $$/$$file $(distdir)/$$file; \
! else \
! test -f $(distdir)/$$file \
! || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
! || cp -p $$d/$$file $(distdir)/$$file || :; \
! fi; \
! done
! for subdir in $(SUBDIRS); do \
! if test "$$subdir" = .; then :; else \
! test -d $(distdir)/$$subdir \
! || mkdir $(distdir)/$$subdir \
! || exit 1; \
! chmod 777 $(distdir)/$$subdir; \
! (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(distdir) distdir=../$(distdir)/$$subdir distdir) \
! || exit 1; \
! fi; \
! done
!
! RUNTESTFLAGS =
!
! DEJATOOL = $(PACKAGE)
!
! RUNTESTDEFAULTFLAGS = --tool $(DEJATOOL) --srcdir $$srcdir
!
! check-DEJAGNU: site.exp
! srcdir=`cd $(srcdir) && pwd`; export srcdir; \
! EXPECT=$(EXPECT); export EXPECT; \
! runtest=$(RUNTEST); \
! if $(SHELL) -c "$$runtest --version" > /dev/null 2>&1; then \
! $$runtest $(RUNTESTDEFAULTFLAGS) $(RUNTESTFLAGS); \
! else echo "WARNING: could not find \`runtest'" 1>&2; :;\
! fi
! info-am:
! info: info-recursive
! dvi-am:
! dvi: dvi-recursive
! check-am: all-am
! $(MAKE) $(AM_MAKEFLAGS) check-DEJAGNU
! check: check-recursive
! installcheck-am:
! installcheck: installcheck-recursive
! all-recursive-am: config.h
! $(MAKE) $(AM_MAKEFLAGS) all-recursive
!
! install-exec-am:
! install-exec: install-exec-recursive
!
! install-data-am: install-data-local
! install-data: install-data-recursive
!
! install-am: all-am
! @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
! install: install-recursive
! uninstall-am:
! uninstall: uninstall-recursive
! all-am: Makefile config.h
! all-redirect: all-recursive-am
! install-strip:
! $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
! installdirs: installdirs-recursive
! installdirs-am:
!
!
! mostlyclean-generic:
!
! clean-generic:
!
! distclean-generic:
! -rm -f Makefile $(CONFIG_CLEAN_FILES)
! -rm -f config.cache config.log stamp-h stamp-h[0-9]*
!
! maintainer-clean-generic:
! mostlyclean-am: mostlyclean-hdr mostlyclean-tags mostlyclean-generic
!
! mostlyclean: mostlyclean-recursive
!
! clean-am: clean-hdr clean-tags clean-generic mostlyclean-am
!
! clean: clean-recursive
!
! distclean-am: distclean-hdr distclean-tags distclean-generic clean-am
! -rm -f libtool
!
! distclean: distclean-recursive
! -rm -f config.status
!
! maintainer-clean-am: maintainer-clean-hdr maintainer-clean-tags \
! maintainer-clean-generic distclean-am
! @echo "This command is intended for maintainers to use;"
! @echo "it deletes files that may require special tools to rebuild."
!
! maintainer-clean: maintainer-clean-recursive
! -rm -f config.status
!
! .PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \
! install-data-recursive uninstall-data-recursive install-exec-recursive \
! uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \
! all-recursive check-recursive installcheck-recursive info-recursive \
! dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \
! maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
! distclean-tags clean-tags maintainer-clean-tags distdir check-DEJAGNU \
! info-am info dvi-am dvi check check-am installcheck-am installcheck \
! all-recursive-am install-exec-am install-exec install-data-local \
! install-data-am install-data install-am install uninstall-am uninstall \
! all-redirect all-am all installdirs-am installdirs mostlyclean-generic \
! distclean-generic clean-generic maintainer-clean-generic clean \
! mostlyclean distclean maintainer-clean
!
!
! install-data-local:
! (cd src/perl/Benson; \
! perl Makefile.PL BENSON_HOME=$(prefix); make ); \
! (cd src/perl/Benson;make install)
clean:
! (cd src/perl/Benson; make clean)
!
! distclean:
! (cd src/perl/Benson; make distclean)
! site.exp: Makefile
! @echo 'Making a new site.exp file...'
! @test ! -f site.bak || rm -f site.bak
! @echo '## these variables are automatically generated by make ##' > $@-t
! @echo '# Do not edit here. If you wish to override these values' >> $-t
! @echo '# edit the last section' >> $@-t
! @echo 'set srcdir $(srcdir)' >> $@-t
! @echo 'set objdir' `pwd` >> $@-t
! @echo '## All variables above are generated by configure. Do Not Edit ##' >> $@-t
! @test ! -f site.exp || sed '1,/^## All variables above are.*##/ d' site.exp >> $@-t
! @test ! -f site.exp || mv site.exp site.bak
! @mv $@-t site.exp
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
--- 1,17 ----
! TARGETS=make-src make-conf
! all: $(TARGETS)
! make-src:
! (cd src && $(MAKE))
! make-conf:
! (cd conf && $(MAKE))
clean:
! (cd src && $(MAKE) clean)
! distclean: clean
! rm -f Makefile *~
! (cd src && $(MAKE) distclean)
Index: configure
===================================================================
RCS file: /cvsroot/benson/benson3/configure,v
retrieving revision 1.53
retrieving revision 1.54
diff -C2 -r1.53 -r1.54
*** configure 29 Sep 2003 18:04:09 -0000 1.53
--- configure 30 Sep 2003 03:18:01 -0000 1.54
***************
*** 309,313 ****
#endif"
! ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT build build_cpu build_vendor build_os host host_cpu host_vendor host_os AWK CPP RANLIB ac_ct_RANLIB INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA sedpath trpath uniqpath sortpath unamepath arpath PERL END EGREP perlpath PERL_CFLAGS PERL_LDFLAGS pythonpath tclpath LIBOBJS LTLIBOBJS'
ac_subst_files=''
--- 309,313 ----
#endif"
! ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT build build_cpu build_vendor build_os host host_cpu host_vendor host_os AWK CPP RANLIB ac_ct_RANLIB INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA greppath sedpath trpath uniqpath sortpath unamepath arpath PERL END CONF_PIC EGREP perlpath PERL_CFLAGS PERL_LIBS PERL_LDFLAGS PERL_SLIBS pythonpath tclpath ALL_LIBS LIBOBJS LTLIBOBJS'
ac_subst_files=''
***************
*** 2861,2864 ****
--- 2861,2903 ----
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+ # Extract the first word of "grep", so it can be a program name with args.
+ set dummy grep; ac_word=$2
+ echo "$as_me:$LINENO: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_path_greppath+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ case $greppath in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_greppath="$greppath" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ for as_dir in $PATH
+ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_path_greppath="$as_dir/$ac_word$ac_exec_ext"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+ done
+
+ ;;
+ esac
+ fi
+ greppath=$ac_cv_path_greppath
+
+ if test -n "$greppath"; then
+ echo "$as_me:$LINENO: result: $greppath" >&5
+ echo "${ECHO_T}$greppath" >&6
+ else
+ echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
# Extract the first word of "sed", so it can be a program name with args.
set dummy sed; ac_word=$2
***************
*** 3206,3214 ****
--- 3245,3257 ----
*linux*)
CONF_DLFLAGS=-rdynamic
+ CONF_PIC=-fpic
;;
*solaris*|*sunos*)
+ CONF_PIC=-fpic
;;
esac
+
+
if test X"$CONF_LIBNSL" = Xyes; then
***************
*** 5507,5513 ****
echo "$as_me:$LINENO: checking for Perl compile flags" >&5
echo $ECHO_N "checking for Perl compile flags... $ECHO_C" >&6
-
-
PERL_CFLAGS=`$perlpath -MExtUtils::Embed -e ccopts 2>/dev/null`
if test "_$PERL_CFLAGS" = _ ; then
echo "$as_me:$LINENO: result: not found, building without Perl." >&5
--- 5550,5555 ----
echo "$as_me:$LINENO: checking for Perl compile flags" >&5
echo $ECHO_N "checking for Perl compile flags... $ECHO_C" >&6
PERL_CFLAGS=`$perlpath -MExtUtils::Embed -e ccopts 2>/dev/null`
+
if test "_$PERL_CFLAGS" = _ ; then
echo "$as_me:$LINENO: result: not found, building without Perl." >&5
***************
*** 5516,5531 ****
exit
else
! PERL_LDFLAGS=`$perlpath -MExtUtils::Embed -e ldopts | $sedpath 's/-lgdbm //'`
! PERL_LDFLAGS=`echo $PERL_LDFLAGS |$sedpath 's/-ldb //'`
! PERL_LDFLAGS=`echo $PERL_LDFLAGS |$sedpath 's/-lndbm //'`
! if test "$system" = "Linux"; then
! PERL_LDFLAGS=`echo $PERL_LDFLAGS |$sedpath 's/-lnsl //'`
! PERL_LDFLAGS=`echo $PERL_LDFLAGS |$sedpath 's/-lposix //'`
! fi
! PERL_LDFLAGS=`echo $PERL_LDFLAGS |$sedpath 's/-lc //'`
echo "$as_me:$LINENO: result: ok" >&5
echo "${ECHO_T}ok" >&6
! # CFLAGS="$CFLAGS $PERL_CFLAGS"
! # LIBS="$LIBS $PERL_LDFLAGS"
fi
fi
--- 5558,5572 ----
exit
else
! PERL_LDOPTS=`$perlpath -MExtUtils::Embed -e ldopts | $sedpath 's/-lgdbm //'`
! PERL_LDOPTS=`echo $PERL_LDOPTS |$sedpath 's/-ldb //'`
! PERL_LDOPTS=`echo $PERL_LDOPTS |$sedpath 's/-lndbm //'`
! PERL_LIBS=`echo $PERL_LDOPTS | $trpath ' ' '\n' | $sortpath | $uniqpath | $greppath '^\-l' | $trpath '\n' ' '`
! PERL_LDFLAGS=`echo $PERL_LDOPTS | $trpath ' ' '\n' | $sortpath | $uniqpath | $greppath '^\-L' | $trpath '\n' ' '`
! PERL_SLIBS=`echo $PERL_LDOPTS | $trpath ' ' '\n' | $sortpath | $uniqpath | $greppath 'Dyna' | $trpath '\n' ' '`
echo "$as_me:$LINENO: result: ok" >&5
echo "${ECHO_T}ok" >&6
!
!
!
fi
fi
***************
*** 5639,5645 ****
fi
! LIBS=`echo "$LIBS" | tr ' ' '\n' | sort | uniq | tr '\n' ' '`
CFLAGS=`echo $CFLAGS | $sedpath 's/\-g //g'`
! CFLAGS=`echo "$CFLAGS" | tr ' ' '\n' | sort | uniq | tr '\n' ' '`
if test X"$use_debug" = Xyes; then
--- 5680,5690 ----
fi
! LIBS=`echo $LIBS | $trpath ' ' '\n' | $sortpath | $uniqpath | $trpath '\n' ' '`
CFLAGS=`echo $CFLAGS | $sedpath 's/\-g //g'`
! CFLAGS=`echo "$CFLAGS" | $trpath ' ' '\n' | $sortpath | $uniqpath | $trpath '\n' ' '`
!
! ALL_LIBS="$LIBS $PERL_LIBS"
! ALL_LIBS=`echo $ALL_LIBS | $trpath ' ' '\n' | $sortpath | $uniqpath | $trpath '\n' ' '`
!
if test X"$use_debug" = Xyes; then
***************
*** 6305,6308 ****
--- 6350,6354 ----
s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
s,@INSTALL_DATA@,$INSTALL_DATA,;t t
+ s,@greppath@,$greppath,;t t
s,@sedpath@,$sedpath,;t t
s,@trpath@,$trpath,;t t
***************
*** 6313,6322 ****
--- 6359,6372 ----
s,@PERL@,$PERL,;t t
s,@END@,$END,;t t
+ s,@CONF_PIC@,$CONF_PIC,;t t
s,@EGREP@,$EGREP,;t t
s,@perlpath@,$perlpath,;t t
s,@PERL_CFLAGS@,$PERL_CFLAGS,;t t
+ s,@PERL_LIBS@,$PERL_LIBS,;t t
s,@PERL_LDFLAGS@,$PERL_LDFLAGS,;t t
+ s,@PERL_SLIBS@,$PERL_SLIBS,;t t
s,@pythonpath@,$pythonpath,;t t
s,@tclpath@,$tclpath,;t t
+ s,@ALL_LIBS@,$ALL_LIBS,;t t
s,@LIBOBJS@,$LIBOBJS,;t t
s,@LTLIBOBJS@,$LTLIBOBJS,;t t
Index: configure.ac
===================================================================
RCS file: /cvsroot/benson/benson3/configure.ac,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** configure.ac 29 Sep 2003 18:04:09 -0000 1.2
--- configure.ac 30 Sep 2003 03:18:01 -0000 1.3
***************
*** 13,16 ****
--- 13,17 ----
AC_PROG_RANLIB
AC_PROG_INSTALL
+ AC_PATH_PROG(greppath, grep)
AC_PATH_PROG(sedpath, sed)
AC_PATH_PROG(trpath, tr)
***************
*** 29,36 ****
--- 30,41 ----
*linux*)
CONF_DLFLAGS=-rdynamic
+ CONF_PIC=-fpic
;;
*solaris*|*sunos*)
+ CONF_PIC=-fpic
;;
esac
+ AC_SUBST(CONF_PIC)
+
if test X"$CONF_LIBNSL" = Xyes; then
***************
*** 110,116 ****
AC_MSG_RESULT($PERL_VERSION)
AC_MSG_CHECKING(for Perl compile flags)
- AC_SUBST(PERL_CFLAGS)
- AC_SUBST(PERL_LDFLAGS)
PERL_CFLAGS=`$perlpath -MExtUtils::Embed -e ccopts 2>/dev/null`
if test "_$PERL_CFLAGS" = _ ; then
AC_MSG_RESULT([not found, building without Perl.])
--- 115,120 ----
AC_MSG_RESULT($PERL_VERSION)
AC_MSG_CHECKING(for Perl compile flags)
PERL_CFLAGS=`$perlpath -MExtUtils::Embed -e ccopts 2>/dev/null`
+ AC_SUBST(PERL_CFLAGS)
if test "_$PERL_CFLAGS" = _ ; then
AC_MSG_RESULT([not found, building without Perl.])
***************
*** 118,132 ****
exit
else
! PERL_LDFLAGS=`$perlpath -MExtUtils::Embed -e ldopts | $sedpath 's/-lgdbm //'`
! PERL_LDFLAGS=`echo $PERL_LDFLAGS |$sedpath 's/-ldb //'`
! PERL_LDFLAGS=`echo $PERL_LDFLAGS |$sedpath 's/-lndbm //'`
! if test "$system" = "Linux"; then
! PERL_LDFLAGS=`echo $PERL_LDFLAGS |$sedpath 's/-lnsl //'`
! PERL_LDFLAGS=`echo $PERL_LDFLAGS |$sedpath 's/-lposix //'`
! fi
! PERL_LDFLAGS=`echo $PERL_LDFLAGS |$sedpath 's/-lc //'`
AC_MSG_RESULT(ok)
! # CFLAGS="$CFLAGS $PERL_CFLAGS"
! # LIBS="$LIBS $PERL_LDFLAGS"
fi
fi
--- 122,135 ----
exit
else
! PERL_LDOPTS=`$perlpath -MExtUtils::Embed -e ldopts | $sedpath 's/-lgdbm //'`
! PERL_LDOPTS=`echo $PERL_LDOPTS |$sedpath 's/-ldb //'`
! PERL_LDOPTS=`echo $PERL_LDOPTS |$sedpath 's/-lndbm //'`
! PERL_LIBS=`echo $PERL_LDOPTS | $trpath ' ' '\n' | $sortpath | $uniqpath | $greppath '^\-l' | $trpath '\n' ' '`
! PERL_LDFLAGS=`echo $PERL_LDOPTS | $trpath ' ' '\n' | $sortpath | $uniqpath | $greppath '^\-L' | $trpath '\n' ' '`
! PERL_SLIBS=`echo $PERL_LDOPTS | $trpath ' ' '\n' | $sortpath | $uniqpath | $greppath 'Dyna' | $trpath '\n' ' '`
AC_MSG_RESULT(ok)
! AC_SUBST(PERL_LIBS)
! AC_SUBST(PERL_LDFLAGS)
! AC_SUBST(PERL_SLIBS)
fi
fi
***************
*** 157,163 ****
fi
! LIBS=`echo "$LIBS" | tr ' ' '\n' | sort | uniq | tr '\n' ' '`
CFLAGS=`echo $CFLAGS | $sedpath 's/\-g //g'`
! CFLAGS=`echo "$CFLAGS" | tr ' ' '\n' | sort | uniq | tr '\n' ' '`
if test X"$use_debug" = Xyes; then
--- 160,170 ----
fi
! LIBS=`echo $LIBS | $trpath ' ' '\n' | $sortpath | $uniqpath | $trpath '\n' ' '`
CFLAGS=`echo $CFLAGS | $sedpath 's/\-g //g'`
! CFLAGS=`echo "$CFLAGS" | $trpath ' ' '\n' | $sortpath | $uniqpath | $trpath '\n' ' '`
!
! ALL_LIBS="$LIBS $PERL_LIBS"
! ALL_LIBS=`echo $ALL_LIBS | $trpath ' ' '\n' | $sortpath | $uniqpath | $trpath '\n' ' '`
! AC_SUBST(ALL_LIBS)
if test X"$use_debug" = Xyes; then
--- Makefile.am DELETED ---
|
