[Adonthell-commits] CVS: adonthell acinclude.m4,1.13.2.2,1.13.2.3 config.h.in,1.1.2.2,1.1.2.3

[Alexandre Courbot <address@hidden>]

Update of /cvsroot/adonthell/adonthell
In directory subversions:/tmp/cvs-serv15878

Modified Files:
      Tag: Branch_road_to_0-4
        acinclude.m4 config.h.in 
Log Message:
Hopefully fixed libtool problems


Index: acinclude.m4
===================================================================
RCS file: /cvsroot/adonthell/adonthell/acinclude.m4,v
retrieving revision 1.13.2.2
retrieving revision 1.13.2.3
diff -C2 -r1.13.2.2 -r1.13.2.3
*** acinclude.m4        16 Mar 2002 16:06:06 -0000      1.13.2.2
--- acinclude.m4        4 Apr 2002 11:45:26 -0000       1.13.2.3
***************
*** 1,14 ****
- dnl aclocal.m4 generated automatically by aclocal 1.4
- 
- dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
- dnl This file is free software; the Free Software Foundation
- dnl gives unlimited permission to copy and/or distribute it,
- dnl with or without modifications, as long as this notice is preserved.
- 
- dnl This program is distributed in the hope that it will be useful,
- dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
- dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
[...6047 lines suppressed...]
!   else
!     ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
!     LIBLTDL="-lltdl"
!     LTDLINCL=
    fi
+   # For backwards non-gettext consistent compatibility...
+   INCLTDL="$LTDLINCL"
  ])
  
! # old names
! AC_DEFUN([AM_PROG_LIBTOOL],   [AC_PROG_LIBTOOL])
! AC_DEFUN([AM_ENABLE_SHARED],  [AC_ENABLE_SHARED($@)])
! AC_DEFUN([AM_ENABLE_STATIC],  [AC_ENABLE_STATIC($@)])
! AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
! AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
! AC_DEFUN([AM_PROG_LD],        [AC_PROG_LD])
! AC_DEFUN([AM_PROG_NM],        [AC_PROG_NM])
  
+ # This is just to silence aclocal about the macro not being used
+ ifelse([AC_DISABLE_FAST_INSTALL])

Index: config.h.in
===================================================================
RCS file: /cvsroot/adonthell/adonthell/Attic/config.h.in,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -r1.1.2.2 -r1.1.2.3
*** config.h.in 30 Mar 2002 17:06:25 -0000      1.1.2.2
--- config.h.in 4 Apr 2002 11:45:26 -0000       1.1.2.3
***************
*** 50,53 ****
--- 50,56 ----
  #undef HAVE___ARGZ_STRINGIFY
  
+ /* Define if you have the dcgettext function.  */
+ #undef HAVE_DCGETTEXT
+ 
  /* Define if you have the feof_unlocked function.  */
  #undef HAVE_FEOF_UNLOCKED
***************
*** 56,62 ****
  #undef HAVE_FGETS_UNLOCKED
  
- /* Define if you have the getc_unlocked function.  */
- #undef HAVE_GETC_UNLOCKED
- 
  /* Define if you have the getcwd function.  */
  #undef HAVE_GETCWD
--- 59,62 ----
***************
*** 98,101 ****
--- 98,104 ----
  #undef HAVE_STRCASECMP
  
+ /* Define if you have the strchr function.  */
+ #undef HAVE_STRCHR
+ 
  /* Define if you have the strdup function.  */
  #undef HAVE_STRDUP
***************
*** 113,116 ****
--- 116,122 ----
  #undef HAVE_ARGZ_H
  
+ /* Define if you have the <dlfcn.h> header file.  */
+ #undef HAVE_DLFCN_H
+ 
  /* Define if you have the <limits.h> header file.  */
  #undef HAVE_LIMITS_H
***************
*** 176,181 ****
  /* Define if the GNU gettext() function is already present or preinstalled. */
  #undef HAVE_GETTEXT
- 
- /* Define if the GNU dcgettext() function is already present or preinstalled. 
*/
- #undef HAVE_DCGETTEXT
  
--- 182,184 ----