[Tora-cvs] tora acinclude.m4,1.10,1.11 configure.ac,1.1,1.2 Makefile.am,1.18,1.19 qtkde.m4,1.12,1.13

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 454-5900

Update of /cvsroot/tora/tora
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23030

Modified Files:
	acinclude.m4 configure.ac Makefile.am qtkde.m4 
Log Message:
remove LT_AC_PROG_SED which breaks new versions of GNU build tools

Index: qtkde.m4
===================================================================
RCS file: /cvsroot/tora/tora/qtkde.m4,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** qtkde.m4	8 Dec 2005 17:54:30 -0000	1.12
--- qtkde.m4	26 Jan 2006 23:06:25 -0000	1.13
***************
*** 41,45 ****
  dnl mrj
  dnl check for kde. if not, skip the rest of the kde tests.
! AC_DEFUN(TORA_HAVE_KDE,
  [
    AC_MSG_CHECKING([have kde])
--- 41,45 ----
  dnl mrj
  dnl check for kde. if not, skip the rest of the kde tests.
! AC_DEFUN([TORA_HAVE_KDE],
  [
[...2985 lines suppressed...]
-       cat "$tmp/sed.in" "$tmp/sed.in" >"$tmp/sed.tmp"
-       mv "$tmp/sed.tmp" "$tmp/sed.in"
-       cp "$tmp/sed.in" "$tmp/sed.nl"
-       echo >>"$tmp/sed.nl"
-       ${_sed} -e 's/a$//' < "$tmp/sed.nl" >"$tmp/sed.out" || break
-       cmp -s "$tmp/sed.out" "$tmp/sed.nl" || break
-       # 10000 chars as input seems more than enough
-       test $_count -gt 10 && break
-       _count=`expr $_count + 1`
-       if test $_count -gt $_max; then
-         _max=$_count
-         lt_cv_path_SED=$_sed
-       fi
-     done
-   done
-   rm -rf "$tmp"
- ])
- AC_MSG_RESULT([$SED])
- ])
--- 5135,5136 ----

Index: acinclude.m4
===================================================================
RCS file: /cvsroot/tora/tora/acinclude.m4,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** acinclude.m4	20 Jan 2006 00:04:54 -0000	1.10
--- acinclude.m4	26 Jan 2006 23:06:24 -0000	1.11
***************
*** 4,13 ****

  dnl mrj: set default prefix for tora
! AC_DEFUN(mrj_SET_PREFIX,
  [
      AC_PREFIX_DEFAULT(/usr/local/tora)
  ])

! AC_DEFUN(TORA_CHECK_PLUGIN,
  [
    AC_MSG_CHECKING([enable plugin support])
--- 4,13 ----

  dnl mrj: set default prefix for tora
! AC_DEFUN([mrj_SET_PREFIX],
  [
      AC_PREFIX_DEFAULT(/usr/local/tora)
  ])

! AC_DEFUN([TORA_CHECK_PLUGIN],
  [
    AC_MSG_CHECKING([enable plugin support])
***************
*** 20,24 ****
  ])

! AC_DEFUN(TORA_CHECK_MONO,
  [
    AC_MSG_CHECKING([if monolithic build])
--- 20,24 ----
  ])

! AC_DEFUN([TORA_CHECK_MONO],
  [
    AC_MSG_CHECKING([if monolithic build])
***************
*** 40,44 ****

  dnl check if we need to link against our libtool libraries
! AC_DEFUN(TORA_CHECK_LINK_LIBS,
  [
    AC_MSG_CHECKING([whether to link plugins into binary])
--- 40,44 ----

  dnl check if we need to link against our libtool libraries
! AC_DEFUN([TORA_CHECK_LINK_LIBS],
  [
    AC_MSG_CHECKING([whether to link plugins into binary])
***************
*** 55,59 ****
  ])

! AC_DEFUN(TORA_LIBTOOL_ALL,
  [
    AC_LIBTOOL_DLOPEN
--- 55,59 ----
  ])

! AC_DEFUN([TORA_LIBTOOL_ALL],
  [
    AC_LIBTOOL_DLOPEN
***************
*** 64,80 ****
    dnl check for dlopen, must be called before AC_PROG_LIBTOOL
    AC_PROG_LIBTOOL
!   AC_SUBST(LIBTOOL_DEPS)
  ])

! AC_DEFUN(TORA_CHECK_PUTENV,
  [
    AC_CACHE_CHECK([for putenv], tora_cv_sys_putenv,
!     [AC_TRY_COMPILE(
!       [
  #ifdef HAVE_STDLIB_H
  # include <stdlib.h>
  #endif
!       ],
!       [putenv("test=test");],
        tora_cv_sys_putenv=yes,
        tora_cv_sys_putenv=no)
--- 64,79 ----
    dnl check for dlopen, must be called before AC_PROG_LIBTOOL
    AC_PROG_LIBTOOL
!   AC_SUBST([LIBTOOL_DEPS])
  ])

! AC_DEFUN([TORA_CHECK_PUTENV],
  [
    AC_CACHE_CHECK([for putenv], tora_cv_sys_putenv,
!     [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
  #ifdef HAVE_STDLIB_H
  # include <stdlib.h>
  #endif
!       ]],
!       [[putenv("test=test");]])],
        tora_cv_sys_putenv=yes,
        tora_cv_sys_putenv=no)
***************
*** 94,104 ****
  dnl Some systems have utime.h but don't declare the struct anywhere.

! AC_DEFUN(jm_CHECK_TYPE_STRUCT_UTIMBUF,
  [
    AC_CHECK_HEADERS(utime.h)
    AC_REQUIRE([AC_HEADER_TIME])
    AC_CACHE_CHECK([for struct utimbuf], fu_cv_sys_struct_utimbuf,
!     [AC_TRY_COMPILE(
!       [
  #ifdef TIME_WITH_SYS_TIME
  # include <sys/time.h>
--- 93,102 ----
  dnl Some systems have utime.h but don't declare the struct anywhere.

! AC_DEFUN([jm_CHECK_TYPE_STRUCT_UTIMBUF],
  [
    AC_CHECK_HEADERS(utime.h)
    AC_REQUIRE([AC_HEADER_TIME])
    AC_CACHE_CHECK([for struct utimbuf], fu_cv_sys_struct_utimbuf,
!     [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
  #ifdef TIME_WITH_SYS_TIME
  # include <sys/time.h>
***************
*** 114,119 ****
  # include <utime.h>
  #endif
!       ],
!       [static struct utimbuf x; x.actime = x.modtime;],
        fu_cv_sys_struct_utimbuf=yes,
        fu_cv_sys_struct_utimbuf=no)
--- 112,117 ----
  # include <utime.h>
  #endif
!       ]],
!       [[static struct utimbuf x; x.actime = x.modtime;]])],
        fu_cv_sys_struct_utimbuf=yes,
        fu_cv_sys_struct_utimbuf=no)
***************
*** 130,134 ****
  dnl mrj
  dnl check if we have oracle then test it. otherwise, RESULT no.
! AC_DEFUN(MRJ_CHECK_ORACLE,
  [
    AC_MSG_CHECKING([for oracle])
--- 128,132 ----
  dnl mrj
  dnl check if we have oracle then test it. otherwise, RESULT no.
! AC_DEFUN([MRJ_CHECK_ORACLE],
  [
    AC_MSG_CHECKING([for oracle])

Index: configure.ac
===================================================================
RCS file: /cvsroot/tora/tora/configure.ac,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** configure.ac	14 Jan 2006 19:24:57 -0000	1.1
--- configure.ac	26 Jan 2006 23:06:25 -0000	1.2
***************
*** 1,13 ****
! dnl Process this file with autoconf to produce a configure script.

! AC_INIT(main.cpp)
! dnl Every other copy of the package version number gets its value from here
! AM_INIT_AUTOMAKE(tora, 1.3.19)

! dnl create a config.h file (Automake will add -DHAVE_CONFIG_H)
! AM_CONFIG_HEADER(config.h)
  mrj_SET_PREFIX

! AC_SUBST(VERSION)

  ISODATE=`date +%Y-%m-%d`
--- 1,14 ----
! # Process this file with autoconf to produce a configure script.

! AC_INIT([tora],[1.3.19],[tor...@li...])
! # Every other copy of the package version number gets its value from here
! AM_INIT_AUTOMAKE

! # create a config.h file (Automake will add -DHAVE_CONFIG_H)
! AC_CONFIG_SRCDIR([main.cpp])
! AC_CONFIG_HEADER([config.h])
  mrj_SET_PREFIX

! AC_SUBST(PACKAGE_VERSION)

  ISODATE=`date +%Y-%m-%d`
***************
*** 16,26 ****
  AC_CANONICAL_HOST

! dnl Checks for programs.
! LT_AC_PROG_SED
  AC_PROG_INSTALL
  AC_PROG_CC
  AC_PROG_CXX

! dnl Checks for header files.
  AC_HEADER_STDC
  AC_CHECK_HEADERS(unistd.h sys/param.h sys/time.h time.h sys/mkdev.h sys/sysmacros.h string.h memory.h fcntl.h dirent.h sys/ndir.h ndir.h alloca.h locale.h )
--- 17,26 ----
  AC_CANONICAL_HOST

! # Checks for programs.
  AC_PROG_INSTALL
  AC_PROG_CC
  AC_PROG_CXX

! # Checks for header files.
  AC_HEADER_STDC
  AC_CHECK_HEADERS(unistd.h sys/param.h sys/time.h time.h sys/mkdev.h sys/sysmacros.h string.h memory.h fcntl.h dirent.h sys/ndir.h ndir.h alloca.h locale.h )
***************
*** 37,43 ****
  AC_TYPE_SIZE_T

! dnl for NLS support. Call them in this order!
! dnl WITH_NLS is for the po files
! dnl AM_KDE_WITH_NLS

  TORA_CHECK_PLUGIN
--- 37,43 ----
  AC_TYPE_SIZE_T

! # for NLS support. Call them in this order!
! # WITH_NLS is for the po files
! # AM_KDE_WITH_NLS

  TORA_CHECK_PLUGIN
***************
*** 51,59 ****
  TORA_CHECK_PUTENV

! dnl Makefile.am uses these
  AM_CONDITIONAL(ENABLE_MONO, test "$enable_mono" = yes)
  AM_CONDITIONAL(HAVE_ORACLE, test "$enable_oracle" = yes)

  AC_CONFIG_FILES([Makefile])
! 
! AC_OUTPUT([rpm/tora.spec])
--- 51,59 ----
  TORA_CHECK_PUTENV

! # Makefile.am uses these
  AM_CONDITIONAL(ENABLE_MONO, test "$enable_mono" = yes)
  AM_CONDITIONAL(HAVE_ORACLE, test "$enable_oracle" = yes)

  AC_CONFIG_FILES([Makefile])
! AC_CONFIG_FILES([rpm/tora.spec])
! AC_OUTPUT

Index: Makefile.am
===================================================================
RCS file: /cvsroot/tora/tora/Makefile.am,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** Makefile.am	30 Dec 2005 21:43:53 -0000	1.18
--- Makefile.am	26 Jan 2006 23:06:25 -0000	1.19
***************
*** 13,20 ****
  	tora_toad.ts

! INCLUDES = @KDE_INCLUDES@ @QT_INCLUDES@ $(LTDLINCL)
! AM_CPPFLAGS  = $(PCRE_CFLAGS) \
  	-DDEFAULT_PLUGIN_DIR=\"$(libdir)\" \
! 	-DTOVERSION=\"@VERSION@\" \
  	$(ORACLE_CXXFLAGS) \
  	@QSCINTILLA_CXXFLAGS@
--- 13,20 ----
  	tora_toad.ts

! AM_CPPFLAGS = @KDE_INCLUDES@ @QT_INCLUDES@ $(LTDLINCL)
! AM_CPPFLAGS += $(PCRE_CFLAGS) \
  	-DDEFAULT_PLUGIN_DIR=\"$(libdir)\" \
! 	-DTOVERSION=\"@PACKAGE_VERSION@\" \
  	$(ORACLE_CXXFLAGS) \
  	@QSCINTILLA_CXXFLAGS@
***************
*** 142,146 ****
  endif

! tora_SOURCES=main.cpp aclocal.m4 \
  	toabout.cpp toabout.h \
  	toaboutui.cpp toaboutui.h \
--- 142,146 ----
  endif

! tora_SOURCES=chex.pl main.cpp aclocal.m4 \
  	toabout.cpp toabout.h \
  	toaboutui.cpp toaboutui.h \