Menu
▾
▴
[bchat-cvs] CVS: bchat2 ChangeLog,1.7,1.8 config.h.in,1.2,1.3 configure,1.3,1.4 configure.ac,1.4,1.5
|
From: Piotr Esden-T. <we...@ap...> - 2001-10-26 23:00:58
|
Update of /var/lib/cvs/bchat2
In directory apollo:/tmp/cvs-serv10430
Modified Files:
ChangeLog config.h.in configure configure.ac
Log Message:
* configure.ac: checking for some more headers, cosmetic changes
Index: ChangeLog
===================================================================
RCS file: /var/lib/cvs/bchat2/ChangeLog,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- ChangeLog 26 Oct 2001 22:31:34 -0000 1.7
+++ ChangeLog 26 Oct 2001 23:00:45 -0000 1.8
@@ -1,4 +1,7 @@
+Sat Oct 27 01:00:50 CEST 2001 Piotr Esden-Tempski <pe...@bi...>
+
+ * configure.ac: checking for some more headers, cosmetic changes
Sat Oct 27 00:15:41 CEST 2001 Piotr Esden-Tempski <pe...@bi...>
* configure.ac: added configure --with-config and --with-conffile
Index: config.h.in
===================================================================
RCS file: /var/lib/cvs/bchat2/config.h.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- config.h.in 26 Oct 2001 22:31:34 -0000 1.2
+++ config.h.in 26 Oct 2001 23:00:45 -0000 1.3
@@ -6,8 +6,17 @@
/* Which path to use as bChat2 config file directory */
#undef CONFIG_PATH
-/* Define if you have the <iostream.h> header file. */
-#undef HAVE_IOSTREAM_H
+/* Define if you have the <fstream> header file. */
+#undef HAVE_FSTREAM
+
+/* Define if you have the <iostream> header file. */
+#undef HAVE_IOSTREAM
+
+/* Define if you have the <map> header file. */
+#undef HAVE_MAP
+
+/* Define if you have the <string> header file. */
+#undef HAVE_STRING
/* Name of package */
#undef PACKAGE
Index: configure
===================================================================
RCS file: /var/lib/cvs/bchat2/configure,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- configure 26 Oct 2001 22:31:34 -0000 1.3
+++ configure 26 Oct 2001 23:00:45 -0000 1.4
@@ -2061,7 +2061,7 @@
# Checks for header files.
-for ac_header in iostream.h
+for ac_header in iostream
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
echo "$as_me:2067: checking for $ac_header" >&5
@@ -2107,8 +2107,164 @@
EOF
else
- { { echo "$as_me:2110: error: Whoops, without iostream.h I want to scream." >&5
-echo "$as_me: error: Whoops, without iostream.h I want to scream." >&2;}
+ { { echo "$as_me:2110: error: Whoops, without iostream I want to scream." >&5
+echo "$as_me: error: Whoops, without iostream I want to scream." >&2;}
+ { (exit 1); exit 1; }; }
+fi
+done
+
+for ac_header in fstream
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+echo "$as_me:2119: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+#line 2125 "configure"
+#include "confdefs.h"
+#include <$ac_header>
+_ACEOF
+if { (eval echo "$as_me:2129: \"$ac_cpp conftest.$ac_ext\"") >&5
+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+ ac_status=$?
+ egrep -v '^ *\+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:2135: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_cxx_preproc_warn_flag
+ else
+ ac_cpp_err=
+ fi
+else
+ ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+ eval "$as_ac_Header=yes"
+else
+ echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ eval "$as_ac_Header=no"
+fi
+rm -f conftest.err conftest.$ac_ext
+fi
+echo "$as_me:2154: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ cat >>confdefs.h <<EOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+EOF
+
+else
+ { { echo "$as_me:2162: error: Whoops, without fstream I want to scream." >&5
+echo "$as_me: error: Whoops, without fstream I want to scream." >&2;}
+ { (exit 1); exit 1; }; }
+fi
+done
+
+for ac_header in string
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+echo "$as_me:2171: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+#line 2177 "configure"
+#include "confdefs.h"
+#include <$ac_header>
+_ACEOF
+if { (eval echo "$as_me:2181: \"$ac_cpp conftest.$ac_ext\"") >&5
+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+ ac_status=$?
+ egrep -v '^ *\+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:2187: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_cxx_preproc_warn_flag
+ else
+ ac_cpp_err=
+ fi
+else
+ ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+ eval "$as_ac_Header=yes"
+else
+ echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ eval "$as_ac_Header=no"
+fi
+rm -f conftest.err conftest.$ac_ext
+fi
+echo "$as_me:2206: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ cat >>confdefs.h <<EOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+EOF
+
+else
+ { { echo "$as_me:2214: error: Whoops, without string I want to scream." >&5
+echo "$as_me: error: Whoops, without string I want to scream." >&2;}
+ { (exit 1); exit 1; }; }
+fi
+done
+
+for ac_header in map
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+echo "$as_me:2223: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+#line 2229 "configure"
+#include "confdefs.h"
+#include <$ac_header>
+_ACEOF
+if { (eval echo "$as_me:2233: \"$ac_cpp conftest.$ac_ext\"") >&5
+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+ ac_status=$?
+ egrep -v '^ *\+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:2239: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_cxx_preproc_warn_flag
+ else
+ ac_cpp_err=
+ fi
+else
+ ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+ eval "$as_ac_Header=yes"
+else
+ echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ eval "$as_ac_Header=no"
+fi
+rm -f conftest.err conftest.$ac_ext
+fi
+echo "$as_me:2258: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ cat >>confdefs.h <<EOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+EOF
+
+else
+ { { echo "$as_me:2266: error: Whoops, without map I want to scream." >&5
+echo "$as_me: error: Whoops, without map I want to scream." >&2;}
{ (exit 1); exit 1; }; }
fi
done
@@ -2230,7 +2386,7 @@
: ${CONFIG_STATUS=./config.status}
ac_clean_files_save=$ac_clean_files
ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:2233: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:2389: creating $CONFIG_STATUS" >&5
echo "$as_me: creating $CONFIG_STATUS" >&6;}
cat >$CONFIG_STATUS <<_ACEOF
#! $SHELL
@@ -2406,7 +2562,7 @@
echo "$ac_cs_version"; exit 0 ;;
--he | --h)
# Conflict between --help and --header
- { { echo "$as_me:2409: error: ambiguous option: $1
+ { { echo "$as_me:2565: error: ambiguous option: $1
Try \`$0 --help' for more information." >&5
echo "$as_me: error: ambiguous option: $1
Try \`$0 --help' for more information." >&2;}
@@ -2425,7 +2581,7 @@
ac_need_defaults=false;;
# This is an error.
- -*) { { echo "$as_me:2428: error: unrecognized option: $1
+ -*) { { echo "$as_me:2584: error: unrecognized option: $1
Try \`$0 --help' for more information." >&5
echo "$as_me: error: unrecognized option: $1
Try \`$0 --help' for more information." >&2;}
@@ -2474,7 +2630,7 @@
"src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
"default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
"src/config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS src/config.h:config.h.in" ;;
- *) { { echo "$as_me:2477: error: invalid argument: $ac_config_target" >&5
+ *) { { echo "$as_me:2633: error: invalid argument: $ac_config_target" >&5
echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
{ (exit 1); exit 1; }; };;
esac
@@ -2700,7 +2856,7 @@
esac
if test x"$ac_file" != x-; then
- { echo "$as_me:2703: creating $ac_file" >&5
+ { echo "$as_me:2859: creating $ac_file" >&5
echo "$as_me: creating $ac_file" >&6;}
rm -f "$ac_file"
fi
@@ -2718,7 +2874,7 @@
-) echo $tmp/stdin ;;
[\\/$]*)
# Absolute (can't be DOS-style, as IFS=:)
- test -f "$f" || { { echo "$as_me:2721: error: cannot find input file: $f" >&5
+ test -f "$f" || { { echo "$as_me:2877: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
echo $f;;
@@ -2731,7 +2887,7 @@
echo $srcdir/$f
else
# /dev/null tree
- { { echo "$as_me:2734: error: cannot find input file: $f" >&5
+ { { echo "$as_me:2890: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
fi;;
@@ -2792,7 +2948,7 @@
* ) ac_file_in=$ac_file.in ;;
esac
- test x"$ac_file" != x- && { echo "$as_me:2795: creating $ac_file" >&5
+ test x"$ac_file" != x- && { echo "$as_me:2951: creating $ac_file" >&5
echo "$as_me: creating $ac_file" >&6;}
# First look for the input files in the build tree, otherwise in the
@@ -2803,7 +2959,7 @@
-) echo $tmp/stdin ;;
[\\/$]*)
# Absolute (can't be DOS-style, as IFS=:)
- test -f "$f" || { { echo "$as_me:2806: error: cannot find input file: $f" >&5
+ test -f "$f" || { { echo "$as_me:2962: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
echo $f;;
@@ -2816,7 +2972,7 @@
echo $srcdir/$f
else
# /dev/null tree
- { { echo "$as_me:2819: error: cannot find input file: $f" >&5
+ { { echo "$as_me:2975: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
fi;;
@@ -2933,7 +3089,7 @@
rm -f $tmp/in
if test x"$ac_file" != x-; then
if cmp -s $ac_file $tmp/config.h 2>/dev/null; then
- { echo "$as_me:2936: $ac_file is unchanged" >&5
+ { echo "$as_me:3092: $ac_file is unchanged" >&5
echo "$as_me: $ac_file is unchanged" >&6;}
else
ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
Index: configure.ac
===================================================================
RCS file: /var/lib/cvs/bchat2/configure.ac,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- configure.ac 26 Oct 2001 22:31:34 -0000 1.4
+++ configure.ac 26 Oct 2001 23:00:45 -0000 1.5
@@ -30,7 +30,10 @@
# Checks for libraries.
# Checks for header files.
-AC_CHECK_HEADERS(iostream.h,,[AC_MSG_ERROR([Whoops, without iostream.h I want to scream.])])
+AC_CHECK_HEADERS(iostream,,[AC_MSG_ERROR([Whoops, without iostream I want to scream.])])
+AC_CHECK_HEADERS(fstream,,[AC_MSG_ERROR([Whoops, without fstream I want to scream.])])
+AC_CHECK_HEADERS(string,,[AC_MSG_ERROR([Whoops, without string I want to scream.])])
+AC_CHECK_HEADERS(map,,[AC_MSG_ERROR([Whoops, without map I want to scream.])])
# Check for commandline params
AC_ARG_WITH(config,[ --with-config Directory bChat2 will look for its configfile at default (default: /etc/bchat2)])
|