Mon Dec 5 22:54:22 2011 UTC ()
Make sure to actually use config.h


(joerg)
diff -r1.1 -r1.2 pkgsrc/net/fetch/files/Makefile.in
diff -r1.1 -r1.2 pkgsrc/net/fetch/files/config.h.in
diff -r1.4 -r1.5 pkgsrc/net/fetch/files/configure
diff -r1.4 -r1.5 pkgsrc/net/fetch/files/configure.ac
cvs diff -r1.1 -r1.2 pkgsrc/net/fetch/files/Makefile.in (expand / switch to unified diff)

--- pkgsrc/net/fetch/files/Makefile.in 2009/11/19 22:55:53 1.1
+++ pkgsrc/net/fetch/files/Makefile.in 2011/12/05 22:54:22 1.2
@@ -1,8 +1,9 @@ @@ -1,8 +1,9 @@
1# $FreeBSD$ 1# $FreeBSD$
2 2
3.include <bsd.own.mk> 3.include <bsd.own.mk>
4 4
5PROG= fetch 5PROG= fetch
6LDADD+= -lfetch @LIBS@ 6LDADD+= -lfetch @LIBS@
 7CPPFLAGS+= -DHAVE_CONFIG_H
7 8
8.include <bsd.prog.mk> 9.include <bsd.prog.mk>
cvs diff -r1.1 -r1.2 pkgsrc/net/fetch/files/config.h.in (expand / switch to unified diff)

--- pkgsrc/net/fetch/files/config.h.in 2009/11/13 20:52:05 1.1
+++ pkgsrc/net/fetch/files/config.h.in 2011/12/05 22:54:22 1.2
@@ -1,18 +1,15 @@ @@ -1,18 +1,15 @@
1/* config.h.in. Generated from configure.ac by autoheader. */ 1/* config.h.in. Generated from configure.ac by autoheader. */
2 2
3/* Include config.h */ 
4#undef HAVE_CONFIG_H 
5 
6/* Define to 1 if you have the <err.h> header file. */ 3/* Define to 1 if you have the <err.h> header file. */
7#undef HAVE_ERR_H 4#undef HAVE_ERR_H
8 5
9/* Define to 1 if you have the `getpass' function. */ 6/* Define to 1 if you have the `getpass' function. */
10#undef HAVE_GETPASS 7#undef HAVE_GETPASS
11 8
12/* Define to 1 if you have the `getpassphrase' function. */ 9/* Define to 1 if you have the `getpassphrase' function. */
13#undef HAVE_GETPASSPHRASE 10#undef HAVE_GETPASSPHRASE
14 11
15/* Define to 1 if the system has the type `intmax_t'. */ 12/* Define to 1 if the system has the type `intmax_t'. */
16#undef HAVE_INTMAX_T 13#undef HAVE_INTMAX_T
17 14
18/* Define to 1 if you have the <inttypes.h> header file. */ 15/* Define to 1 if you have the <inttypes.h> header file. */
cvs diff -r1.4 -r1.5 pkgsrc/net/fetch/files/configure (expand / switch to unified diff)

--- pkgsrc/net/fetch/files/configure 2010/06/24 22:51:00 1.4
+++ pkgsrc/net/fetch/files/configure 2011/12/05 22:54:22 1.5
@@ -3788,28 +3788,26 @@ _ACEOF @@ -3788,28 +3788,26 @@ _ACEOF
3788 3788
3789fi 3789fi
3790 3790
3791 3791
3792case "$host_os" in 3792case "$host_os" in
3793netbsd) 3793netbsd)
3794 3794
3795$as_echo "#define PREFER_GETPASS /**/" >>confdefs.h 3795$as_echo "#define PREFER_GETPASS /**/" >>confdefs.h
3796 3796
3797 ;; 3797 ;;
3798esac 3798esac
3799 3799
3800 3800
3801$as_echo "#define HAVE_CONFIG_H /**/" >>confdefs.h 
3802 
3803ac_config_files="$ac_config_files Makefile" 3801ac_config_files="$ac_config_files Makefile"
3804 3802
3805cat >confcache <<\_ACEOF 3803cat >confcache <<\_ACEOF
3806# This file is a shell script that caches the results of configure 3804# This file is a shell script that caches the results of configure
3807# tests run on this system so they can be shared between configure 3805# tests run on this system so they can be shared between configure
3808# scripts and configure runs, see configure's option --config-cache. 3806# scripts and configure runs, see configure's option --config-cache.
3809# It is not useful on other systems. If it contains results you don't 3807# It is not useful on other systems. If it contains results you don't
3810# want to keep, you may remove or edit it. 3808# want to keep, you may remove or edit it.
3811# 3809#
3812# config.status only pays attention to the cache file if you give it 3810# config.status only pays attention to the cache file if you give it
3813# the --recheck option to rerun configure. 3811# the --recheck option to rerun configure.
3814# 3812#
3815# `ac_cv_env_foo' variables (set or unset) will be overridden when 3813# `ac_cv_env_foo' variables (set or unset) will be overridden when
@@ -3871,28 +3869,26 @@ if diff "$cache_file" confcache >/dev/nu @@ -3871,28 +3869,26 @@ if diff "$cache_file" confcache >/dev/nu
3871$as_echo "$as_me: updating cache $cache_file" >&6;} 3869$as_echo "$as_me: updating cache $cache_file" >&6;}
3872 cat confcache >$cache_file 3870 cat confcache >$cache_file
3873 else 3871 else
3874 { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 3872 { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
3875$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} 3873$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
3876 fi 3874 fi
3877fi 3875fi
3878rm -f confcache 3876rm -f confcache
3879 3877
3880test "x$prefix" = xNONE && prefix=$ac_default_prefix 3878test "x$prefix" = xNONE && prefix=$ac_default_prefix
3881# Let make expand exec_prefix. 3879# Let make expand exec_prefix.
3882test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' 3880test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
3883 3881
3884DEFS=-DHAVE_CONFIG_H 
3885 
3886ac_libobjs= 3882ac_libobjs=
3887ac_ltlibobjs= 3883ac_ltlibobjs=
3888for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue 3884for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
3889 # 1. Remove the extension, and $U if already installed. 3885 # 1. Remove the extension, and $U if already installed.
3890 ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' 3886 ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
3891 ac_i=`$as_echo "$ac_i" | sed "$ac_script"` 3887 ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
3892 # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR 3888 # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR
3893 # will be set to the directory where LIBOBJS objects are built. 3889 # will be set to the directory where LIBOBJS objects are built.
3894 as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext" 3890 as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
3895 as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo' 3891 as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo'
3896done 3892done
3897LIBOBJS=$ac_libobjs 3893LIBOBJS=$ac_libobjs
3898 3894
cvs diff -r1.4 -r1.5 pkgsrc/net/fetch/files/configure.ac (expand / switch to unified diff)

--- pkgsrc/net/fetch/files/configure.ac 2010/06/24 22:51:00 1.4
+++ pkgsrc/net/fetch/files/configure.ac 2011/12/05 22:54:22 1.5
@@ -1,30 +1,29 @@ @@ -1,30 +1,29 @@
1dnl $NetBSD: configure.ac,v 1.4 2010/06/24 22:51:00 joerg Exp $ 1dnl $NetBSD: configure.ac,v 1.5 2011/12/05 22:54:22 joerg Exp $
2 2
3dnl Process this file with autoconf to produce a configure script. 3dnl Process this file with autoconf to produce a configure script.
4AC_PREREQ(2.52) 4AC_PREREQ(2.52)
5AC_INIT([fetch], [1.6], [joerg@NetBSD.org]) 5AC_INIT([fetch], [1.6], [joerg@NetBSD.org])
6AC_CONFIG_HEADER(config.h) 6AC_CONFIG_HEADER(config.h)
7 7
8AC_CANONICAL_HOST 8AC_CANONICAL_HOST
9 9
10AC_CHECK_HEADERS([sys/param.h sys/ioctl.h sys/socket.h sys/stat.h sys/time.h]) 10AC_CHECK_HEADERS([sys/param.h sys/ioctl.h sys/socket.h sys/stat.h sys/time.h])
11AC_CHECK_HEADERS([err.h stdint.h termios.h sysexists.h]) 11AC_CHECK_HEADERS([err.h stdint.h termios.h sysexists.h])
12 12
13AC_TYPE_INTMAX_T 13AC_TYPE_INTMAX_T
14 14
15AC_CHECK_FUNCS([getpass getpassphrase setproctitle]) 15AC_CHECK_FUNCS([getpass getpassphrase setproctitle])
16AC_CHECK_LIB(socket, socket) 16AC_CHECK_LIB(socket, socket)
17AC_CHECK_LIB(nsl, gethostbyname) 17AC_CHECK_LIB(nsl, gethostbyname)
18AC_CHECK_LIB(crypto, X509_get_issuer_name) 18AC_CHECK_LIB(crypto, X509_get_issuer_name)
19AC_CHECK_LIB(ssl, SSL_read) 19AC_CHECK_LIB(ssl, SSL_read)
20AC_CHECK_LIB(fetch, fetchGet) 20AC_CHECK_LIB(fetch, fetchGet)
21 21
22case "$host_os" in 22case "$host_os" in
23netbsd) 23netbsd)
24 AC_DEFINE([PREFER_GETPASS], [], [getpass supports long passwords]) 24 AC_DEFINE([PREFER_GETPASS], [], [getpass supports long passwords])
25 ;; 25 ;;
26esac 26esac
27 27
28AC_DEFINE([HAVE_CONFIG_H], [], [Include config.h]) 
29AC_CONFIG_FILES([Makefile]) 28AC_CONFIG_FILES([Makefile])
30AC_OUTPUT 29AC_OUTPUT