/[autoconf]/autoconf/aclocal.m4
ViewVC logotype

Diff of /autoconf/aclocal.m4

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.38 by akim, Thu May 22 13:24:04 2003 UTC revision 1.39 by akim, Fri Jun 20 07:34:29 2003 UTC
# Line 105  AC_REQUIRE([AM_SET_LEADING_DOT])dnl Line 105  AC_REQUIRE([AM_SET_LEADING_DOT])dnl
105    
106  _AM_IF_OPTION([no-dependencies],,  _AM_IF_OPTION([no-dependencies],,
107  [AC_PROVIDE_IFELSE([AC_PROG_CC],  [AC_PROVIDE_IFELSE([AC_PROG_CC],
108                    [_AM_DEPENDENCIES(CC)],                    [_AM_DEPENDENCIES(CC)],
109                    [define([AC_PROG_CC],                    [define([AC_PROG_CC],
110                            defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl                            defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
111  AC_PROVIDE_IFELSE([AC_PROG_CXX],  AC_PROVIDE_IFELSE([AC_PROG_CXX],
112                    [_AM_DEPENDENCIES(CXX)],                    [_AM_DEPENDENCIES(CXX)],
113                    [define([AC_PROG_CXX],                    [define([AC_PROG_CXX],
114                            defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl                            defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
115  ])  ])
116  ])  ])
117    
# Line 167  AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSIO Line 167  AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSIO
167    
168  # Helper functions for option handling.                    -*- Autoconf -*-  # Helper functions for option handling.                    -*- Autoconf -*-
169    
170  # Copyright 2001, 2002  Free Software Foundation, Inc.  # Copyright (C) 2001, 2002, 2003  Free Software Foundation, Inc.
171    
172  # This program is free software; you can redistribute it and/or modify  # This program is free software; you can redistribute it and/or modify
173  # it under the terms of the GNU General Public License as published by  # it under the terms of the GNU General Public License as published by
# Line 213  AC_DEFUN([_AM_IF_OPTION], Line 213  AC_DEFUN([_AM_IF_OPTION],
213  # Check to make sure that the build environment is sane.  # Check to make sure that the build environment is sane.
214  #  #
215    
216  # Copyright 1996, 1997, 2000, 2001 Free Software Foundation, Inc.  # Copyright (C) 1996, 1997, 2000, 2001, 2003 Free Software Foundation, Inc.
217    
218  # This program is free software; you can redistribute it and/or modify  # This program is free software; you can redistribute it and/or modify
219  # it under the terms of the GNU General Public License as published by  # it under the terms of the GNU General Public License as published by
# Line 276  AC_MSG_RESULT(yes)]) Line 276  AC_MSG_RESULT(yes)])
276  #  -*- Autoconf -*-  #  -*- Autoconf -*-
277    
278    
279  # Copyright 1997, 1999, 2000, 2001 Free Software Foundation, Inc.  # Copyright (C) 1997, 1999, 2000, 2001, 2003 Free Software Foundation, Inc.
280    
281  # This program is free software; you can redistribute it and/or modify  # This program is free software; you can redistribute it and/or modify
282  # it under the terms of the GNU General Public License as published by  # it under the terms of the GNU General Public License as published by
# Line 321  fi Line 321  fi
321    
322  # AM_AUX_DIR_EXPAND  # AM_AUX_DIR_EXPAND
323    
324  # Copyright 2001 Free Software Foundation, Inc.  # Copyright (C) 2001, 2003 Free Software Foundation, Inc.
325    
326  # This program is free software; you can redistribute it and/or modify  # This program is free software; you can redistribute it and/or modify
327  # it under the terms of the GNU General Public License as published by  # it under the terms of the GNU General Public License as published by
# Line 388  am_aux_dir=`cd $ac_aux_dir && pwd` Line 388  am_aux_dir=`cd $ac_aux_dir && pwd`
388  # ------------------  # ------------------
389  # Define $install_sh.  # Define $install_sh.
390    
391  # Copyright 2001 Free Software Foundation, Inc.  # Copyright (C) 2001, 2003 Free Software Foundation, Inc.
392    
393  # This program is free software; you can redistribute it and/or modify  # This program is free software; you can redistribute it and/or modify
394  # it under the terms of the GNU General Public License as published by  # it under the terms of the GNU General Public License as published by
# Line 412  AC_SUBST(install_sh)]) Line 412  AC_SUBST(install_sh)])
412    
413  # AM_PROG_INSTALL_STRIP  # AM_PROG_INSTALL_STRIP
414    
415  # Copyright 2001 Free Software Foundation, Inc.  # Copyright (C) 2001, 2003 Free Software Foundation, Inc.
416    
417  # This program is free software; you can redistribute it and/or modify  # This program is free software; you can redistribute it and/or modify
418  # it under the terms of the GNU General Public License as published by  # it under the terms of the GNU General Public License as published by
# Line 530  ifelse([$1], CC,   [depcc="$CC"   am_com Line 530  ifelse([$1], CC,   [depcc="$CC"   am_com
530         [$1], CXX,  [depcc="$CXX"  am_compiler_list=],         [$1], CXX,  [depcc="$CXX"  am_compiler_list=],
531         [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],         [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
532         [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],         [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
533                     [depcc="$$1"   am_compiler_list=])                     [depcc="$$1"   am_compiler_list=])
534    
535  AC_CACHE_CHECK([dependency style of $depcc],  AC_CACHE_CHECK([dependency style of $depcc],
536                 [am_cv_$1_dependencies_compiler_type],                 [am_cv_$1_dependencies_compiler_type],
537  [if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then  [if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
538    # We make a subdir and do the tests there.  Otherwise we can end up    # We make a subdir and do the tests there.  Otherwise we can end up
539    # making bogus files that we don't know about and never remove.  For    # making bogus files that we don't know about and never remove.  For
# Line 577  AC_CACHE_CHECK([dependency style of $dep Line 577  AC_CACHE_CHECK([dependency style of $dep
577         source=conftest.c object=conftest.o \         source=conftest.c object=conftest.o \
578         depfile=conftest.Po tmpdepfile=conftest.TPo \         depfile=conftest.Po tmpdepfile=conftest.TPo \
579         $SHELL ./depcomp $depcc -c -o conftest.o conftest.c \         $SHELL ./depcomp $depcc -c -o conftest.o conftest.c \
580           >/dev/null 2>conftest.err &&           >/dev/null 2>conftest.err &&
581         grep conftest.h conftest.Po > /dev/null 2>&1 &&         grep conftest.h conftest.Po > /dev/null 2>&1 &&
582         ${MAKE-make} -s -f confmf > /dev/null 2>&1; then         ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
583        # icc doesn't choke on unknown options, it will just issue warnings        # icc doesn't choke on unknown options, it will just issue warnings
584        # (even with -Werror).  So we grep stderr for any message        # (even with -Werror).  So we grep stderr for any message
585        # that says an option was ignored.        # that says an option was ignored.
586        if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else        if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else
587          am_cv_$1_dependencies_compiler_type=$depmode          am_cv_$1_dependencies_compiler_type=$depmode
588          break          break
589        fi        fi
590      fi      fi
591    done    done
# Line 629  AC_SUBST([AMDEPBACKSLASH]) Line 629  AC_SUBST([AMDEPBACKSLASH])
629    
630  # Generate code to set up dependency tracking.   -*- Autoconf -*-  # Generate code to set up dependency tracking.   -*- Autoconf -*-
631    
632  # Copyright 1999, 2000, 2001, 2002 Free Software Foundation, Inc.  # Copyright (C) 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
633    
634  # This program is free software; you can redistribute it and/or modify  # This program is free software; you can redistribute it and/or modify
635  # it under the terms of the GNU General Public License as published by  # it under the terms of the GNU General Public License as published by
# Line 713  AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS] Line 713  AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS]
713    
714  # Check to see how 'make' treats includes.      -*- Autoconf -*-  # Check to see how 'make' treats includes.      -*- Autoconf -*-
715    
716  # Copyright (C) 2001, 2002 Free Software Foundation, Inc.  # Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
717    
718  # This program is free software; you can redistribute it and/or modify  # This program is free software; you can redistribute it and/or modify
719  # it under the terms of the GNU General Public License as published by  # it under the terms of the GNU General Public License as published by
# Line 738  AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS] Line 738  AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS]
738  AC_DEFUN([AM_MAKE_INCLUDE],  AC_DEFUN([AM_MAKE_INCLUDE],
739  [am_make=${MAKE-make}  [am_make=${MAKE-make}
740  cat > confinc << 'END'  cat > confinc << 'END'
741  doit:  am__doit:
742          @echo done          @echo done
743    .PHONY: am__doit
744  END  END
745  # If we don't find an include directive, just comment out the code.  # If we don't find an include directive, just comment out the code.
746  AC_MSG_CHECKING([for style of include used by $am_make])  AC_MSG_CHECKING([for style of include used by $am_make])
# Line 767  if test "$am__include" = "#"; then Line 768  if test "$am__include" = "#"; then
768        _am_result=BSD        _am_result=BSD
769     fi     fi
770  fi  fi
771  AC_SUBST(am__include)  AC_SUBST([am__include])
772  AC_SUBST(am__quote)  AC_SUBST([am__quote])
773  AC_MSG_RESULT($_am_result)  AC_MSG_RESULT([$_am_result])
774  rm -f confinc confmf  rm -f confinc confmf
775  ])  ])
776    
777  # AM_CONDITIONAL                                              -*- Autoconf -*-  # AM_CONDITIONAL                                              -*- Autoconf -*-
778    
779  # Copyright 1997, 2000, 2001 Free Software Foundation, Inc.  # Copyright (C) 1997, 2000, 2001, 2003 Free Software Foundation, Inc.
780    
781  # This program is free software; you can redistribute it and/or modify  # This program is free software; you can redistribute it and/or modify
782  # it under the terms of the GNU General Public License as published by  # it under the terms of the GNU General Public License as published by
# Line 819  fi])]) Line 820  fi])])
820    
821  m4_include([config/m4.m4])  m4_include([config/m4.m4])
822    
823  # Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003  # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
824  #   Free Software Foundation, Inc.  # Free Software Foundation, Inc.
825    
826  # This program is free software; you can redistribute it and/or modify  # This program is free software; you can redistribute it and/or modify
827  # it under the terms of the GNU General Public License as published by  # it under the terms of the GNU General Public License as published by
# Line 837  m4_include([config/m4.m4]) Line 838  m4_include([config/m4.m4])
838  # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
839  # 02111-1307, USA.  # 02111-1307, USA.
840    
841  # serial 6  # serial 7
842    
843  # AM_PATH_LISPDIR  # AM_PATH_LISPDIR
844  # ---------------  # ---------------
# Line 865  AC_DEFUN([AM_PATH_LISPDIR], Line 866  AC_DEFUN([AM_PATH_LISPDIR],
866    AC_RUN_LOG([$EMACS -batch -q -eval '(while load-path (princ (concat (car load-path) "\n")) (setq load-path (cdr load-path)))' </dev/null >conftest.out])    AC_RUN_LOG([$EMACS -batch -q -eval '(while load-path (princ (concat (car load-path) "\n")) (setq load-path (cdr load-path)))' </dev/null >conftest.out])
867          am_cv_lispdir=`sed -n \          am_cv_lispdir=`sed -n \
868         -e 's,/$,,' \         -e 's,/$,,' \
869         -e '/.*\/lib\/\(x\?emacs\/site-lisp\)$/{s,,${libdir}/\1,;p;q;}' \         -e '/.*\/lib\/x\?emacs\/site-lisp$/{s,.*/lib/\(x\?emacs/site-lisp\)$,${libdir}/\1,;p;q;}' \
870         -e '/.*\/share\/\(x\?emacs\/site-lisp\)$/{s,,${datadir}/\1,;p;q;}' \         -e '/.*\/share\/x\?emacs\/site-lisp$/{s,.*/share/\(x\?emacs/site-lisp\),${datadir}/\1,;p;q;}' \
871         conftest.out`         conftest.out`
872         rm conftest.out         rm conftest.out
873         if test -z "$am_cv_lispdir"; then         if test -z "$am_cv_lispdir"; then

Legend:
Removed from v.1.38  
changed lines
  Added in v.1.39

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26