[svn-commits] branch group/menuselect r1148 -
/team/group/menuselect/
svn-commits at lists.digium.com
svn-commits at lists.digium.com
Tue Jun 20 09:23:35 MST 2006
Author: russell
Date: Tue Jun 20 11:23:34 2006
New Revision: 1148
URL: http://svn.digium.com/view/zaptel?rev=1148&view=rev
Log:
remove autoheader stuff since it's not being used
Removed:
team/group/menuselect/autoconfig.h.in
Modified:
team/group/menuselect/ (props changed)
team/group/menuselect/bootstrap.sh
team/group/menuselect/configure
team/group/menuselect/configure.ac
Propchange: team/group/menuselect/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Jun 20 11:23:34 2006
@@ -29,4 +29,3 @@
menuselect.makeopts
config.log
config.status
-autoconfig.h
Modified: team/group/menuselect/bootstrap.sh
URL: http://svn.digium.com/view/zaptel/team/group/menuselect/bootstrap.sh?rev=1148&r1=1147&r2=1148&view=diff
==============================================================================
--- team/group/menuselect/bootstrap.sh (original)
+++ team/group/menuselect/bootstrap.sh Tue Jun 20 11:23:34 2006
@@ -15,13 +15,11 @@
export AUTOMAKE_VERSION
check_for_app autoconf
-check_for_app autoheader
check_for_app automake
check_for_app aclocal
echo "Generating the configure script ..."
aclocal 2>/dev/null
autoconf
-autoheader
automake --add-missing --copy 2>/dev/null
exit 0
Modified: team/group/menuselect/configure
URL: http://svn.digium.com/view/zaptel/team/group/menuselect/configure?rev=1148&r1=1147&r2=1148&view=diff
==============================================================================
--- team/group/menuselect/configure (original)
+++ team/group/menuselect/configure Tue Jun 20 11:23:34 2006
@@ -1,5 +1,5 @@
#! /bin/sh
-# From configure.ac Revision: 1146 .
+# From configure.ac Revision: 1147 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.59e.
#
@@ -1685,8 +1685,7 @@
# specify output header file
-ac_config_headers="$ac_config_headers autoconfig.h"
-
+# AC_CONFIG_HEADER(autoconfig.h)
@@ -1711,11 +1710,14 @@
-
-
-
-
-
+#AH_TOP(
+#ifndef ZAPTEL_AUTOCONFIG_H
+#define ZAPTEL_AUTOCONFIG_H
+#)
+
+#AH_BOTTOM(
+#endif
+#)
# Checks for programs.
ac_ext=c
@@ -5186,7 +5188,37 @@
# Let make expand exec_prefix.
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-DEFS=-DHAVE_CONFIG_H
+# Transform confdefs.h into DEFS.
+# Protect against shell expansion while executing Makefile rules.
+# Protect against Makefile macro expansion.
+#
+# If the first sed substitution is executed (which looks for macros that
+# take arguments), then branch to the quote section. Otherwise,
+# look for a macro that doesn't take arguments.
+ac_script='
+t clear
+:clear
+s/^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\)/-D\1=\2/g
+t quote
+s/^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)/-D\1=\2/g
+t quote
+b any
+:quote
+s/[ `~#$^&*(){}\\|;'\''"<>?]/\\&/g
+s/\[/\\&/g
+s/\]/\\&/g
+s/\$/$$/g
+H
+:any
+${
+ g
+ s/^\n//
+ s/\n/ /g
+ p
+}
+'
+DEFS=`sed -n "$ac_script" confdefs.h`
+
ac_libobjs=
ac_ltlibobjs=
@@ -5508,7 +5540,6 @@
cat >>$CONFIG_STATUS <<_ACEOF
# Files that config.status was made for.
config_files="$ac_config_files"
-config_headers="$ac_config_headers"
_ACEOF
@@ -5526,14 +5557,9 @@
--recheck update $as_me by reconfiguring in the same conditions
--file=FILE[:TEMPLATE]
instantiate the configuration file FILE
- --header=FILE[:TEMPLATE]
- instantiate the configuration header FILE
Configuration files:
$config_files
-
-Configuration headers:
-$config_headers
Report bugs to <bug-autoconf at gnu.org>."
@@ -5584,16 +5610,7 @@
$ac_shift
CONFIG_FILES="$CONFIG_FILES $ac_optarg"
ac_need_defaults=false;;
- --header | --heade | --head | --hea )
- $ac_shift
- CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
- ac_need_defaults=false;;
- --he | --h)
- # Conflict between --help and --header
- { echo "$as_me: error: ambiguous option: $1
-Try \`$0 --help' for more information." >&2
- { (exit 1); exit 1; }; };;
- --help | --hel | -h )
+ --he | --h | --help | --hel | -h )
echo "$ac_cs_usage"; exit ;;
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
| -silent | --silent | --silen | --sile | --sil | --si | --s)
@@ -5648,7 +5665,6 @@
for ac_config_target in $ac_config_targets
do
case $ac_config_target in
- "autoconfig.h") CONFIG_HEADERS="$CONFIG_HEADERS autoconfig.h" ;;
"build_tools/menuselect-deps") CONFIG_FILES="$CONFIG_FILES build_tools/menuselect-deps" ;;
"makeopts") CONFIG_FILES="$CONFIG_FILES makeopts" ;;
@@ -5665,7 +5681,6 @@
# bizarre bug on SunOS 4.1.3.
if $ac_need_defaults; then
test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
- test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
fi
# Have a temporary directory for convenience. Make it in the build tree
@@ -5835,7 +5850,7 @@
fi # test -n "$CONFIG_FILES"
-for ac_tag in :F $CONFIG_FILES :H $CONFIG_HEADERS
+for ac_tag in :F $CONFIG_FILES
do
case $ac_tag in
:[FHLC]) ac_mode=$ac_tag; continue;;
@@ -6074,104 +6089,7 @@
*) rm -f "$ac_file"; mv "$tmp/out" $ac_file;;
esac
;;
- :H)
- #
- # CONFIG_HEADER
- #
-_ACEOF
-
-# Transform confdefs.h into a sed script `conftest.defines', that
-# substitutes the proper values into config.h.in to produce config.h.
-rm -f conftest.defines conftest.tail
-# First, append a space to every undef/define line, to ease matching.
-echo 's/$/ /' >conftest.defines
-# Then, protect against being on the right side of a sed subst, or in
-# an unquoted here document, in config.status. If some macros were
-# called several times there might be several #defines for the same
-# symbol, which is useless. But do not sort them, since the last
-# AC_DEFINE must be honored.
-ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
-# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where
-# NAME is the cpp macro being defined, VALUE is the value it is being given.
-# PARAMS is the parameter list in the macro definition--in most cases, it's
-# just an empty string.
-ac_dA='s,^\\([ #]*\\)[^ ]*\\([ ]*'
-ac_dB='\\)[ (].*,\\1define\\2'
-ac_dC=' '
-ac_dD=' ,'
-
-uniq confdefs.h |
- sed -n '
- t rset
- :rset
- s/^[ ]*#[ ]*define[ ][ ]*//
- t ok
- d
- :ok
- s/[\\&,]/\\&/g
- s/^\('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p
- s/^\('"$ac_word_re"'\)[ ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p
- ' >>conftest.defines
-
-# Remove the space that was appended to ease matching.
-# Then replace #undef with comments. This is necessary, for
-# example, in the case of _POSIX_SOURCE, which is predefined and required
-# on some systems where configure will not decide to define it.
-# (The regexp can be short, since the line contains either #define or #undef.)
-echo 's/ $//
-s,^[ #]*u.*,/* & */,' >>conftest.defines
-
-# Break up conftest.defines:
-ac_max_sed_lines=50
-
-# First sed command is: sed -f defines.sed $ac_file_inputs >"$tmp/out1"
-# Second one is: sed -f defines.sed "$tmp/out1" >"$tmp/out2"
-# Third one will be: sed -f defines.sed "$tmp/out2" >"$tmp/out1"
-# et cetera.
-ac_in='$ac_file_inputs'
-ac_out='"$tmp/out1"'
-ac_nxt='"$tmp/out2"'
-
-while :
-do
- # Write a here document:
- cat >>$CONFIG_STATUS <<_ACEOF
- # First, check the format of the line:
- cat >"\$tmp/defines.sed" <<\\CEOF
-/^[ ]*#[ ]*undef[ ][ ]*$ac_word_re[ ]*\$/b def
-/^[ ]*#[ ]*define[ ][ ]*$ac_word_re[( ]/b def
-b
-:def
-_ACEOF
- sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS
- echo 'CEOF
- sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS
- ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in
- sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail
- grep . conftest.tail >/dev/null || break
- rm -f conftest.defines
- mv conftest.tail conftest.defines
-done
-rm -f conftest.defines conftest.tail
-
-echo "ac_result=$ac_in" >>$CONFIG_STATUS
-cat >>$CONFIG_STATUS <<\_ACEOF
- if test x"$ac_file" != x-; then
- echo "/* $configure_input */" >"$tmp/config.h"
- cat "$ac_result" >>"$tmp/config.h"
- if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then
- { echo "$as_me:$LINENO: $ac_file is unchanged" >&5
-echo "$as_me: $ac_file is unchanged" >&6;}
- else
- rm -f $ac_file
- mv "$tmp/config.h" $ac_file
- fi
- else
- echo "/* $configure_input */"
- cat "$ac_result"
- fi
- rm -f "$tmp/out12"
- ;;
+
esac
Modified: team/group/menuselect/configure.ac
URL: http://svn.digium.com/view/zaptel/team/group/menuselect/configure.ac?rev=1148&r1=1147&r2=1148&view=diff
==============================================================================
--- team/group/menuselect/configure.ac (original)
+++ team/group/menuselect/configure.ac Tue Jun 20 11:23:34 2006
@@ -10,9 +10,6 @@
# check existence of the package
AC_CONFIG_SRCDIR([zaptel.c])
-
-# specify output header file
-AC_CONFIG_HEADER(autoconfig.h)
AC_COPYRIGHT("Zaptel")
AC_REVISION($Revision$)
@@ -31,15 +28,6 @@
# This needs to be before any macros that use the C compiler
AC_GNU_SOURCE
-
-AH_TOP(
-#ifndef ZAPTEL_AUTOCONFIG_H
-#define ZAPTEL_AUTOCONFIG_H
-)
-
-AH_BOTTOM(
-#endif
-)
# Checks for programs.
AC_PROG_CC
More information about the svn-commits
mailing list