[lwatch-cvs] files configure,1.28,1.29 configure.ac,1.23,1.24

[<ar...@us...>]

Update of /cvsroot/lwatch/files
In directory sc8-pr-cvs1:/tmp/cvs-serv1392

Modified Files:
	configure configure.ac 
Log Message:
 - find include directories for non-libc headers


Index: configure
===================================================================
RCS file: /cvsroot/lwatch/files/configure,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** configure	24 Mar 2003 22:31:52 -0000	1.28
--- configure	25 Mar 2003 10:03:23 -0000	1.29
***************
*** 1761,1767 ****
  
  
- 
- test x"$prefix" = xNONE && prefix="$ac_default_prefix"
- 
  #if test "$cache_file" = /dev/null; then
  #        cache_file="config.cache"
--- 1761,1764 ----
***************
*** 1770,1776 ****
--- 1767,1790 ----
  
  
+ test x"$prefix" = xNONE && prefix="$ac_default_prefix"
+ 
            ac_config_headers="$ac_config_headers src/config.h"
  
  
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
  # Checks for programs.
  ac_ext=c
***************
*** 3709,3715 ****
  
  
! 
! 
! for ac_header in errno.h fcntl.h getopt.h pcre.h signal.h stdarg.h stddef.h stdio.h stdlib.h string.h sys/param.h sys/poll.h sys/stat.h sys/types.h unistd.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--- 3723,3727 ----
  
  
! for ac_header in errno.h fcntl.h signal.h stdarg.h stddef.h stdio.h stdlib.h string.h sys/param.h sys/poll.h sys/stat.h sys/types.h unistd.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
***************
*** 3853,3862 ****
  
  
! # Take fun :)
! #AC_MSG_CHECKING(civilization)
! #sleep 1
! #AC_MSG_RESULT([other.])
! #AC_MSG_RESULT([We are lwatch of Borg. You will be asimilated. Resistance is futile])
! #sleep 1
  
  # Checks for libraries.
--- 3865,3904 ----
  
  
! 
! 
! 
!     # Searching for include directory
!     echo "$as_me:$LINENO: checking for location of getopt.h" >&5
! echo $ECHO_N "checking for location of getopt.h... $ECHO_C" >&6
!     for d in /usr/include /usr/local/include; do
!         if test -f "$d/getopt.h"; then
! 	    CFLAGS="${CFLAGS} -I$d"
! 	    cat >>confdefs.h <<_ACEOF
! #define HAVE_`echo getopt.h | tr "a-z." "A-Z_"` 1
! _ACEOF
! 
! 	    echo "$as_me:$LINENO: result: $d" >&5
! echo "${ECHO_T}$d" >&6
! 	    break
!         fi
!     done
! 
! 
!     # Searching for include directory
!     echo "$as_me:$LINENO: checking for location of pcre.h" >&5
! echo $ECHO_N "checking for location of pcre.h... $ECHO_C" >&6
!     for d in /usr/include /usr/local/include; do
!         if test -f "$d/pcre.h"; then
! 	    CFLAGS="${CFLAGS} -I$d"
! 	    cat >>confdefs.h <<_ACEOF
! #define HAVE_`echo pcre.h | tr "a-z." "A-Z_"` 1
! _ACEOF
! 
! 	    echo "$as_me:$LINENO: result: $d" >&5
! echo "${ECHO_T}$d" >&6
! 	    break
!         fi
!     done
! 
  
  # Checks for libraries.
***************
*** 4779,4791 ****
  
  # Define autoheader templates
- 
- 
- 
- 
- 
- 
- 
- 
- 
  # Checks for user options
  echo "$as_me:$LINENO: checking for compile with diagnostic messages" >&5
--- 4821,4824 ----

Index: configure.ac
===================================================================
RCS file: /cvsroot/lwatch/files/configure.ac,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** configure.ac	24 Mar 2003 22:14:06 -0000	1.23
--- configure.ac	25 Mar 2003 10:03:28 -0000	1.24
***************
*** 15,21 ****
  AM_INIT_AUTOMAKE([dist-bzip2])
  
- AC_PREFIX_DEFAULT(/usr/local)
- test x"$prefix" = xNONE && prefix="$ac_default_prefix"
- 
  #if test "$cache_file" = /dev/null; then
  #        cache_file="config.cache"
--- 15,18 ----
***************
*** 23,29 ****
--- 20,43 ----
  #AC_CACHE_LOAD
  
+ AC_PREFIX_DEFAULT(/usr/local)
+ test x"$prefix" = xNONE && prefix="$ac_default_prefix"
  
  AM_CONFIG_HEADER(src/config.h)
  
+ AH_TEMPLATE([DEBUG],
+ 	[Define to 1 if you want to compile with debug support.])
+ 
+ AH_TEMPLATE([SYSCONFDIR],
+ 	[Directory where configuration file is placed])
+ 
+ AH_TEMPLATE([INPUTFILE],
+ 	[Default input file])
+ 
+ AH_TEMPLATE([HAVE_GETOPT_H],
+ 	[Define to 1 if you have the <getopt.h> header file.])
+ 
+ AH_TEMPLATE([HAVE_PCRE_H],
+ 	[Define to 1 if you have the <pcre.h> header file.])
+ 
  # Checks for programs.
  AC_PROG_CC
***************
*** 43,54 ****
  # Checks for header files.
  AC_HEADER_STDC
! AC_CHECK_HEADERS([errno.h fcntl.h getopt.h pcre.h signal.h stdarg.h stddef.h stdio.h stdlib.h string.h sys/param.h sys/poll.h sys/stat.h sys/types.h unistd.h])
  
! # Take fun :)
! #AC_MSG_CHECKING(civilization)
! #sleep 1
! #AC_MSG_RESULT([other.])
! #AC_MSG_RESULT([We are lwatch of Borg. You will be asimilated. Resistance is futile])
! #sleep 1
  
  # Checks for libraries.
--- 57,77 ----
  # Checks for header files.
  AC_HEADER_STDC
! AC_CHECK_HEADERS([errno.h fcntl.h signal.h stdarg.h stddef.h stdio.h stdlib.h string.h sys/param.h sys/poll.h sys/stat.h sys/types.h unistd.h])
  
! AC_DEFUN(ARC_FIND_HEADER, [
!     # Searching for include directory
!     AC_MSG_CHECKING(for location of $1)
!     for d in /usr/include /usr/local/include; do
!         if test -f "$d/$1"; then
! 	    CFLAGS="${CFLAGS} -I$d"
! 	    AC_DEFINE_UNQUOTED(HAVE_`echo $1 | tr "a-z." "A-Z_"`)
! 	    AC_MSG_RESULT($d)
! 	    break
!         fi
!     done
! ])
! 
! ARC_FIND_HEADER(getopt.h)
! ARC_FIND_HEADER(pcre.h)
  
  # Checks for libraries.
***************
*** 66,78 ****
  
  # Define autoheader templates
- AH_TEMPLATE([DEBUG],
- 	[Define to 1 if you want to compile with debug support.])
- 
- AH_TEMPLATE([SYSCONFDIR],
- 	[Directory where configuration file is placed])
- 
- AH_TEMPLATE([INPUTFILE],
- 	[Default input file])
- 
  # Checks for user options
  AC_MSG_CHECKING(for compile with diagnostic messages)
--- 89,92 ----