[zaptel-commits] branch group/menuselect r1144 -
/team/group/menuselect/
zaptel-commits at lists.digium.com
zaptel-commits at lists.digium.com
Tue Jun 20 08:13:20 MST 2006
Author: russell
Date: Tue Jun 20 10:13:20 2006
New Revision: 1144
URL: http://svn.digium.com/view/zaptel?rev=1144&view=rev
Log:
various updates
Modified:
team/group/menuselect/Makefile
team/group/menuselect/autoconfig.h.in
team/group/menuselect/configure
team/group/menuselect/configure.ac
team/group/menuselect/makeopts.in
Modified: team/group/menuselect/Makefile
URL: http://svn.digium.com/view/zaptel/team/group/menuselect/Makefile?rev=1144&r1=1143&r2=1144&view=diff
==============================================================================
--- team/group/menuselect/Makefile (original)
+++ team/group/menuselect/Makefile Tue Jun 20 10:13:20 2006
@@ -348,13 +348,13 @@
endif
install: all devices
- install -D -m 755 ztcfg $(INSTALL_PREFIX)/sbin/ztcfg
+ $(INSTALL) -D -m 755 ztcfg $(INSTALL_PREFIX)/sbin/ztcfg
if [ -f sethdlc-new ]; then \
- install -D -m 755 sethdlc-new $(INSTALL_PREFIX)/sbin/sethdlc; \
+ $(INSTALL) -D -m 755 sethdlc-new $(INSTALL_PREFIX)/sbin/sethdlc; \
elif [ -f sethdlc ]; then \
- install -D -m 755 sethdlc $(INSTALL_PREFIX)/sbin/sethdlc ; \
- fi
- if [ -f zttool ]; then install -D -m 755 zttool $(INSTALL_PREFIX)/sbin/zttool; fi
+ $(INSTALL) -D -m 755 sethdlc $(INSTALL_PREFIX)/sbin/sethdlc ; \
+ fi
+ if [ -f zttool ]; then $(INSTALL) -D -m 755 zttool $(INSTALL_PREFIX)/sbin/zttool; fi
ifeq ($(BUILDVER),linux26)
for x in $(MODULESKO); do \
rm -f $(INSTALL_PREFIX)/lib/modules/$(KVERS)/extra/$$x ; \
@@ -367,28 +367,28 @@
fi
else
for x in $(MODULESO); do \
- install -D -m 644 $$x $(INSTALL_PREFIX)/lib/modules/$(KVERS)/misc/$$x ; \
+ $(INSTALL) -D -m 644 $$x $(INSTALL_PREFIX)/lib/modules/$(KVERS)/misc/$$x ; \
done
endif
if ! [ -f wcfxsusb.o ]; then \
rm -f $(INSTALL_PREFIX)/lib/modules/$(KVERS)/misc/wcfxsusb.o; \
fi; \
rm -f $(INSTALL_PREFIX)/lib/modules/$(KVERS)/misc/wcfxs.o
- install -D -m 755 $(LIBTONEZONE_SO) $(INSTALL_PREFIX)/usr/lib/$(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER).$(LIBTONEZONE_SO_MINOR_VER)
+ $(INSTALL) -D -m 755 $(LIBTONEZONE_SO) $(INSTALL_PREFIX)/usr/lib/$(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER).$(LIBTONEZONE_SO_MINOR_VER)
[ `id -u` = 0 ] && /sbin/ldconfig || :
rm -f $(INSTALL_PREFIX)/usr/lib/$(LIBTONEZONE_SO)
- ln -sf $(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER).$(LIBTONEZONE_SO_MINOR_VER) \
+ $(LN) -sf $(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER).$(LIBTONEZONE_SO_MINOR_VER) \
$(INSTALL_PREFIX)/usr/lib/$(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER)
- ln -sf $(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER).$(LIBTONEZONE_SO_MINOR_VER) \
+ $(LN) -sf $(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER).$(LIBTONEZONE_SO_MINOR_VER) \
$(INSTALL_PREFIX)/usr/lib/$(LIBTONEZONE_SO)
if [ -x /usr/sbin/sestatus ] && (/usr/sbin/sestatus | grep "SELinux status:" | grep -q "enabled") ; then restorecon -v $(INSTALL_PREFIX)/usr/lib/$(LIBTONEZONE_SO); fi
- install -D -m 644 zaptel.h $(INSTALL_PREFIX)/usr/include/linux/zaptel.h
- install -D -m 644 torisa.h $(INSTALL_PREFIX)/usr/include/linux/torisa.h
- install -D -m 644 tonezone.h $(INSTALL_PREFIX)/usr/include/tonezone.h
- install -m 644 doc/ztcfg.8 $(INSTALL_PREFIX)/usr/share/man/man8
- install -m 644 doc/zttool.8 $(INSTALL_PREFIX)/usr/share/man/man8
+ $(INSTALL) -D -m 644 zaptel.h $(INSTALL_PREFIX)/usr/include/linux/zaptel.h
+ $(INSTALL) -D -m 644 torisa.h $(INSTALL_PREFIX)/usr/include/linux/torisa.h
+ $(INSTALL) -D -m 644 tonezone.h $(INSTALL_PREFIX)/usr/include/tonezone.h
+ $(INSTALL) -m 644 doc/ztcfg.8 $(INSTALL_PREFIX)/usr/share/man/man8
+ $(INSTALL) -m 644 doc/zttool.8 $(INSTALL_PREFIX)/usr/share/man/man8
[ `id -u` = 0 ] && /sbin/depmod -a $(KVERS) || :
- [ -f $(CONFIG_FILE) ] || install -D -m 644 zaptel.conf.sample $(CONFIG_FILE)
+ [ -f $(CONFIG_FILE) ] || $(INSTALL) -D -m 644 zaptel.conf.sample $(CONFIG_FILE)
build_tools/genmodconf $(BUILDVER) "$(ROOT_PREFIX)" "$(filter-out zaptel,$(MODULES))"
@if [ -d /etc/modutils ]; then \
/sbin/update-modules ; \
@@ -398,20 +398,20 @@
config:
if [ -d $(INSTALL_PREFIX)/etc/rc.d/init.d ]; then \
- install -D -m 755 zaptel.init $(INSTALL_PREFIX)/etc/rc.d/init.d/zaptel; \
+ $(INSTALL) -D -m 755 zaptel.init $(INSTALL_PREFIX)/etc/rc.d/init.d/zaptel; \
$(CHKCONFIG) --add zaptel; \
elif [ -d $(INSTALL_PREFIX)/etc/init.d ]; then \
- install -D -m 755 zaptel.init $(INSTALL_PREFIX)/etc/init.d/zaptel; \
+ $(INSTALL) -D -m 755 zaptel.init $(INSTALL_PREFIX)/etc/init.d/zaptel; \
$(CHKCONFIG) --add zaptel; \
fi
if [ -d /etc/default ] && [ ! -f /etc/default/zaptel ]; then \
- install -D -m 644 zaptel.sysconfig $(INSTALL_PREFIX)/etc/default/zaptel; \
+ $(INSTALL) -D -m 644 zaptel.sysconfig $(INSTALL_PREFIX)/etc/default/zaptel; \
fi
if [ -d /etc/sysconfig ] && [ ! -f /etc/sysconfig/zaptel ]; then \
- install -D -m 644 zaptel.sysconfig $(INSTALL_PREFIX)/etc/sysconfig/zaptel; \
+ $(INSTALL) -D -m 644 zaptel.sysconfig $(INSTALL_PREFIX)/etc/sysconfig/zaptel; \
fi
if [ -d /etc/sysconfig/network-scripts ]; then \
- install -D -m 755 ifup-hdlc $(INSTALL_PREFIX)/etc/sysconfig/network-scripts/ifup-hdlc; \
+ $(INSTALL) -D -m 755 ifup-hdlc $(INSTALL_PREFIX)/etc/sysconfig/network-scripts/ifup-hdlc; \
fi
update:
@@ -430,18 +430,18 @@
# make should *fail* and not silently succeed if a program did not build
install-programs: $(BINS) $(LIBTONEZONE) libtonezone.a
- install -d $(BIN_DIR)
- install $(BINS) $(BIN_DIR)
- install -d $(LIB_DIR)
- install -m 755 $(LIBTONEZONE) libtonezone.a $(LIB_DIR)
- install -d $(INC_DIR)/linux
- install -m 644 tonezone.h $(INC_DIR)
- install -m 644 zaptel.h torisa.h $(INC_DIR)/linux
+ $(INSTALL) -d $(BIN_DIR)
+ $(INSTALL) $(BINS) $(BIN_DIR)
+ $(INSTALL) -d $(LIB_DIR)
+ $(INSTALL) -m 755 $(LIBTONEZONE) libtonezone.a $(LIB_DIR)
+ $(INSTALL) -d $(INC_DIR)/linux
+ $(INSTALL) -m 644 tonezone.h $(INC_DIR)
+ $(INSTALL) -m 644 zaptel.h torisa.h $(INC_DIR)/linux
install-modules: install-$(BUILDVER)
install-linux24: vpm450m_fw.h.o$(MODULES_BUILD)
- install -d $(MOD_DIR)
- install -m 644 $(MODULES_BUILD) $(MOD_DIR)
+ $(INSTALL) -d $(MOD_DIR)
+ $(INSTALL) -m 644 $(MODULES_BUILD) $(MOD_DIR)
install-linux26: $(MODULESKO)
$(KMAKE_INST)
Modified: team/group/menuselect/autoconfig.h.in
URL: http://svn.digium.com/view/zaptel/team/group/menuselect/autoconfig.h.in?rev=1144&r1=1143&r2=1144&view=diff
==============================================================================
--- team/group/menuselect/autoconfig.h.in (original)
+++ team/group/menuselect/autoconfig.h.in Tue Jun 20 10:13:20 2006
@@ -58,15 +58,6 @@
/* Define to 1 if you have the ANSI C header files. */
#undef STDC_HEADERS
-/* Define this to be the name of the CPU of your system. */
-#undef ZAP_CPU
-
-/* Define this to be the canonical name (cpu-vendor-os) of your system. */
-#undef ZAP_PLATFORM
-
-/* Define this to be the name of the vendor of your system. */
-#undef ZAP_VENDOR
-
/* Enable GNU extensions on systems that have them. */
#ifndef _GNU_SOURCE
# undef _GNU_SOURCE
Modified: team/group/menuselect/configure
URL: http://svn.digium.com/view/zaptel/team/group/menuselect/configure?rev=1144&r1=1143&r2=1144&view=diff
==============================================================================
--- team/group/menuselect/configure (original)
+++ team/group/menuselect/configure Tue Jun 20 10:13:20 2006
@@ -1,5 +1,5 @@
#! /bin/sh
-# From configure.ac Revision: 33995 .
+# From configure.ac Revision: 1138 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.59e.
#
@@ -639,21 +639,6 @@
build_alias
host_alias
target_alias
-build
-build_cpu
-build_vendor
-build_os
-host
-host_cpu
-host_vendor
-host_os
-target
-target_cpu
-target_vendor
-target_os
-ZAP_PLATFORM
-ZAP_CPU
-ZAP_VENDOR
CC
CXX
RANLIB
@@ -1263,11 +1248,6 @@
_ACEOF
cat <<\_ACEOF
-
-System types:
- --build=BUILD configure for building on BUILD [guessed]
- --host=HOST cross-compile to build programs to run on HOST [BUILD]
- --target=TARGET configure for building compilers for TARGET [HOST]
_ACEOF
fi
@@ -1719,165 +1699,6 @@
-# cross-compile macros
-ac_aux_dir=
-for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
- if test -f "$ac_dir/install-sh"; then
- ac_aux_dir=$ac_dir
- ac_install_sh="$ac_aux_dir/install-sh -c"
- break
- elif test -f "$ac_dir/install.sh"; then
- ac_aux_dir=$ac_dir
- ac_install_sh="$ac_aux_dir/install.sh -c"
- break
- elif test -f "$ac_dir/shtool"; then
- ac_aux_dir=$ac_dir
- ac_install_sh="$ac_aux_dir/shtool install -c"
- break
- fi
-done
-if test -z "$ac_aux_dir"; then
- { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
-echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;}
- { (exit 1); exit 1; }; }
-fi
-
-# These three variables are undocumented and unsupported,
-# and are intended to be withdrawn in a future Autoconf release.
-# They can cause serious problems if a builder's source tree is in a directory
-# whose full name contains unusual characters.
-ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var.
-ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var.
-ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
-
-
-# Make sure we can run config.sub.
-$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
- { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
-echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
- { (exit 1); exit 1; }; }
-
-{ echo "$as_me:$LINENO: checking build system type" >&5
-echo $ECHO_N "checking build system type... $ECHO_C" >&6; }
-if test "${ac_cv_build+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_build_alias=$build_alias
-test "x$ac_build_alias" = x &&
- ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
-test "x$ac_build_alias" = x &&
- { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
-echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
- { (exit 1); exit 1; }; }
-ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
- { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
-echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
- { (exit 1); exit 1; }; }
-
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5
-echo "${ECHO_T}$ac_cv_build" >&6; }
-case $ac_cv_build in
-*-*-*) ;;
-*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
-echo "$as_me: error: invalid value of canonical build" >&2;}
- { (exit 1); exit 1; }; };;
-esac
-build=$ac_cv_build
-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_build
-shift
-build_cpu=$1
-build_vendor=$2
-shift; shift
-# Remember, the first character of IFS is used to create $*,
-# except with old shells:
-build_os=$*
-IFS=$ac_save_IFS
-case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
-
-
-{ echo "$as_me:$LINENO: checking host system type" >&5
-echo $ECHO_N "checking host system type... $ECHO_C" >&6; }
-if test "${ac_cv_host+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test "x$host_alias" = x; then
- ac_cv_host=$ac_cv_build
-else
- ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
- { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
-echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
- { (exit 1); exit 1; }; }
-fi
-
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5
-echo "${ECHO_T}$ac_cv_host" >&6; }
-case $ac_cv_host in
-*-*-*) ;;
-*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
-echo "$as_me: error: invalid value of canonical host" >&2;}
- { (exit 1); exit 1; }; };;
-esac
-host=$ac_cv_host
-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_host
-shift
-host_cpu=$1
-host_vendor=$2
-shift; shift
-# Remember, the first character of IFS is used to create $*,
-# except with old shells:
-host_os=$*
-IFS=$ac_save_IFS
-case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
-
-
-{ echo "$as_me:$LINENO: checking target system type" >&5
-echo $ECHO_N "checking target system type... $ECHO_C" >&6; }
-if test "${ac_cv_target+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test "x$target_alias" = x; then
- ac_cv_target=$ac_cv_host
-else
- ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` ||
- { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&5
-echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&2;}
- { (exit 1); exit 1; }; }
-fi
-
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_target" >&5
-echo "${ECHO_T}$ac_cv_target" >&6; }
-case $ac_cv_target in
-*-*-*) ;;
-*) { { echo "$as_me:$LINENO: error: invalid value of canonical target" >&5
-echo "$as_me: error: invalid value of canonical target" >&2;}
- { (exit 1); exit 1; }; };;
-esac
-target=$ac_cv_target
-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_target
-shift
-target_cpu=$1
-target_vendor=$2
-shift; shift
-# Remember, the first character of IFS is used to create $*,
-# except with old shells:
-target_os=$*
-IFS=$ac_save_IFS
-case $target_os in *\ *) target_os=`echo "$target_os" | sed 's/ /-/g'`;; esac
-
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-test -n "$target_alias" &&
- test "$program_prefix$program_suffix$program_transform_name" = \
- NONENONEs,x,x, &&
- program_prefix=${target_alias}-
-
# check existence of the package
@@ -1899,31 +1720,6 @@
if test ${localstatedir} = '${prefix}/var'; then
localstatedir=/var
fi
-
-### ** Platform.
-
-cat >>confdefs.h <<_ACEOF
-#define ZAP_PLATFORM "${host}"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define ZAP_CPU "${host_cpu}"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define ZAP_VENDOR "${host_vendor}"
-_ACEOF
-
-
-# export some useful defines
-ZAP_PLATFORM=${host}
-ZAP_CPU=${host_cpu}
-ZAP_VENDOR=${host_vendor}
-
-
-
# This needs to be before any macros that use the C compiler
@@ -4311,6 +4107,37 @@
test -n "$AWK" && break
done
+
+ac_aux_dir=
+for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
+ if test -f "$ac_dir/install-sh"; then
+ ac_aux_dir=$ac_dir
+ ac_install_sh="$ac_aux_dir/install-sh -c"
+ break
+ elif test -f "$ac_dir/install.sh"; then
+ ac_aux_dir=$ac_dir
+ ac_install_sh="$ac_aux_dir/install.sh -c"
+ break
+ elif test -f "$ac_dir/shtool"; then
+ ac_aux_dir=$ac_dir
+ ac_install_sh="$ac_aux_dir/shtool install -c"
+ break
+ fi
+done
+if test -z "$ac_aux_dir"; then
+ { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
+echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;}
+ { (exit 1); exit 1; }; }
+fi
+
+# These three variables are undocumented and unsupported,
+# and are intended to be withdrawn in a future Autoconf release.
+# They can cause serious problems if a builder's source tree is in a directory
+# whose full name contains unusual characters.
+ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var.
+ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var.
+ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
+
# Find a good install program. We prefer a C program (faster),
# so one script is as good as another. But avoid the broken or
@@ -7360,21 +7187,6 @@
build_alias!$build_alias$ac_delim
host_alias!$host_alias$ac_delim
target_alias!$target_alias$ac_delim
-build!$build$ac_delim
-build_cpu!$build_cpu$ac_delim
-build_vendor!$build_vendor$ac_delim
-build_os!$build_os$ac_delim
-host!$host$ac_delim
-host_cpu!$host_cpu$ac_delim
-host_vendor!$host_vendor$ac_delim
-host_os!$host_os$ac_delim
-target!$target$ac_delim
-target_cpu!$target_cpu$ac_delim
-target_vendor!$target_vendor$ac_delim
-target_os!$target_os$ac_delim
-ZAP_PLATFORM!$ZAP_PLATFORM$ac_delim
-ZAP_CPU!$ZAP_CPU$ac_delim
-ZAP_VENDOR!$ZAP_VENDOR$ac_delim
CC!$CC$ac_delim
CXX!$CXX$ac_delim
RANLIB!$RANLIB$ac_delim
@@ -7415,7 +7227,7 @@
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 90; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 75; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
@@ -7844,11 +7656,5 @@
fi
-echo "Package configured for: "
-echo " Host CPU : $host_cpu"
-if test "x${crossCompile}" = xYes; then
- echo ""
- echo " Cross Compilation = YES"
- echo " Target = ${host}"
-fi
-
+echo "*** Zaptel build successfully configured ***"
+
Modified: team/group/menuselect/configure.ac
URL: http://svn.digium.com/view/zaptel/team/group/menuselect/configure.ac?rev=1144&r1=1143&r2=1144&view=diff
==============================================================================
--- team/group/menuselect/configure.ac (original)
+++ team/group/menuselect/configure.ac Tue Jun 20 10:13:20 2006
@@ -7,11 +7,6 @@
[\([0-9.]*\)\(\w\|\W\)*],
[\1]))
AC_INIT(zaptel, ZAP_VERSION, www.asterisk.org)
-
-# cross-compile macros
-AC_CANONICAL_BUILD
-AC_CANONICAL_HOST
-AC_CANONICAL_TARGET
# check existence of the package
AC_CONFIG_SRCDIR([zaptel.c])
@@ -33,22 +28,6 @@
if test ${localstatedir} = '${prefix}/var'; then
localstatedir=/var
fi
-
-### ** Platform.
-AC_DEFINE_UNQUOTED(ZAP_PLATFORM, "${host}",
-[Define this to be the canonical name (cpu-vendor-os) of your system.])
-AC_DEFINE_UNQUOTED(ZAP_CPU, "${host_cpu}",
-[Define this to be the name of the CPU of your system.])
-AC_DEFINE_UNQUOTED(ZAP_VENDOR, "${host_vendor}",
-[Define this to be the name of the vendor of your system.])
-
-# export some useful defines
-ZAP_PLATFORM=${host}
-ZAP_CPU=${host_cpu}
-ZAP_VENDOR=${host_vendor}
-AC_SUBST(ZAP_PLATFORM)
-AC_SUBST(ZAP_CPU)
-AC_SUBST(ZAP_VENDOR)
# This needs to be before any macros that use the C compiler
AC_GNU_SOURCE
@@ -102,11 +81,5 @@
AC_CONFIG_FILES([build_tools/menuselect-deps makeopts])
AC_OUTPUT
-echo "Package configured for: "
-echo " Host CPU : $host_cpu"
-if test "x${crossCompile}" = xYes; then
- echo ""
- echo " Cross Compilation = YES"
- echo " Target = ${host}"
-fi
+echo "*** Zaptel build successfully configured ***"
Modified: team/group/menuselect/makeopts.in
URL: http://svn.digium.com/view/zaptel/team/group/menuselect/makeopts.in?rev=1144&r1=1143&r2=1144&view=diff
==============================================================================
--- team/group/menuselect/makeopts.in (original)
+++ team/group/menuselect/makeopts.in Tue Jun 20 10:13:20 2006
@@ -11,9 +11,6 @@
BASENAME=@BASENAME@
SHELL=@SHELL@
LN=@LN@
-
-CROSS_PROC=@ZAP_CPU@
-PROC=@ZAP_CPU@
prefix = @prefix@
exec_prefix = @exec_prefix@
More information about the zaptel-commits
mailing list