|
From: Bob T. <bt...@us...> - 2001-08-13 02:21:00
|
Update of /cvsroot/benson/benson3
In directory usw-pr-cvs1:/tmp/cvs-serv25733
Modified Files:
Makefile.am Makefile.in acinclude.m4 aclocal.m4 configure
configure.in
Log Message:
Performed a little housekeeping
Index: Makefile.am
===================================================================
RCS file: /cvsroot/benson/benson3/Makefile.am,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** Makefile.am 2001/08/12 21:19:43 1.1.1.1
--- Makefile.am 2001/08/13 02:20:57 1.2
***************
*** 1 ****
! SUBDIRS=src
--- 1 ----
! SUBDIRS = src include
Index: Makefile.in
===================================================================
RCS file: /cvsroot/benson/benson3/Makefile.in,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** Makefile.in 2001/08/12 21:20:16 1.1.1.1
--- Makefile.in 2001/08/13 02:20:57 1.2
***************
*** 77,86 ****
VERSION = @VERSION@
perlpath = @perlpath@
sedpath = @sedpath@
sortpath = @sortpath@
trpath = @trpath@
uniqpath = @uniqpath@
! SUBDIRS = src
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
--- 77,88 ----
VERSION = @VERSION@
perlpath = @perlpath@
+ pythonpath = @pythonpath@
sedpath = @sedpath@
sortpath = @sortpath@
+ tclpath = @tclpath@
trpath = @trpath@
uniqpath = @uniqpath@
! SUBDIRS = src include
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
Index: acinclude.m4
===================================================================
RCS file: /cvsroot/benson/benson3/acinclude.m4,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** acinclude.m4 2001/08/12 21:20:41 1.1.1.1
--- acinclude.m4 2001/08/13 02:20:57 1.2
***************
*** 1,27 ****
! AC_DEFUN(FIND_PERL, [
! AC_PATH_PROG(sedpath, "sed")
! AC_PATH_PROG(perlpath, "perl")
! AC_MSG_CHECKING(version)
! PERL_VERSION=`$perlpath -e "print $]" | sed s/\\\.// | sed s/00/./g`
! AC_MSG_RESULT($PERL_VERSION)
! AC_MSG_CHECKING(for Perl compile flags)
! PERL_CFLAGS=`$perlpath -MExtUtils::Embed -e ccopts 2>/dev/null`
! if test "_$PERL_CFLAGS" = _ ; then
! AC_MSG_RESULT([not found, building without Perl.])
! perl=no
! 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"
! AC_DEFINE(USE_PERL)
! fi
! ])
--- 1 ----
! k
Index: aclocal.m4
===================================================================
RCS file: /cvsroot/benson/benson3/aclocal.m4,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** aclocal.m4 2001/08/12 23:43:04 1.3
--- aclocal.m4 2001/08/13 02:20:57 1.4
***************
*** 11,41 ****
dnl PARTICULAR PURPOSE.
! AC_DEFUN(FIND_PERL, [
! AC_PATH_PROG(sedpath, "sed")
! AC_PATH_PROG(perlpath, "perl")
! AC_MSG_CHECKING(version)
! PERL_VERSION=`$perlpath -e "print $]" | sed s/\\\.// | sed s/00/./g`
! AC_MSG_RESULT($PERL_VERSION)
! AC_MSG_CHECKING(for Perl compile flags)
! PERL_CFLAGS=`$perlpath -MExtUtils::Embed -e ccopts 2>/dev/null`
! if test "_$PERL_CFLAGS" = _ ; then
! AC_MSG_RESULT([not found, building without Perl.])
! perl=no
! 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"
! AC_DEFINE(USE_PERL)
! fi
! ])
# Do all the work for Automake. This macro actually does too much --
--- 11,15 ----
dnl PARTICULAR PURPOSE.
! k
# Do all the work for Automake. This macro actually does too much --
Index: configure
===================================================================
RCS file: /cvsroot/benson/benson3/configure,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** configure 2001/08/12 23:43:04 1.2
--- configure 2001/08/13 02:20:57 1.3
***************
*** 261,264 ****
--- 261,265 ----
ac_unique_file="src/shm_wrapper.c"
+ ac_unique_file="src/shm_wrapper.c"
# Initialize some variables set by options.
***************
*** 809,812 ****
--- 810,816 ----
--with-pic try to use only PIC/non-PIC objects default=use both
[...6102 lines suppressed...]
+ case $as_mkdir_dir in
+ # Skip DOS drivespec
+ ?:) as_incr_dir=$as_mkdir_dir ;;
+ *)
+ as_incr_dir=$as_incr_dir/$as_mkdir_dir
+ test -d "$as_incr_dir" || mkdir "$as_incr_dir"
+ ;;
+ esac
+ done; }
+
+ fi
+ rm -f $ac_file
+ mv $tmp/config.h $ac_file
+ fi
+ else
+ cat $tmp/config.h
+ rm -f $tmp/config.h
+ fi
done
EOF
Index: configure.in
===================================================================
RCS file: /cvsroot/benson/benson3/configure.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** configure.in 2001/08/12 23:43:04 1.2
--- configure.in 2001/08/13 02:20:57 1.3
***************
*** 1,4 ****
AC_INIT(src/shm_wrapper.c)
! AC_PREREQ(2.13)
AC_CONFIG_AUX_DIR(.)
AM_INIT_AUTOMAKE(benson,3.0)
--- 1,5 ----
AC_INIT(src/shm_wrapper.c)
! AC_CONFIG_SRCDIR([src/shm_wrapper.c])
! AC_PREREQ(2.52)
AC_CONFIG_AUX_DIR(.)
AM_INIT_AUTOMAKE(benson,3.0)
***************
*** 6,9 ****
--- 7,11 ----
AC_PROG_INSTALL
AM_PROG_LIBTOOL
+ AC_CONFIG_HEADERS(config.h)
MAJOR_VERSION=3
***************
*** 31,36 ****
AC_SUBST(HAVE_X11)
HAVE_X11=$have_x
! AC_PREREQ(2.9)
AC_ARG_WITH(ssl, [ --with-ssl=dir Find SSL libraries for SSL/TLS support below dir],ssl_dir=$withval, with_ssl=no)
AC_ARG_ENABLE(debug, [ --enable-debug Compile using -g], use_debug=$enableval,use_debug=no)
--- 33,41 ----
AC_SUBST(HAVE_X11)
HAVE_X11=$have_x
! AC_PREREQ(2.52)
+ AC_ARG_WITH(perl, [ --with-perl=dir Find Perl libraries for Perl support below dir],perl_dir=$withval, with_perl=no)
+ AC_ARG_WITH(python, [ --with-python=dir Find Python libraries for Python support below dir],python_dir=$withval, with_python=no)
+ AC_ARG_WITH(tcl, [ --with-tcl=dir Find TCL libraries for TCL support below dir],tcl_dir=$withval, with_tcl=no)
AC_ARG_WITH(ssl, [ --with-ssl=dir Find SSL libraries for SSL/TLS support below dir],ssl_dir=$withval, with_ssl=no)
AC_ARG_ENABLE(debug, [ --enable-debug Compile using -g], use_debug=$enableval,use_debug=no)
***************
*** 38,41 ****
--- 43,47 ----
AC_CHECK_HEADERS(openssl/ssl.h)
+ AC_CHECK_HEADERS(signal.h)
AC_CHECK_HEADERS(sys/shm.h)
AC_CHECK_HEADERS(sys/stat.h)
***************
*** 52,56 ****
AC_PATH_PROG(uniqpath, uniq)
AC_PATH_PROG(sortpath, sort)
! AC_PATH_PROG(perlpath, "perl")
AC_MSG_CHECKING(version)
PERL_VERSION=`$perlpath -e "print $]" | sed s/\\\.// | sed s/00/./g`
--- 58,64 ----
AC_PATH_PROG(uniqpath, uniq)
AC_PATH_PROG(sortpath, sort)
!
! if test X"$with_perl" = Xyes; then
! AC_PATH_PROG(perlpath, "perl")
AC_MSG_CHECKING(version)
PERL_VERSION=`$perlpath -e "print $]" | sed s/\\\.// | sed s/00/./g`
***************
*** 74,80 ****
CFLAGS="$CFLAGS $PERL_CFLAGS"
LIBS="$LIBS $PERL_LDFLAGS"
- AC_DEFINE(USE_PERL)
fi
! AC_OUTPUT(Makefile src/Makefile)
--- 82,128 ----
CFLAGS="$CFLAGS $PERL_CFLAGS"
LIBS="$LIBS $PERL_LDFLAGS"
fi
+ fi
+
+
+ if test X"$with_python" = Xyes; then
+ AC_PATH_PROG(pythonpath, "python")
+ AC_MSG_CHECKING(for Python compile flags)
+ AC_MSG_RESULT([not found, building without Python.])
+ fi
+
+ if test X"$with_tcl" = Xyes; then
+ AC_PATH_PROG(tclpath, "tclsh")
+ AC_MSG_CHECKING(version)
+ TCL_VERSION=`echo 'puts "$tcl_version"' | $tclpath`
+ if test "_$TCL_VERSION" = _ ; then
+ AC_MSG_RESULT([version not found, building without Tcl.])
+ else
+ AC_MSG_RESULT($TCL_VERSION)
+ fi
+ AC_MSG_CHECKING(for Tcl compile flags)
+ TCL_CFLAGS="-I/usr/include/"
+ TCL_LDFLAGS="-L/usr/lib/ -ltcl$TCL_VERSION"
+ CFLAGS="$CFLAGS $TCL_CFLAGS"
+ LIBS="$LIBS $TCL_LDFLAGS"
+ AC_MSG_RESULT(ok)
+ # AC_MSG_RESULT([not found, building without Tcl.])
+ 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
+ CFLAGS="$CFLAGS -g"
+ fi
+
+ if test X"$use_profile" = Xyes; then
+ CFLAGS="$CFLAGS -pg"
+ fi
+
+
! #AC_CONFIG_FILES([Makefile include/Makefile src/Makefile])
! AC_OUTPUT([Makefile include/Makefile src/Makefile])
|