[Hamlib-cvs-digest] CVS: hamlib configure,1.3,1.4 configure.in,1.3,1.4

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

Update of /cvsroot/hamlib/hamlib
In directory slayer.i.sourceforge.net:/tmp/cvs-serv11642

Modified Files:
	configure configure.in 
Log Message:
* Added include paths so 'make distcheck' works

Index: configure
===================================================================
RCS file: /cvsroot/hamlib/hamlib/configure,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** configure	2000/10/09 01:17:19	1.3
--- configure	2000/10/29 10:15:20	1.4
***************
*** 1366,1370 ****

! INCLUDES="${INCLUDES} -I/usr/local/include -I../src"
  CPPFLAGS="${CPPFLAGS} -D_GNU_SOURCE -DV_MAJOR=${V_MAJOR} -DV_MINOR=${V_MINOR}"
  if test "${ac_cv_prog_gcc}" = "yes"; then
--- 1366,1370 ----

! INCLUDES="${INCLUDES} -I\$(top_srcdir)/include -I\$(top_srcdir)/src"
  CPPFLAGS="${CPPFLAGS} -D_GNU_SOURCE -DV_MAJOR=${V_MAJOR} -DV_MINOR=${V_MINOR}"
  if test "${ac_cv_prog_gcc}" = "yes"; then
***************
*** 1529,1533 ****

  /* Ultrix mips cc rejects this.  */
! typedef int charset[2]; const charset x;
  /* SunOS 4.1.1 cc rejects this.  */
  char const *const *ccp;
--- 1529,1533 ----

  /* Ultrix mips cc rejects this.  */
! typedef int charset[2]; const charset x = {0,0};
  /* SunOS 4.1.1 cc rejects this.  */
  char const *const *ccp;
***************
*** 1604,1608 ****

  int main() {
! } $ac_kw foo() {
  ; return 0; }
  EOF
--- 1604,1608 ----

  int main() {
! } int $ac_kw foo() {
  ; return 0; }
  EOF
***************
*** 2036,2039 ****
--- 2036,2040 ----

+ 
  # Check whether --enable-shared or --disable-shared was given.
  if test "${enable_shared+set}" = set; then
***************
*** 2112,2116 ****

  echo $ac_n "checking host system type""... $ac_c" 1>&6
! echo "configure:2115: checking host system type" >&5

  host_alias=$host
--- 2113,2117 ----

  echo $ac_n "checking host system type""... $ac_c" 1>&6
! echo "configure:2116: checking host system type" >&5

  host_alias=$host
***************
*** 2133,2137 ****

  echo $ac_n "checking build system type""... $ac_c" 1>&6
! echo "configure:2136: checking build system type" >&5

  build_alias=$build
--- 2134,2138 ----

  echo $ac_n "checking build system type""... $ac_c" 1>&6
! echo "configure:2137: checking build system type" >&5

  build_alias=$build
***************
*** 2153,2157 ****
  set dummy ranlib; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:2156: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 2154,2158 ----
  set dummy ranlib; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:2157: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
***************
*** 2192,2196 ****
    # Check if gcc -print-prog-name=ld gives a path.
    echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6
! echo "configure:2195: checking for ld used by GCC" >&5
    ac_prog=`($CC -print-prog-name=ld) 2>&5`
    case "$ac_prog" in
--- 2193,2197 ----
    # Check if gcc -print-prog-name=ld gives a path.
    echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6
! echo "configure:2196: checking for ld used by GCC" >&5
    ac_prog=`($CC -print-prog-name=ld) 2>&5`
    case "$ac_prog" in
***************
*** 2216,2223 ****
  elif test "$with_gnu_ld" = yes; then
    echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
! echo "configure:2219: checking for GNU ld" >&5
  else
    echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
! echo "configure:2222: checking for non-GNU ld" >&5
  fi
  if eval "test \"`echo '$''{'ac_cv_path_LD'+set}'`\" = set"; then
--- 2217,2224 ----
  elif test "$with_gnu_ld" = yes; then
    echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
! echo "configure:2220: checking for GNU ld" >&5
  else
    echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
! echo "configure:2223: checking for non-GNU ld" >&5
  fi
  if eval "test \"`echo '$''{'ac_cv_path_LD'+set}'`\" = set"; then
***************
*** 2253,2257 ****
  fi
  test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; }
- 
  echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6
  echo "configure:2258: checking if the linker ($LD) is GNU ld" >&5
--- 2254,2257 ----
***************
*** 2307,2318 ****

  # Check for any special flags to pass to ltconfig.
! #
! # the following will cause an existing older ltconfig to fail, so
! # we ignore this at the expense of the cache file... Checking this 
! # will just take longer ... bummer!
! #libtool_flags="--cache-file=$cache_file"
! #
  test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
  test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static"
--- 2307,2317 ----

+ case "$target" in
+ NONE) lt_target="$host" ;;
+ *) lt_target="$target" ;;
+ esac

  # Check for any special flags to pass to ltconfig.
! libtool_flags="--cache-file=$cache_file"
  test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
  test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static"
***************
*** 2320,2324 ****
  test "$ac_cv_prog_gcc" = yes && libtool_flags="$libtool_flags --with-gcc"
  test "$ac_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld"
! 

  # Check whether --enable-libtool-lock or --disable-libtool-lock was given.
--- 2319,2323 ----
  test "$ac_cv_prog_gcc" = yes && libtool_flags="$libtool_flags --with-gcc"
  test "$ac_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld"
! libtool_flags="$libtool_flags --enable-dlopen"

  # Check whether --enable-libtool-lock or --disable-libtool-lock was given.
***************
*** 2333,2341 ****
  # Some flags need to be propagated to the compiler or linker for good
  # libtool support.
! case "$host" in
  *-*-irix6*)
    # Find out which ABI we are using.
!   echo '#line 2339 "configure"' > conftest.$ac_ext
!   if { (eval echo configure:2340: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
      case "`/usr/bin/file conftest.o`" in
      *32-bit*)
--- 2332,2340 ----
  # Some flags need to be propagated to the compiler or linker for good
  # libtool support.
! case "$lt_target" in
  *-*-irix6*)
    # Find out which ABI we are using.
!   echo '#line 2338 "configure"' > conftest.$ac_ext
!   if { (eval echo configure:2339: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
      case "`/usr/bin/file conftest.o`" in
      *32-bit*)
***************
*** 2358,2367 ****
    CFLAGS="$CFLAGS -belf"
    echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6
! echo "configure:2361: checking whether the C compiler needs -belf" >&5
  if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 2366 "configure"
  #include "confdefs.h"

--- 2357,2366 ----
    CFLAGS="$CFLAGS -belf"
    echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6
! echo "configure:2360: checking whether the C compiler needs -belf" >&5
  if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 2365 "configure"
  #include "confdefs.h"

***************
*** 2370,2374 ****
  ; return 0; }
  EOF
! if { (eval echo configure:2373: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    lt_cv_cc_needs_belf=yes
--- 2369,2373 ----
  ; return 0; }
  EOF
! if { (eval echo configure:2372: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    lt_cv_cc_needs_belf=yes
***************
*** 2448,2452 ****
  DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \
  ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
! $libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
  || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }

--- 2447,2451 ----
  DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \
  ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
! $libtool_flags --no-verify $ac_aux_dir/ltmain.sh $lt_target \
  || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }

***************
*** 2477,2491 ****
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
! echo "configure:2480: checking for $ac_hdr" >&5
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 2485 "configure"
  #include "confdefs.h"
  #include <$ac_hdr>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:2490: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
--- 2476,2490 ----
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
! echo "configure:2479: checking for $ac_hdr" >&5
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 2484 "configure"
  #include "confdefs.h"
  #include <$ac_hdr>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:2489: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
***************
*** 2508,2512 ****
  EOF
   echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
! echo "configure:2511: checking for dlopen in -ldl" >&5
  ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
--- 2507,2511 ----
  EOF
   echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
! echo "configure:2510: checking for dlopen in -ldl" >&5
  ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
***************
*** 2516,2520 ****
  LIBS="-ldl  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 2519 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
--- 2515,2519 ----
  LIBS="-ldl  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 2518 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
***************
*** 2527,2531 ****
  ; return 0; }
  EOF
! if { (eval echo configure:2530: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
--- 2526,2530 ----
  ; return 0; }
  EOF
! if { (eval echo configure:2529: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
***************
*** 2557,2566 ****
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:2560: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 2565 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
--- 2556,2565 ----
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:2559: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 2564 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
***************
*** 2585,2589 ****
  ; return 0; }
  EOF
! if { (eval echo configure:2588: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
--- 2584,2588 ----
  ; return 0; }
  EOF
! if { (eval echo configure:2587: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
***************
*** 2744,2748 ****

  trap 'rm -fr `echo "ft747/Makefile ft847/Makefile icom/Makefile Makefile \
! 			src/Makefile tests/Makefile  include/config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
  EOF
  cat >> $CONFIG_STATUS <<EOF
--- 2743,2748 ----

  trap 'rm -fr `echo "ft747/Makefile ft847/Makefile icom/Makefile Makefile \
! 			include/Makefile include/hamlib/Makefile src/Makefile \
! 			tests/Makefile doc/Makefile  include/config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
  EOF
  cat >> $CONFIG_STATUS <<EOF
***************
*** 2801,2806 ****
  s%@build_os@%$build_os%g
  s%@RANLIB@%$RANLIB%g
- s%@LD@%$LD%g
- s%@NM@%$NM%g
  s%@LIBTOOL@%$LIBTOOL%g
  s%@INCLUDES@%$INCLUDES%g
--- 2801,2804 ----
***************
*** 2851,2855 ****

  CONFIG_FILES=\${CONFIG_FILES-"ft747/Makefile ft847/Makefile icom/Makefile Makefile \
! 			src/Makefile tests/Makefile "}
  EOF
  cat >> $CONFIG_STATUS <<\EOF
--- 2849,2854 ----

  CONFIG_FILES=\${CONFIG_FILES-"ft747/Makefile ft847/Makefile icom/Makefile Makefile \
! 			include/Makefile include/hamlib/Makefile src/Makefile \
! 			tests/Makefile doc/Makefile "}
  EOF
  cat >> $CONFIG_STATUS <<\EOF

Index: configure.in
===================================================================
RCS file: /cvsroot/hamlib/hamlib/configure.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** configure.in	2000/10/22 15:53:12	1.3
--- configure.in	2000/10/29 10:15:20	1.4
***************
*** 20,24 ****
  AC_ISC_POSIX

! INCLUDES="${INCLUDES} -I/usr/local/include -I../src"
  CPPFLAGS="${CPPFLAGS} -D_GNU_SOURCE -DV_MAJOR=${V_MAJOR} -DV_MINOR=${V_MINOR}"
  if test "${ac_cv_prog_gcc}" = "yes"; then
--- 20,24 ----
  AC_ISC_POSIX

! INCLUDES="${INCLUDES} -I\$(top_srcdir)/include -I\$(top_srcdir)/src"
  CPPFLAGS="${CPPFLAGS} -D_GNU_SOURCE -DV_MAJOR=${V_MAJOR} -DV_MINOR=${V_MINOR}"
  if test "${ac_cv_prog_gcc}" = "yes"; then

[Hamlib-cvs-digest] CVS: hamlib configure,1.3,1.4 configure.in,1.3,1.4

Library to control radio transceivers and receivers

[Hamlib-cvs-digest] CVS: hamlib configure,1.3,1.4 configure.in,1.3,1.4