[Freeswitch-svn] [commit] r1803 - freeswitch/branches/stkn
Freeswitch SVN
stkn at freeswitch.org
Sun Jul 9 23:56:03 EDT 2006
Author: stkn
Date: Sun Jul 9 23:56:02 2006
New Revision: 1803
Modified:
freeswitch/branches/stkn/Makefile.am
freeswitch/branches/stkn/Makefile.in
freeswitch/branches/stkn/configure
freeswitch/branches/stkn/configure.in
Log:
Add conditional for gcc, enable -fsigned-char only on linux ppc systems with GNU C compiler
Modified: freeswitch/branches/stkn/Makefile.am
==============================================================================
--- freeswitch/branches/stkn/Makefile.am (original)
+++ freeswitch/branches/stkn/Makefile.am Sun Jul 9 23:56:02 2006
@@ -20,7 +20,9 @@
AM_LDFLAGS += -Wl,-E
if ISPPC
+if ISGCC
AM_CFLAGS += -fsigned-char
+endif
endif
endif
Modified: freeswitch/branches/stkn/Makefile.in
==============================================================================
--- freeswitch/branches/stkn/Makefile.in (original)
+++ freeswitch/branches/stkn/Makefile.in Sun Jul 9 23:56:02 2006
@@ -40,7 +40,7 @@
build_triplet = @build@
host_triplet = @host@
@ISLINUX_TRUE at am__append_1 = -Wl,-E
- at ISLINUX_TRUE@@ISPPC_TRUE at am__append_2 = -fsigned-char
+ at ISGCC_TRUE@@ISLINUX_TRUE@@ISPPC_TRUE at am__append_2 = -fsigned-char
@CRASHPROT_TRUE at am__append_3 = -DCRASH_PROT
@IS64BITLINUX_TRUE at am__append_4 = -m64 -march=k8 -fPIC -D_64BIT_MACHINE_
@IS64BITLINUX_TRUE at am__append_5 = --enable-64bit
@@ -172,6 +172,8 @@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
IS64BITLINUX_FALSE = @IS64BITLINUX_FALSE@
IS64BITLINUX_TRUE = @IS64BITLINUX_TRUE@
+ISGCC_FALSE = @ISGCC_FALSE@
+ISGCC_TRUE = @ISGCC_TRUE@
ISLINUX_FALSE = @ISLINUX_FALSE@
ISLINUX_TRUE = @ISLINUX_TRUE@
ISMAC_FALSE = @ISMAC_FALSE@
Modified: freeswitch/branches/stkn/configure
==============================================================================
--- freeswitch/branches/stkn/configure (original)
+++ freeswitch/branches/stkn/configure Sun Jul 9 23:56:02 2006
@@ -466,7 +466,7 @@
# include <unistd.h>
#endif"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS CRASHPROT_TRUE CRASHPROT_FALSE ISLINUX_TRUE ISLINUX_FALSE ISMAC_TRUE ISMAC_FALSE IS64BITLINUX_TRUE IS64BITLINUX_FALSE ISPPC_TRUE ISPPC_FALSE LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS CRASHPROT_TRUE CRASHPROT_FALSE ISLINUX_TRUE ISLINUX_FALSE ISMAC_TRUE ISMAC_FALSE IS64BITLINUX_TRUE IS64BITLINUX_FALSE ISPPC_TRUE ISPPC_FALSE ISGCC_TRUE ISGCC_FALSE LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -20832,7 +20832,6 @@
# AM_CONDITIONAL(ISSUNOS, [test `uname -s` = SunOS])
# AM_CONDITIONAL(ISSUN64, [test `isainfo -b` = 64])
# AM_CONDITIONAL(ISSUNSPARC, [test `isainfo -n` = sparcv9])
-# AM_CONDITIONAL(ISGCC, [test `echo $GCC` = true])
case `uname -m` in
ppc|ppc64|powerpc)
@@ -20855,6 +20854,15 @@
+if test "$GCC" = "yes"; then
+ ISGCC_TRUE=
+ ISGCC_FALSE='#'
+else
+ ISGCC_TRUE='#'
+ ISGCC_FALSE=
+fi
+
+
ac_config_files="$ac_config_files src/include/switch_version.h"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
@@ -21003,6 +21011,13 @@
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
+if test -z "${ISGCC_TRUE}" && test -z "${ISGCC_FALSE}"; then
+ { { echo "$as_me:$LINENO: error: conditional \"ISGCC\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"ISGCC\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+fi
: ${CONFIG_STATUS=./config.status}
ac_clean_files_save=$ac_clean_files
@@ -21612,6 +21627,8 @@
s, at IS64BITLINUX_FALSE@,$IS64BITLINUX_FALSE,;t t
s, at ISPPC_TRUE@,$ISPPC_TRUE,;t t
s, at ISPPC_FALSE@,$ISPPC_FALSE,;t t
+s, at ISGCC_TRUE@,$ISGCC_TRUE,;t t
+s, at ISGCC_FALSE@,$ISGCC_FALSE,;t t
s, at LTLIBOBJS@,$LTLIBOBJS,;t t
CEOF
Modified: freeswitch/branches/stkn/configure.in
==============================================================================
--- freeswitch/branches/stkn/configure.in (original)
+++ freeswitch/branches/stkn/configure.in Sun Jul 9 23:56:02 2006
@@ -53,7 +53,6 @@
# AM_CONDITIONAL(ISSUNOS, [test `uname -s` = SunOS])
# AM_CONDITIONAL(ISSUN64, [test `isainfo -b` = 64])
# AM_CONDITIONAL(ISSUNSPARC, [test `isainfo -n` = sparcv9])
-# AM_CONDITIONAL(ISGCC, [test `echo $GCC` = true])
case `uname -m` in
ppc|ppc64|powerpc)
@@ -65,6 +64,6 @@
esac
AM_CONDITIONAL(ISPPC, [test "$MACHINE" = "ppc"])
-
+AM_CONDITIONAL(ISGCC, [test "$GCC" = "yes"])
AC_OUTPUT([src/include/switch_version.h])
More information about the Freeswitch-svn
mailing list