[Freeswitch-svn] [commit] r1848 - in freeswitch/branches/cypromis/trunk: . build build/config libs libs/libspeakup libs/libteletone libs/srtp libs/srtp/build src src/include
Freeswitch SVN
cypromis at freeswitch.org
Wed Jul 12 15:09:03 EDT 2006
Author: cypromis
Date: Wed Jul 12 15:08:58 2006
New Revision: 1848
Added:
freeswitch/branches/cypromis/trunk/build/config/compiler.m4
freeswitch/branches/cypromis/trunk/build/config/packages.m4
freeswitch/branches/cypromis/trunk/configure.ac
freeswitch/branches/cypromis/trunk/libs/srtp/acsite.m4
freeswitch/branches/cypromis/trunk/libs/srtp/build/
freeswitch/branches/cypromis/trunk/libs/srtp/build/compiler.m4
Modified:
freeswitch/branches/cypromis/trunk/ (props changed)
freeswitch/branches/cypromis/trunk/Makefile.in
freeswitch/branches/cypromis/trunk/build/buildlib.sh
freeswitch/branches/cypromis/trunk/build/config/ltmain.sh
freeswitch/branches/cypromis/trunk/libs/libspeakup/Makefile.am
freeswitch/branches/cypromis/trunk/libs/libspeakup/Makefile.in
freeswitch/branches/cypromis/trunk/libs/libspeakup/aclocal.m4
freeswitch/branches/cypromis/trunk/libs/libspeakup/configure
freeswitch/branches/cypromis/trunk/libs/libspeakup/configure.in
freeswitch/branches/cypromis/trunk/libs/libteletone/INSTALL
freeswitch/branches/cypromis/trunk/libs/libteletone/Makefile.am
freeswitch/branches/cypromis/trunk/libs/libteletone/Makefile.in
freeswitch/branches/cypromis/trunk/libs/libteletone/aclocal.m4
freeswitch/branches/cypromis/trunk/libs/libteletone/config.guess
freeswitch/branches/cypromis/trunk/libs/libteletone/config.sub
freeswitch/branches/cypromis/trunk/libs/libteletone/configure
freeswitch/branches/cypromis/trunk/libs/libteletone/configure.in
freeswitch/branches/cypromis/trunk/libs/libteletone/depcomp
freeswitch/branches/cypromis/trunk/libs/libteletone/install-sh
freeswitch/branches/cypromis/trunk/libs/libteletone/ltmain.sh
freeswitch/branches/cypromis/trunk/libs/libteletone/missing
freeswitch/branches/cypromis/trunk/libs/libteletone/mkinstalldirs
freeswitch/branches/cypromis/trunk/libs/srtp.build.sh
freeswitch/branches/cypromis/trunk/libs/srtp/configure.in
freeswitch/branches/cypromis/trunk/src/include/switch_am_config.h.in
freeswitch/branches/cypromis/trunk/src/include/switch_platform.h
freeswitch/branches/cypromis/trunk/src/switch_rtp.c
Log:
changes to buildsystem
merge in chnges from trunk
r11518 at free (orig r1119): michal | 2006-07-12 10:35:37 +0200
Initial merge of cypromis branch
r8902 at free (orig r399): sphere | 2006-01-18 01:35:32 +0100
Creating branch for cypromis
r9395 at free (orig r892): mikej | 2006-03-22 16:35:12 +0100
Copied remotely
r9396 at free (orig r893): mikej | 2006-03-22 16:36:06 +0100
Removed file/folder
r9412 at free (orig r909): cypromis | 2006-03-24 15:39:42 +0100
don't save file in windows format .. it screws up stuff :)
r9413 at free (orig r910): cypromis | 2006-03-24 15:40:49 +0100
fixes to un gccify libgsm and also get rid of DOS endings in files :))
r9415 at free (orig r912): cypromis | 2006-03-24 17:07:16 +0100
solaris solaris solaris
:)
r9419 at free (orig r916): cypromis | 2006-03-24 22:43:41 +0100
updatge to latest trunk plus more ANSI and Solaris cleanups
r9420 at free (orig r917): cypromis | 2006-03-24 23:38:05 +0100
more cross platform fixes
r9421 at free (orig r918): cypromis | 2006-03-25 00:51:00 +0100
more compatibility changes
now all builds on solaris, besides the mozilla stuff and mod_opal
r9423 at free (orig r920): cypromis | 2006-03-25 01:25:29 +0100
small typo
r9438 at free (orig r935): cypromis | 2006-03-27 12:43:37 +0200
some more fixes plus libtoolisation with
a solaris ready libtool. Seems the one used by the project has a bug that does not
add ,so to solaris shared libs
r9445 at free (orig r942): cypromis | 2006-03-27 20:40:24 +0200
lets use solaris freeware versions of libtool, automake and autoconf, they know what they are doing (at least I hope so ...)
r9448 at free (orig r945): cypromis | 2006-03-27 23:01:32 +0200
still segfaults but now in all new revision ;)
r9449 at free (orig r946): cypromis | 2006-03-28 00:13:09 +0200
ok, my bad wrong c options I though would be just used for libs & modules where used for the program.
Now need to add -R ... to module building
r9450 at free (orig r947): cypromis | 2006-03-28 00:27:30 +0200
It works it works it works. just some small annoyances I have to fix ;)
r9454 at free (orig r951): cypromis | 2006-03-28 16:25:19 +0200
some more fixes for portability
r9455 at free (orig r952): cypromis | 2006-03-28 16:26:20 +0200
dos2unix dos2unix dos2unix and again dos2unix ....
r9461 at free (orig r958): cypromis | 2006-03-29 02:36:58 +0200
portability fixes to jrtp buildsystem
r9462 at free (orig r959): cypromis | 2006-03-29 17:41:34 +0200
final touch of deleting all fPIC's and replacing them with AM_CFLAGS
r9468 at free (orig r965): cypromis | 2006-03-30 01:52:29 +0200
update to trunk
r9472 at free (orig r969): mikej | 2006-03-30 03:50:38 +0200
re-merged changes from trunk. you may need to re-run autotools in jrtp.
r9483 at free (orig r980): mikej | 2006-03-30 20:03:37 +0200
updated to trunk.
r9484 at free (orig r981): cypromis | 2006-03-30 20:25:03 +0200
Some macros I willl use in automake
r9486 at free (orig r983): cypromis | 2006-03-31 01:05:03 +0200
moving things to full automake ....
lets see what it does
r9488 at free (orig r985): cypromis | 2006-03-31 01:07:56 +0200
small fix
r9489 at free (orig r986): cypromis | 2006-03-31 01:16:05 +0200
forgot that one
r9492 at free (orig r989): mikej | 2006-03-31 01:39:42 +0200
merged to trunk.
r9493 at free (orig r990): cypromis | 2006-03-31 02:01:23 +0200
last stuff for tonight
r9497 at free (orig r994): cypromis | 2006-03-31 20:18:36 +0200
more cleanups but beware, we are not checking for gmake now and I need to
get all the shellscripts clean :)
r9508 at free (orig r1005): cypromis | 2006-04-01 23:02:22 +0200
more fixes but still some problems with my strict typechecking :)
r9512 at free (orig r1009): cypromis | 2006-04-03 15:28:02 +0200
OK, that is the right path ....
r9513 at free (orig r1010): mikej | 2006-04-03 16:30:46 +0200
merge, cleanup of switch_platform.h
r9523 at free (orig r1020): cypromis | 2006-04-04 01:34:35 +0200
some small fixes
added x86 stuff to configure.in
now adding some speed to developmet ;)
r9525 at free (orig r1022): cypromis | 2006-04-04 01:42:13 +0200
changing back. need to do the header stuff from configure
r9535 at free (orig r1032): mikej | 2006-04-04 07:29:14 +0200
update to svn trunk
r9542 at free (orig r1039): mikej | 2006-04-04 19:01:25 +0200
update to trunk
r9551 at free (orig r1048): mikej | 2006-04-05 02:57:18 +0200
update to trunk
r9559 at free (orig r1056): mikej | 2006-04-06 00:53:16 +0200
update to trunk, fix suncc issue with stun stuct's.
r9599 at free (orig r1096): mikej | 2006-04-09 02:20:05 +0200
update to trunk including srtp checkin so we can fix it on sun
r9642 at free (orig r1139): cypromis | 2006-04-13 16:39:27 +0200
fixes to srtp to be makeable on solaris
getting libresample in to fix its build process.
r9654 at free (orig r1151): cypromis | 2006-04-14 10:25:32 +0200
step by step to ansi and proper automake :))
r9757 at free (orig r1252): mikej | 2006-04-25 22:57:11 +0200
updated to trunk
r9781 at free (orig r1276): mikej | 2006-04-27 15:19:44 +0200
uodate to trunk
r9895 at free (orig r1391): mikej | 2006-05-08 05:43:30 +0200
update to trunk
r9937 at free (orig r1431): mikej | 2006-05-11 14:19:31 +0200
update to trunk
r11500 at free (orig r1832): cypromis | 2006-07-11 22:52:05 +0200
lets archive old stuff and try again fresh
r11503 at free (orig r1835): cypromis | 2006-07-12 01:46:37 +0200
import fresh trunk
r11520 at free (orig r1120): michal | 2006-07-12 10:43:27 +0200
Grouping application search into one m4 file
r11522 at free (orig r1121): michal | 2006-07-12 13:31:23 +0200
Starting to upgrade the build system
r11528 at free (orig r1122): michal | 2006-07-12 18:17:39 +0200
fixes to buildsystem. Maximum optimisation, automatic environment and compiler dependecies.
Needs some more finetuning but basically is there ;)
r11529 at free (orig r1123): michal | 2006-07-12 18:25:47 +0200
update gcc flags
r11530 at free (orig r1124): michal | 2006-07-12 18:26:13 +0200
hmmm why is that in here
r11531 at free (orig r1125): michal | 2006-07-12 18:29:20 +0200
here go the includes
r11532 at free (orig r1126): michal | 2006-07-12 18:47:50 +0200
heya heya we are getting closer to a real build system
r11538 at free (orig r1128): michal | 2006-07-12 18:59:03 +0200
r8574 at free (orig r52): mikej | 2005-11-19 21:11:40 +0100
Renamed remotely
r11539 at free (orig r1129): michal | 2006-07-12 19:01:03 +0200
r8575 at free (orig r53): mikej | 2005-11-19 21:12:09 +0100
Created folder remotely
r11540 at free (orig r1130): michal | 2006-07-12 19:01:04 +0200
r8576 at free (orig r54): mikej | 2005-11-19 21:12:30 +0100
Renamed remotely
r11541 at free (orig r1131): michal | 2006-07-12 19:01:15 +0200
r8577 at free (orig r55): mikej | 2005-11-19 21:13:06 +0100
Copied remotely
r11542 at free (orig r1132): michal | 2006-07-12 19:01:17 +0200
r8578 at free (orig r56): mikej | 2005-11-19 23:18:34 +0100
freeswitch win32 reorg and cleanup part 1. Everything works but mod_exosip
r11543 at free (orig r1133): michal | 2006-07-12 19:01:18 +0200
r8579 at free (orig r57): mikej | 2005-11-20 01:45:09 +0100
More win32 build cleanups
r11544 at free (orig r1134): michal | 2006-07-12 19:01:19 +0200
r8580 at free (orig r58): mikej | 2005-11-20 01:58:16 +0100
eventually this will be correct.
r11545 at free (orig r1135): michal | 2006-07-12 19:01:19 +0200
r8581 at free (orig r59): mikej | 2005-11-20 02:50:04 +0100
Fix build of some deps in MSVC, added copying of conf dir and libapr-1.dll into the output directory and setting the working directory to allow for launching in debug mode from the gui out of the box, disabled acutal building in GetLibs.bat for now, it is only downloading and setting up the lib src as necessary. Still need to add jrtp4c into the core configure\makefile so it builds from there automatically and we can get rid of the other configure script for that lib individually.
r11546 at free (orig r1136): michal | 2006-07-12 19:01:20 +0200
r8582 at free (orig r60): mikej | 2005-11-20 03:19:24 +0100
Put sample conf files where they belong so they are there when you try to run in debug mode.
r11547 at free (orig r1137): michal | 2006-07-12 19:01:20 +0200
r8583 at free (orig r61): mikej | 2005-11-20 03:57:06 +0100
Update configure for jrtp4c to not have it's own configure stuff.
r11548 at free (orig r1138): michal | 2006-07-12 19:01:21 +0200
r8584 at free (orig r62): mikej | 2005-11-20 17:49:14 +0100
Suppress MSVC 8 warnings about crt functions.
r11549 at free (orig r1139): michal | 2006-07-12 19:01:21 +0200
r8585 at free (orig r63): mikej | 2005-11-20 19:17:35 +0100
fixed the last of the warning messages in MSVC in mod_exosip.c. There are now no warning messages at all in all of the freeswitch code. The dependency libs are still another story.
r11550 at free (orig r1140): michal | 2006-07-12 19:01:21 +0200
r8586 at free (orig r64): mikej | 2005-11-20 19:22:49 +0100
I think this FINALLY corrects the issue with the working directory settings not showing up properly on fresh checkout.
r11551 at free (orig r1141): michal | 2006-07-12 19:01:22 +0200
r8587 at free (orig r65): mikej | 2005-11-20 19:27:20 +0100
Fix default project on fresh checkout to be FreeSwitchConsole instead of the core lib. This makes debugging by hitting the run button a little cleaner.
r11552 at free (orig r1142): michal | 2006-07-12 19:01:22 +0200
r8588 at free (orig r66): mikej | 2005-11-20 19:30:31 +0100
update svn.ignore property.
r11553 at free (orig r1143): michal | 2006-07-12 19:01:22 +0200
r8589 at free (orig r67): mikej | 2005-11-20 21:06:05 +0100
Cleanup default MSVC project configurations.
r11554 at free (orig r1144): michal | 2006-07-12 19:01:23 +0200
r8590 at free (orig r68): mikej | 2005-11-20 21:40:31 +0100
GetLibs.bat cleanups. No longer re-runs upgrades and such on multiple runs of the file if it doesn't need to. Added backup download locations to the bat file.
r11555 at free (orig r1145): michal | 2006-07-12 19:01:23 +0200
r8591 at free (orig r69): mikej | 2005-11-21 01:12:18 +0100
upgrade.vbs fix to upgrade to correct version typo.
r11556 at free (orig r1146): michal | 2006-07-12 19:01:24 +0200
r8592 at free (orig r70): mikej | 2005-11-21 01:17:49 +0100
Put modules back in their folders.
r11557 at free (orig r1147): michal | 2006-07-12 19:01:24 +0200
r8593 at free (orig r71): mikej | 2005-11-21 08:45:31 +0100
Adding GetLibs.vbs. This file is a full replacement for GetLibs.bat and replaces everything in the tools directory except for the osipparser replacement project file. It still uses the tools directory for temporary storage of some files.
r11558 at free (orig r1148): michal | 2006-07-12 19:01:31 +0200
r8594 at free (orig r72): mikej | 2005-11-22 02:33:38 +0100
Fix GetLibs.vbs registration of the tar and gzip components.
r11559 at free (orig r1149): michal | 2006-07-12 19:01:31 +0200
r8595 at free (orig r73): mikej | 2005-11-22 21:28:21 +0100
update to fix download and extract from getlibs.vbs
r11560 at free (orig r1150): michal | 2006-07-12 19:01:32 +0200
r8596 at free (orig r74): mikej | 2005-11-24 21:06:54 +0100
Add sqlite to the downloaded libs in GetLibs.vbs and cleanup some of the old GetLibs.bat stuff and it's dependencies.
r11561 at free (orig r1151): michal | 2006-07-12 19:01:34 +0200
r8597 at free (orig r75): mikej | 2005-11-25 23:31:29 +0100
GetLibs.vbs update that now supports compiling the libs and selecting core or Mod_exosip libs. Default behavior is still the same, still to do is removing all the libs from the solution file and adding in pre-build events to auto download and build the appropriate libs.
r11562 at free (orig r1152): michal | 2006-07-12 19:01:34 +0200
r8598 at free (orig r76): mikej | 2005-11-26 01:59:12 +0100
Update to remove libs from solution file and automatically download libs and compile when needed.
r11563 at free (orig r1153): michal | 2006-07-12 19:01:35 +0200
r8599 at free (orig r77): mikej | 2005-11-26 04:14:12 +0100
Update GetLibs.vbs to properly return output when running builds of the dependency libs.
r11564 at free (orig r1154): michal | 2006-07-12 19:01:35 +0200
r8600 at free (orig r78): mikej | 2005-11-26 17:50:25 +0100
Update to use exosip and osip 2.2.2. Modified GetLibs.vbs to rebuild jrtp when any of the libs are not there.
r11565 at free (orig r1155): michal | 2006-07-12 19:01:36 +0200
r8601 at free (orig r79): mikej | 2005-11-28 16:50:54 +0100
Add sqlite to libs for freeswitchCore linking
r11566 at free (orig r1156): michal | 2006-07-12 19:01:36 +0200
r8602 at free (orig r80): anthm | 2005-11-30 23:27:10 +0100
commmit
r11567 at free (orig r1157): michal | 2006-07-12 19:02:02 +0200
r8603 at free (orig r81): anthm | 2005-11-30 23:27:33 +0100
commmit
r11568 at free (orig r1158): michal | 2006-07-12 19:02:02 +0200
r8604 at free (orig r82): mikej | 2005-12-05 09:15:10 +0100
add libapr.vcproj so we don't have to upgrade it, because you can't upgrade dsp files with VS2005 express edition.
r11569 at free (orig r1159): michal | 2006-07-12 19:02:02 +0200
r8605 at free (orig r83): mikej | 2005-12-05 09:36:10 +0100
Update sqlite.vcproj to suppress casting warning messages.
r11570 at free (orig r1160): michal | 2006-07-12 19:02:03 +0200
r8606 at free (orig r84): mikej | 2005-12-05 10:11:53 +0100
eliminate deprecation warnings on VS 2005
r11571 at free (orig r1161): michal | 2006-07-12 19:02:03 +0200
r8607 at free (orig r85): mikej | 2005-12-05 10:56:44 +0100
Fix all warnings on MSVC 8 (.net 2005), add support for VS Express edition 2005, changed build to use vcbuild instead of devenv, reduced the number of out of tree project files we are managing in tree by patching the files as necessary in scripts. Now only sqlite (which does not come with a project file) and apr (which does not come with a vcproj, only dsp file) are managed in tree. We still need to come up with a way to convert dsp to vcproj files in vbscript.
r11572 at free (orig r1162): michal | 2006-07-12 19:02:04 +0200
r8608 at free (orig r86): anthm | 2005-12-06 18:18:56 +0100
iax and empty core for opal
r11573 at free (orig r1163): michal | 2006-07-12 19:02:04 +0200
r8609 at free (orig r87): anthm | 2005-12-06 18:19:44 +0100
iax and empty core for opal
r11574 at free (orig r1164): michal | 2006-07-12 19:02:05 +0200
r8610 at free (orig r88): anthm | 2005-12-06 19:19:43 +0100
update
r11575 at free (orig r1165): michal | 2006-07-12 19:02:05 +0200
r8611 at free (orig r89): mikej | 2005-12-06 22:25:10 +0100
first part of iaxchan windows build
r11576 at free (orig r1166): michal | 2006-07-12 19:02:06 +0200
r8612 at free (orig r90): anthm | 2005-12-06 22:25:56 +0100
merge
r11577 at free (orig r1167): michal | 2006-07-12 19:02:06 +0200
r8613 at free (orig r91): anthm | 2005-12-07 04:49:31 +0100
iax
r11578 at free (orig r1168): michal | 2006-07-12 19:02:07 +0200
r8614 at free (orig r92): anthm | 2005-12-07 17:32:47 +0100
update
r11579 at free (orig r1169): michal | 2006-07-12 19:02:08 +0200
r8615 at free (orig r93): anthm | 2005-12-07 20:28:27 +0100
r11580 at free (orig r1170): michal | 2006-07-12 19:02:08 +0200
r8616 at free (orig r94): anthm | 2005-12-08 19:31:49 +0100
let modules see the filename they were called as
r11581 at free (orig r1171): michal | 2006-07-12 19:02:09 +0200
r8617 at free (orig r95): anthm | 2005-12-09 00:10:59 +0100
Add portaudio files
r11582 at free (orig r1172): michal | 2006-07-12 19:02:10 +0200
r8618 at free (orig r96): anthm | 2005-12-09 00:15:08 +0100
doh
r11583 at free (orig r1173): michal | 2006-07-12 19:02:10 +0200
r8619 at free (orig r97): mikej | 2005-12-09 00:39:27 +0100
Update GetLibs.vbs for PortAudio
r11584 at free (orig r1174): michal | 2006-07-12 19:02:10 +0200
r8620 at free (orig r98): mikej | 2005-12-09 01:43:06 +0100
PortAudio lib autobuild.
r11585 at free (orig r1175): michal | 2006-07-12 19:02:11 +0200
r8621 at free (orig r99): anthm | 2005-12-09 03:02:05 +0100
portaudio stuff
r11586 at free (orig r1176): michal | 2006-07-12 19:02:11 +0200
r8622 at free (orig r100): anthm | 2005-12-09 20:23:04 +0100
adding some shit
r11587 at free (orig r1177): michal | 2006-07-12 19:02:12 +0200
r8623 at free (orig r101): anthm | 2005-12-09 20:33:21 +0100
update
r11588 at free (orig r1178): michal | 2006-07-12 19:02:12 +0200
r8624 at free (orig r102): anthm | 2005-12-09 23:19:08 +0100
OMG this rocks
r11589 at free (orig r1179): michal | 2006-07-12 19:02:13 +0200
r8625 at free (orig r103): anthm | 2005-12-10 00:14:09 +0100
r11590 at free (orig r1180): michal | 2006-07-12 19:02:13 +0200
r8626 at free (orig r104): anthm | 2005-12-10 02:14:49 +0100
r11591 at free (orig r1181): michal | 2006-07-12 19:02:14 +0200
r8627 at free (orig r105): anthm | 2005-12-10 02:59:43 +0100
r11592 at free (orig r1182): michal | 2006-07-12 19:02:14 +0200
r8628 at free (orig r106): mikej | 2005-12-10 03:12:03 +0100
g729 codec add (this needs to leave somwhere else)
r11593 at free (orig r1183): michal | 2006-07-12 19:02:14 +0200
r8629 at free (orig r107): anthm | 2005-12-10 04:10:23 +0100
r11594 at free (orig r1184): michal | 2006-07-12 19:02:15 +0200
r8630 at free (orig r108): anthm | 2005-12-10 05:18:48 +0100
r11595 at free (orig r1185): michal | 2006-07-12 19:02:15 +0200
r8631 at free (orig r109): mikej | 2005-12-10 05:42:08 +0100
Added speex codec to solution including autodownload of speex from speex.org. Added scripted build of g729 build.
r11596 at free (orig r1186): michal | 2006-07-12 19:02:20 +0200
r8632 at free (orig r110): mikej | 2005-12-10 18:55:46 +0100
small fixes for g729 lib compiling and speex loading.
r11597 at free (orig r1187): michal | 2006-07-12 19:02:20 +0200
r8633 at free (orig r111): mikej | 2005-12-10 19:19:54 +0100
fix a little warning.
r11598 at free (orig r1188): michal | 2006-07-12 19:02:21 +0200
r8634 at free (orig r112): anthm | 2005-12-10 20:34:35 +0100
r11599 at free (orig r1189): michal | 2006-07-12 19:02:21 +0200
r8635 at free (orig r113): anthm | 2005-12-10 23:37:21 +0100
fix codec
r11600 at free (orig r1190): michal | 2006-07-12 19:02:21 +0200
r8636 at free (orig r114): anthm | 2005-12-12 18:50:07 +0100
codec improvement
r11601 at free (orig r1191): michal | 2006-07-12 19:02:22 +0200
r8637 at free (orig r115): anthm | 2005-12-12 22:01:17 +0100
let mod_portaudio get inbound calls
r11602 at free (orig r1192): michal | 2006-07-12 19:02:23 +0200
r8638 at free (orig r116): anthm | 2005-12-12 22:30:03 +0100
update
r11603 at free (orig r1193): michal | 2006-07-12 19:02:23 +0200
r8639 at free (orig r119): anthm | 2005-12-13 17:46:02 +0100
update
r11604 at free (orig r1194): michal | 2006-07-12 19:02:24 +0200
r8640 at free (orig r120): anthm | 2005-12-13 19:06:28 +0100
iax
Modified: freeswitch/branches/cypromis/trunk/Makefile.in
==============================================================================
--- freeswitch/branches/cypromis/trunk/Makefile.in (original)
+++ freeswitch/branches/cypromis/trunk/Makefile.in Wed Jul 12 15:08:58 2006
@@ -39,7 +39,7 @@
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
- at ISLINUX_TRUE@am__append_1 = -Wl,-E
+ at CRASHPROT_TRUE@am__append_1 = -DCRASH_PROT
@CRASHPROT_TRUE at am__append_2 = -DCRASH_PROT
@IS64BITLINUX_TRUE at am__append_3 = -m64 -march=k8 -fPIC -D_64BIT_MACHINE_
@IS64BITLINUX_TRUE at am__append_4 = --enable-64bit
@@ -138,6 +138,20 @@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
+AM_CFLAGS = @AM_CFLAGS@ -I$(PREFIX)/include $(shell $(APR_CONFIG) \
+ --cflags --cppflags --includes) -I${prefix}/include/srtp \
+ -xc99=all $(shell $(APU_CONFIG) --includes) $(am__append_1) \
+ -I$(PWD)/src/sqlite -I$(PWD) -I$(PWD)/src/include \
+ -I$(PREFIX)/include -DSWITCH_MOD_DIR=\"$(PREFIX)/mod\" \
+ -DSWITCH_PREFIX_DIR=\"$(PREFIX)\" \
+ -DSWITCH_CONF_DIR=\"$(PREFIX)/conf\" \
+ -DSWITCH_DB_DIR=\"$(PREFIX)/db\" \
+ -DSWITCH_LOG_DIR=\"$(PREFIX)/log\" \
+ -DSWITCH_SCRIPT_DIR=\"$(PREFIX)/scripts\" \
+ -DSWITCH_HTDOCS_DIR=\"$(PREFIX)/htdocs\"
+AM_LDFLAGS = @AM_LDFLAGS@ -L$(PREFIX)/lib $(shell $(APR_CONFIG) \
+ --link-ld --libs ) $(shell $(APU_CONFIG) --link-ld --libs ) \
+ -lm -L/usr/local/lib/db42 -L/usr/local/lib
AR = @AR@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -157,6 +171,7 @@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
+DYNAMIC_LIB_EXTEN = @DYNAMIC_LIB_EXTEN@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
@@ -193,6 +208,7 @@
RANLIB = @RANLIB@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
+SOLINK = @SOLINK@
STRIP = @STRIP@
VERSION = @VERSION@
ac_ct_AR = @ac_ct_AR@
@@ -218,6 +234,7 @@
build_vendor = @build_vendor@
datadir = @datadir@
exec_prefix = @exec_prefix@
+gtar = @gtar@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -238,6 +255,7 @@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
+wget = @wget@
EXTRA_DIST =
SUBDIRS =
AUTOMAKE_OPTS = gnu foreign
Modified: freeswitch/branches/cypromis/trunk/build/buildlib.sh
==============================================================================
Added: freeswitch/branches/cypromis/trunk/build/config/compiler.m4
==============================================================================
--- (empty file)
+++ freeswitch/branches/cypromis/trunk/build/config/compiler.m4 Wed Jul 12 15:08:58 2006
@@ -0,0 +1,411 @@
+#### Find the compiler vendor ####
+AC_DEFUN([AX_COMPILER_VENDOR],
+[
+AC_CACHE_CHECK([for _AC_LANG compiler vendor], ax_cv_[]_AC_LANG_ABBREV[]_compiler_vendor,
+ [ax_cv_[]_AC_LANG_ABBREV[]_compiler_vendor=unknown
+ # note: don't check for gcc first since some other compilers define __GNUC__
+ for ventest in intel:__ICC,__ECC,__INTEL_COMPILER ibm:__xlc__,__xlC__,__IBMC__,__IBMCPP__ gnu:__GNUC__ sun:__SUNPRO_C,__SUNPRO_CC hp:__HP_cc,__HP_aCC dec:__DECC,__DECCXX,__DECC_VER,__DECCXX_VER borland:__BORLANDC__,__TURBOC__ comeau:__COMO__ cray:_CRAYC kai:__KCC lcc:__LCC__ metrowerks:__MWERKS__ sgi:__sgi,sgi microsoft:_MSC_VER watcom:__WATCOMC__ portland:__PGI; do
+ vencpp="defined("`echo $ventest | cut -d: -f2 | sed 's/,/) || defined(/g'`")"
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM(,[
+#if !($vencpp)
+ thisisanerror;
+#endif
+])], [ax_cv_]_AC_LANG_ABBREV[_compiler_vendor=`echo $ventest | cut -d: -f1`; break])
+ done
+ ])
+])
+
+
+#### Find the maximum optimisation for a centrain compiler ####
+AC_DEFUN([AX_CC_MAXOPT],
+[
+AC_REQUIRE([AC_PROG_CC])
+AC_REQUIRE([AX_COMPILER_VENDOR])
+
+AC_ARG_ENABLE(portable-binary, [AC_HELP_STRING([--enable-portable-binary], [disable compiler optimizations that would produce unportable binaries])],
+ acx_maxopt_portable=$withval, acx_maxopt_portable=no)
+
+# Try to determine "good" native compiler flags if none specified via CFLAGS
+if test "$ac_test_CFLAGS" != "set"; then
+ CFLAGS=""
+ case $ax_cv_c_compiler_vendor in
+ dec) CFLAGS="-newc -w0 -O5 -ansi_alias -ansi_args -fp_reorder -tune host"
+ if test "x$acx_maxopt_portable" = xno; then
+ CFLAGS="$CFLAGS -arch host"
+ fi;;
+
+ sun) CFLAGS="-native -fast -xO5 -dalign -xc99=all"
+ if test "x$acx_maxopt_portable" = xyes; then
+ CFLAGS="$CFLAGS -xarch=generic"
+ fi;;
+
+ hp) CFLAGS="+Oall +Optrs_ansi +DSnative"
+ if test "x$acx_maxopt_portable" = xyes; then
+ CFLAGS="$CFLAGS +DAportable"
+ fi;;
+
+ intel) CFLAGS="-O3 -ansi_alias"
+ if test "x$acx_maxopt_portable" = xno; then
+ icc_archflag=unknown
+ icc_flags=""
+ case $host_cpu in
+ i686*|x86_64*)
+ # icc accepts gcc assembly syntax, so these should work:
+ AX_GCC_X86_CPUID(0)
+ AX_GCC_X86_CPUID(1)
+ case $ax_cv_gcc_x86_cpuid_0 in # see AX_GCC_ARCHFLAG
+ *:756e6547:*:*) # Intel
+ case $ax_cv_gcc_x86_cpuid_1 in
+ *6a?:*[[234]]:*:*|*6[[789b]]?:*:*:*) icc_flags="-xK";;
+ *f3[[347]]:*:*:*|*f4[1347]:*:*:*) icc_flags="-xP -xN -xW -xK";;
+ *f??:*:*:*) icc_flags="-xN -xW -xK";;
+ esac ;;
+ esac ;;
+ esac
+ if test "x$icc_flags" != x; then
+ for flag in $icc_flags; do
+ AX_CHECK_COMPILER_FLAGS($flag, [icc_archflag=$flag; break])
+ done
+ fi
+ AC_MSG_CHECKING([for icc architecture flag])
+ AC_MSG_RESULT($icc_archflag)
+ if test "x$icc_archflag" != xunknown; then
+ CFLAGS="$CFLAGS $icc_archflag"
+ fi
+ fi
+ ;;
+
+ gnu)
+ # default optimization flags for gcc on all systems
+ CFLAGS="-O3 -fomit-frame-pointer"
+
+ # -malign-double for x86 systems
+ AX_CHECK_COMPILER_FLAGS(-malign-double, CFLAGS="$CFLAGS -malign-double")
+
+ # -fstrict-aliasing for gcc-2.95+
+ AX_CHECK_COMPILER_FLAGS(-fstrict-aliasing,
+ CFLAGS="$CFLAGS -fstrict-aliasing")
+
+ # note that we enable "unsafe" fp optimization with other compilers, too
+ AX_CHECK_COMPILER_FLAGS(-ffast-math, CFLAGS="$CFLAGS -ffast-math")
+
+ AX_GCC_ARCHFLAG($acx_maxopt_portable)
+ ;;
+ esac
+
+ if test -z "$CFLAGS"; then
+ echo ""
+ echo "********************************************************"
+ echo "* WARNING: Don't know the best CFLAGS for this system *"
+ echo "* Use ./configure CFLAGS=... to specify your own flags *"
+ echo "* (otherwise, a default of CFLAGS=-O3 will be used) *"
+ echo "********************************************************"
+ echo ""
+ CFLAGS="-O3"
+ fi
+
+ AX_CHECK_COMPILER_FLAGS($CFLAGS, [], [
+ echo ""
+ echo "********************************************************"
+ echo "* WARNING: The guessed CFLAGS don't seem to work with *"
+ echo "* your compiler. *"
+ echo "* Use ./configure CFLAGS=... to specify your own flags *"
+ echo "********************************************************"
+ echo ""
+ CFLAGS=""
+ ])
+
+fi
+])
+
+#### Find the max compiler warning options for ANSI C ####
+AC_DEFUN([AX_CFLAGS_WARN_ALL_ANSI],[dnl
+AS_VAR_PUSHDEF([FLAGS],[CFLAGS])dnl
+AS_VAR_PUSHDEF([VAR],[ac_cv_cflags_warn_all_ansi])dnl
+AC_CACHE_CHECK([m4_ifval($1,$1,FLAGS) for maximum ansi warnings],
+VAR,[VAR="no, unknown"
+ AC_LANG_SAVE
+ AC_LANG_C
+ ac_save_[]FLAGS="$[]FLAGS"
+# IRIX C compiler:
+# -use_readonly_const is the default for IRIX C,
+# puts them into .rodata, but they are copied later.
+# need to be "-G0 -rdatashared" for strictmode but
+# I am not sure what effect that has really. - guidod
+for ac_arg dnl
+in "-pedantic % -Wall -std=c99 -pedantic" dnl GCC
+ "-xstrconst % -v -Xc -xc99=all" dnl Solaris C
+ "-std1 % -verbose -w0 -warnprotos -std1" dnl Digital Unix
+ " % -qlanglvl=ansi -qsrcmsg -qinfo=all:noppt:noppc:noobs:nocnd" dnl AIX
+ " % -ansi -ansiE -fullwarn" dnl IRIX
+ "+ESlit % +w1 -Aa" dnl HP-UX C
+ "-Xc % -pvctl[,]fullmsg -Xc" dnl NEC SX-5 (Super-UX 10)
+ "-h conform % -h msglevel 2 -h conform" dnl Cray C (Unicos)
+ #
+do FLAGS="$ac_save_[]FLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'`
+ AC_TRY_COMPILE([],[return 0;],
+ [VAR=`echo $ac_arg | sed -e 's,.*% *,,'` ; break])
+done
+ FLAGS="$ac_save_[]FLAGS"
+ AC_LANG_RESTORE
+])
+case ".$VAR" in
+ .ok|.ok,*) m4_ifvaln($3,$3) ;;
+ .|.no|.no,*) m4_ifvaln($4,$4,[m4_ifval($2,[
+ AC_RUN_LOG([: m4_ifval($1,$1,FLAGS)="$m4_ifval($1,$1,FLAGS) $2"])
+ m4_ifval($1,$1,FLAGS)="$m4_ifval($1,$1,FLAGS) $2"])]) ;;
+ *) m4_ifvaln($3,$3,[
+ if echo " $[]m4_ifval($1,$1,FLAGS) " | grep " $VAR " 2>&1 >/dev/null
+ then AC_RUN_LOG([: m4_ifval($1,$1,FLAGS) does contain $VAR])
+ else AC_RUN_LOG([: m4_ifval($1,$1,FLAGS)="$m4_ifval($1,$1,FLAGS) $VAR"])
+ m4_ifval($1,$1,FLAGS)="$m4_ifval($1,$1,FLAGS) $VAR"
+ fi ]) ;;
+esac
+AS_VAR_POPDEF([VAR])dnl
+AS_VAR_POPDEF([FLAGS])dnl
+])
+
+dnl the only difference - the LANG selection... and the default FLAGS
+
+AC_DEFUN([AX_CXXFLAGS_WARN_ALL_ANSI],[dnl
+AS_VAR_PUSHDEF([FLAGS],[CXXFLAGS])dnl
+AS_VAR_PUSHDEF([VAR],[ac_cv_cxxflags_warn_all_ansi])dnl
+AC_CACHE_CHECK([m4_ifval($1,$1,FLAGS) for maximum ansi warnings],
+VAR,[VAR="no, unknown"
+ AC_LANG_SAVE
+ AC_LANG_CXX
+ ac_save_[]FLAGS="$[]FLAGS"
+# IRIX C compiler:
+# -use_readonly_const is the default for IRIX C,
+# puts them into .rodata, but they are copied later.
+# need to be "-G0 -rdatashared" for strictmode but
+# I am not sure what effect that has really. - guidod
+for ac_arg dnl
+in "-pedantic % -Wall -ansi -pedantic" dnl GCC
+ "-xstrconst % -v -Xc" dnl Solaris C
+ "-std1 % -verbose -w0 -warnprotos -std1" dnl Digital Unix
+ " % -qlanglvl=ansi -qsrcmsg -qinfo=all:noppt:noppc:noobs:nocnd" dnl AIX
+ " % -ansi -ansiE -fullwarn" dnl IRIX
+ "+ESlit % +w1 -Aa" dnl HP-UX C
+ "-Xc % -pvctl[,]fullmsg -Xc" dnl NEC SX-5 (Super-UX 10)
+ "-h conform % -h msglevel 2 -h conform" dnl Cray C (Unicos)
+ #
+do FLAGS="$ac_save_[]FLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'`
+ AC_TRY_COMPILE([],[return 0;],
+ [VAR=`echo $ac_arg | sed -e 's,.*% *,,'` ; break])
+done
+ FLAGS="$ac_save_[]FLAGS"
+ AC_LANG_RESTORE
+])
+case ".$VAR" in
+ .ok|.ok,*) m4_ifvaln($3,$3) ;;
+ .|.no|.no,*) m4_ifvaln($4,$4,[m4_ifval($2,[
+ AC_RUN_LOG([: m4_ifval($1,$1,FLAGS)="$m4_ifval($1,$1,FLAGS) $2"])
+ m4_ifval($1,$1,FLAGS)="$m4_ifval($1,$1,FLAGS) $2"])]) ;;
+ *) m4_ifvaln($3,$3,[
+ if echo " $[]m4_ifval($1,$1,FLAGS) " | grep " $VAR " 2>&1 >/dev/null
+ then AC_RUN_LOG([: m4_ifval($1,$1,FLAGS) does contain $VAR])
+ else AC_RUN_LOG([: m4_ifval($1,$1,FLAGS)="$m4_ifval($1,$1,FLAGS) $VAR"])
+ m4_ifval($1,$1,FLAGS)="$m4_ifval($1,$1,FLAGS) $VAR"
+ fi ]) ;;
+esac
+AS_VAR_POPDEF([VAR])dnl
+AS_VAR_POPDEF([FLAGS])dnl
+])
+
+
+AC_DEFUN([AX_GCC_X86_CPUID],
+[AC_REQUIRE([AC_PROG_CC])
+AC_LANG_PUSH([C])
+AC_CACHE_CHECK(for x86 cpuid $1 output, ax_cv_gcc_x86_cpuid_$1,
+ [AC_RUN_IFELSE([AC_LANG_PROGRAM([#include <stdio.h>], [
+ int op = $1, eax, ebx, ecx, edx;
+ FILE *f;
+ __asm__("cpuid"
+ : "=a" (eax), "=b" (ebx), "=c" (ecx), "=d" (edx)
+ : "a" (op));
+ f = fopen("conftest_cpuid", "w"); if (!f) return 1;
+ fprintf(f, "%x:%x:%x:%x\n", eax, ebx, ecx, edx);
+ fclose(f);
+ return 0;
+])],
+ [ax_cv_gcc_x86_cpuid_$1=`cat conftest_cpuid`; rm -f conftest_cpuid],
+ [ax_cv_gcc_x86_cpuid_$1=unknown; rm -f conftest_cpuid],
+ [ax_cv_gcc_x86_cpuid_$1=unknown])])
+AC_LANG_POP([C])
+])
+
+AC_DEFUN([AX_GCC_ARCHFLAG],
+[AC_REQUIRE([AC_PROG_CC])
+
+AC_ARG_WITH(gcc-arch, [AC_HELP_STRING([--with-gcc-arch=<arch>], [use architecture <arch> for gcc -march/-mtune, instead of guessing])],
+ ax_gcc_arch=$withval, ax_gcc_arch=yes)
+
+AC_MSG_CHECKING([for gcc architecture flag])
+AC_MSG_RESULT([])
+AC_CACHE_VAL(ax_cv_gcc_archflag,
+[
+ax_cv_gcc_archflag="unknown"
+
+if test "$GCC" = yes; then
+
+if test "x$ax_gcc_arch" = xyes; then
+ax_gcc_arch=""
+if test "$cross_compiling" = no; then
+case $host_cpu in
+ i[[3456]]86*|x86_64*) # use cpuid codes, in part from x86info-1.7 by D. Jones
+ AX_GCC_X86_CPUID(0)
+ AX_GCC_X86_CPUID(1)
+ case $ax_cv_gcc_x86_cpuid_0 in
+ *:756e6547:*:*) # Intel
+ case $ax_cv_gcc_x86_cpuid_1 in
+ *5[[48]]?:*:*:*) ax_gcc_arch="pentium-mmx pentium" ;;
+ *5??:*:*:*) ax_gcc_arch=pentium ;;
+ *6[[3456]]?:*:*:*) ax_gcc_arch="pentium2 pentiumpro" ;;
+ *6a?:*[[01]]:*:*) ax_gcc_arch="pentium2 pentiumpro" ;;
+ *6a?:*[[234]]:*:*) ax_gcc_arch="pentium3 pentiumpro" ;;
+ *6[[9d]]?:*:*:*) ax_gcc_arch="pentium-m pentium3 pentiumpro" ;;
+ *6[[78b]]?:*:*:*) ax_gcc_arch="pentium3 pentiumpro" ;;
+ *6??:*:*:*) ax_gcc_arch=pentiumpro ;;
+ *f3[[347]]:*:*:*|*f4[1347]:*:*:*)
+ case $host_cpu in
+ x86_64*) ax_gcc_arch="nocona pentium4 pentiumpro" ;;
+ *) ax_gcc_arch="prescott pentium4 pentiumpro" ;;
+ esac ;;
+ *f??:*:*:*) ax_gcc_arch="pentium4 pentiumpro";;
+ esac ;;
+ *:68747541:*:*) # AMD
+ case $ax_cv_gcc_x86_cpuid_1 in
+ *5[[67]]?:*:*:*) ax_gcc_arch=k6 ;;
+ *5[[8d]]?:*:*:*) ax_gcc_arch="k6-2 k6" ;;
+ *5[[9]]?:*:*:*) ax_gcc_arch="k6-3 k6" ;;
+ *60?:*:*:*) ax_gcc_arch=k7 ;;
+ *6[[12]]?:*:*:*) ax_gcc_arch="athlon k7" ;;
+ *6[[34]]?:*:*:*) ax_gcc_arch="athlon-tbird k7" ;;
+ *67?:*:*:*) ax_gcc_arch="athlon-4 athlon k7" ;;
+ *6[[68a]]?:*:*:*)
+ AX_GCC_X86_CPUID(0x80000006) # L2 cache size
+ case $ax_cv_gcc_x86_cpuid_0x80000006 in
+ *:*:*[[1-9a-f]]??????:*) # (L2 = ecx >> 16) >= 256
+ ax_gcc_arch="athlon-xp athlon-4 athlon k7" ;;
+ *) ax_gcc_arch="athlon-4 athlon k7" ;;
+ esac ;;
+ *f[[4cef8b]]?:*:*:*) ax_gcc_arch="athlon64 k8" ;;
+ *f5?:*:*:*) ax_gcc_arch="opteron k8" ;;
+ *f7?:*:*:*) ax_gcc_arch="athlon-fx opteron k8" ;;
+ *f??:*:*:*) ax_gcc_arch="k8" ;;
+ esac ;;
+ *:746e6543:*:*) # IDT
+ case $ax_cv_gcc_x86_cpuid_1 in
+ *54?:*:*:*) ax_gcc_arch=winchip-c6 ;;
+ *58?:*:*:*) ax_gcc_arch=winchip2 ;;
+ *6[[78]]?:*:*:*) ax_gcc_arch=c3 ;;
+ *69?:*:*:*) ax_gcc_arch="c3-2 c3" ;;
+ esac ;;
+ esac
+ if test x"$ax_gcc_arch" = x; then # fallback
+ case $host_cpu in
+ i586*) ax_gcc_arch=pentium ;;
+ i686*) ax_gcc_arch=pentiumpro ;;
+ esac
+ fi
+ ;;
+
+ sparc*)
+ AC_PATH_PROG([PRTDIAG], [prtdiag], [prtdiag], [$PATH:/usr/platform/`uname -i`/sbin/:/usr/platform/`uname -m`/sbin/])
+ cputype=`(((grep cpu /proc/cpuinfo | cut -d: -f2) ; ($PRTDIAG -v |grep -i sparc) ; grep -i cpu /var/run/dmesg.boot ) | head -n 1) 2> /dev/null`
+ cputype=`echo "$cputype" | tr -d ' -' |tr $as_cr_LETTERS $as_cr_letters`
+ case $cputype in
+ *ultrasparciv*) ax_gcc_arch="ultrasparc4 ultrasparc3 ultrasparc v9" ;;
+ *ultrasparciii*) ax_gcc_arch="ultrasparc3 ultrasparc v9" ;;
+ *ultrasparc*) ax_gcc_arch="ultrasparc v9" ;;
+ *supersparc*|*tms390z5[[05]]*) ax_gcc_arch="supersparc v8" ;;
+ *hypersparc*|*rt62[[056]]*) ax_gcc_arch="hypersparc v8" ;;
+ *cypress*) ax_gcc_arch=cypress ;;
+ esac ;;
+
+ alphaev5) ax_gcc_arch=ev5 ;;
+ alphaev56) ax_gcc_arch=ev56 ;;
+ alphapca56) ax_gcc_arch="pca56 ev56" ;;
+ alphapca57) ax_gcc_arch="pca57 pca56 ev56" ;;
+ alphaev6) ax_gcc_arch=ev6 ;;
+ alphaev67) ax_gcc_arch=ev67 ;;
+ alphaev68) ax_gcc_arch="ev68 ev67" ;;
+ alphaev69) ax_gcc_arch="ev69 ev68 ev67" ;;
+ alphaev7) ax_gcc_arch="ev7 ev69 ev68 ev67" ;;
+ alphaev79) ax_gcc_arch="ev79 ev7 ev69 ev68 ev67" ;;
+
+ powerpc*)
+ cputype=`((grep cpu /proc/cpuinfo | head -n 1 | cut -d: -f2 | cut -d, -f1 | sed 's/ //g') ; /usr/bin/machine ; /bin/machine; grep CPU /var/run/dmesg.boot | head -n 1 | cut -d" " -f2) 2> /dev/null`
+ cputype=`echo $cputype | sed -e 's/ppc//g;s/ *//g'`
+ case $cputype in
+ *750*) ax_gcc_arch="750 G3" ;;
+ *740[[0-9]]*) ax_gcc_arch="$cputype 7400 G4" ;;
+ *74[[4-5]][[0-9]]*) ax_gcc_arch="$cputype 7450 G4" ;;
+ *74[[0-9]][[0-9]]*) ax_gcc_arch="$cputype G4" ;;
+ *970*) ax_gcc_arch="970 G5 power4";;
+ *POWER4*|*power4*|*gq*) ax_gcc_arch="power4 970";;
+ *POWER5*|*power5*|*gr*|*gs*) ax_gcc_arch="power5 power4 970";;
+ 603ev|8240) ax_gcc_arch="$cputype 603e 603";;
+ *) ax_gcc_arch=$cputype ;;
+ esac
+ ax_gcc_arch="$ax_gcc_arch powerpc"
+ ;;
+esac
+fi # not cross-compiling
+fi # guess arch
+
+if test "x$ax_gcc_arch" != x -a "x$ax_gcc_arch" != xno; then
+for arch in $ax_gcc_arch; do
+ if test "x[]m4_default([$1],yes)" = xyes; then # if we require portable code
+ flags="-mtune=$arch"
+ # -mcpu=$arch and m$arch generate nonportable code on every arch except
+ # x86. And some other arches (e.g. Alpha) don't accept -mtune. Grrr.
+ case $host_cpu in i*86|x86_64*) flags="$flags -mcpu=$arch -m$arch";; esac
+ else
+ flags="-march=$arch -mcpu=$arch -m$arch"
+ fi
+ for flag in $flags; do
+ AX_CHECK_COMPILER_FLAGS($flag, [ax_cv_gcc_archflag=$flag; break])
+ done
+ test "x$ax_cv_gcc_archflag" = xunknown || break
+done
+fi
+
+fi # $GCC=yes
+])
+AC_MSG_CHECKING([for gcc architecture flag])
+AC_MSG_RESULT($ax_cv_gcc_archflag)
+if test "x$ax_cv_gcc_archflag" = xunknown; then
+ m4_default([$3],:)
+else
+ m4_default([$2], [CFLAGS="$CFLAGS $ax_cv_gcc_archflag"])
+fi
+])
+
+AC_DEFUN([AX_CHECK_COMPILER_FLAGS],
+[AC_PREREQ(2.59) dnl for _AC_LANG_PREFIX
+AC_MSG_CHECKING([whether _AC_LANG compiler accepts $1])
+dnl Some hackery here since AC_CACHE_VAL can't handle a non-literal varname:
+AS_LITERAL_IF([$1],
+ [AC_CACHE_VAL(AS_TR_SH(ax_cv_[]_AC_LANG_ABBREV[]_flags_$1), [
+ ax_save_FLAGS=$[]_AC_LANG_PREFIX[]FLAGS
+ _AC_LANG_PREFIX[]FLAGS="$1"
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM()],
+ AS_TR_SH(ax_cv_[]_AC_LANG_ABBREV[]_flags_$1)=yes,
+ AS_TR_SH(ax_cv_[]_AC_LANG_ABBREV[]_flags_$1)=no)
+ _AC_LANG_PREFIX[]FLAGS=$ax_save_FLAGS])],
+ [ax_save_FLAGS=$[]_AC_LANG_PREFIX[]FLAGS
+ _AC_LANG_PREFIX[]FLAGS="$1"
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM()],
+ eval AS_TR_SH(ax_cv_[]_AC_LANG_ABBREV[]_flags_$1)=yes,
+ eval AS_TR_SH(ax_cv_[]_AC_LANG_ABBREV[]_flags_$1)=no)
+ _AC_LANG_PREFIX[]FLAGS=$ax_save_FLAGS])
+eval ax_check_compiler_flags=$AS_TR_SH(ax_cv_[]_AC_LANG_ABBREV[]_flags_$1)
+AC_MSG_RESULT($ax_check_compiler_flags)
+if test "x$ax_check_compiler_flags" = xyes; then
+ m4_default([$2], :)
+else
+ m4_default([$3], :)
+fi
+])dnl AX_CHECK_COMPILER_FLAG
Modified: freeswitch/branches/cypromis/trunk/build/config/ltmain.sh
==============================================================================
Added: freeswitch/branches/cypromis/trunk/build/config/packages.m4
==============================================================================
--- (empty file)
+++ freeswitch/branches/cypromis/trunk/build/config/packages.m4 Wed Jul 12 15:08:58 2006
@@ -0,0 +1,32 @@
+#### Look for wget ####
+AC_DEFUN([AC_PROG_WGET],[
+AC_CHECK_PROGS(wget,[wget],no)
+export wget;
+if test $wget = "no" ;
+then
+ AC_MSG_ERROR([Unable to find the wget application]);
+fi
+AC_SUBST(wget)
+])
+
+#### Look for gzip ####
+AC_DEFUN([AC_PROG_GZIP],[
+AC_CHECK_PROGS(gzip,[gzip],no)
+export gzip;
+if test $gzip = "no" ;
+then
+ AC_MSG_ERROR([Unable to find the gzip application]);
+fi
+AC_SUBST(gzip)
+])
+
+#### Look for gtar or tar ####
+AC_DEFUN([AC_PROG_GTAR],[
+AC_CHECK_PROGS(gtar,[gtar tar],no)
+export gtar;
+if test $gtar = "no" ;
+then
+ AC_MSG_ERROR([Unable to find a suitable tar application]);
+fi
+AC_SUBST(gtar)
+])
Added: freeswitch/branches/cypromis/trunk/configure.ac
==============================================================================
--- (empty file)
+++ freeswitch/branches/cypromis/trunk/configure.ac Wed Jul 12 15:08:58 2006
@@ -0,0 +1,115 @@
+# -*- Autoconf -*-
+# Process this file with autoconf to produce a configure script.
+
+AC_PREREQ(2.59)
+AC_INIT(FULL-PACKAGE-NAME, VERSION, BUG-REPORT-ADDRESS)
+AC_CONFIG_AUX_DIR(build/config)
+AM_INIT_AUTOMAKE(libfreeswitch,0.1)
+AC_CONFIG_SRCDIR([src/switch.c])
+AC_CONFIG_HEADER([src/include/switch_am_config.h])
+
+AC_PREFIX_DEFAULT(/usr/local/freeswitch)
+#Set default language
+AC_LANG_C
+# Checks for programs.
+AC_PROG_CC
+AC_PROG_AWK
+AC_PROG_GTAR
+AC_PROG_WGET
+AC_PROG_MAKE_SET
+AC_PROG_INSTALL
+AC_PROG_LIBTOOL
+
+#Check for compiler vendor
+AX_COMPILER_VENDOR
+
+# Checks for header files.
+AC_HEADER_DIRENT
+AC_HEADER_STDC
+AC_CHECK_HEADERS([sys/types.h])
+
+# Checks for typedefs, structures, and compiler characteristics.
+AC_C_CONST
+AC_C_INLINE
+AC_TYPE_SIZE_T
+AC_HEADER_TIME
+AC_STRUCT_TM
+
+# Checks for library functions.
+AC_PROG_GCC_TRADITIONAL
+AC_FUNC_MALLOC
+AC_TYPE_SIGNAL
+AC_FUNC_STRFTIME
+AC_CHECK_FUNCS([gethostname vasprintf mmap mlock mlockall])
+
+AC_C_BIGENDIAN(AC_DEFINE([__BYTE_ORDER],__BIG_ENDIAN,[Big Endian]),AC_DEFINE([__BYTE_ORDER],__LITTLE_ENDIAN,[Little Endian]))
+AC_DEFINE([__LITTLE_ENDIAN],1234,[for the places where it is not defined])
+AC_DEFINE([__BIG_ENDIAN],4321,[for the places where it is not defined])
+
+AC_ARG_ENABLE(crash-protection, [ --enable-crash-protection Compile with CRASH Protection],,[enable_crash_prot="no"])
+
+AM_CONDITIONAL([CRASHPROT],[test "x$enable_crash_prot" != "xno"])
+case "$host" in
+ *-solaris2*)
+ if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then
+ SOLINK="-Bdynamic -dy -G"
+ AM_CFLAGS="${CFLAGS} -KPIC -DPIC"
+ AM_LDFLAGS="-L${prefix}/lib -R${prefix}/lib"
+ FUNC_DEF=__func__
+ IN_LINE=""
+ elif test "x${ax_cv_c_compiler_vendor}" = "xgnu" ; then
+ SOLINK="-Bdynamic -dy -G"
+ AM_CFLAGS="${CFLAGS} -fPIC"
+ AM_LDFLAGS=""
+ IN_LINE=inline
+ fi
+ DYNAMIC_LIB_EXTEN="so"
+ ;;
+ *-darwin*)
+ if test "x${ax_cv_c_compiler_vendor}"="xgnu" ; then
+ SOLINK="-dynamic -bundle -undefined-surpress -force-flat-namespace"
+ AM_CFLAGS="${CFLAGS} -DMACOSX"
+ AM_LDFLAGS=""
+ fi
+ DYNAMIC_LIB_EXTEN="dylib"
+ ;;
+ x86_64-*-linux-gnu)
+ if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then
+ SOLINK="-Bdynamic -dy -G"
+ AM_CFLAGS="${CFLAGS} -KPIC -DPIC"
+ AM_LDFLAGS="-L${prefix}/lib -R${prefix}/lib"
+ FUNC_DEF=__func__
+ elif test "x${ax_cv_c_compiler_vendor}"="xgnu" ; then
+ SOLINK="-shared -Xlinker -x"
+ AM_CFLAGS="${CFLAGS} -fPIC"
+ AM_LDFLAGS=""
+ fi
+ DYNAMIC_LIB_EXTEN="so"
+ ;;
+ i*6-*-linux-gnu)
+ if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then
+ SOLINK="-Bdynamic -dy -G"
+ AM_CFLAGS="${CFLAGS} -KPIC -DPIC"
+ AM_LDFLAGS="-L${prefix}/lib -R${prefix}/lib"
+ FUNC_DEF=__func__
+ elif test "x${ax_cv_c_compiler_vendor}"="xgnu" ; then
+ SOLINK="-shared -Xlinker -x"
+ AM_CFLAGS="${CFLAGS} -fpic"
+ AM_LDFLAGS=""
+ fi
+ DYNAMIC_LIB_EXTEN="so"
+ ;;
+esac
+AC_SUBST(AM_CFLAGS)
+AC_SUBST(AM_LDFLAGS)
+AC_SUBST(SOLINK)
+AC_SUBST(DYNAMIC_LIB_EXTEN)
+AC_DEFINE_UNQUOTED([__FUNCTION__],[$FUNC_DEF],[define it the right way ;)])
+AC_DEFINE_UNQUOTED([inline],[$IN_LINE],[sunpro is bad at inline])
+AC_CONFIG_FILES([Makefile])
+
+AM_CONDITIONAL(ISLINUX, [test `uname -s` = Linux])
+AM_CONDITIONAL(ISMAC, [test `uname -s` = Darwin])
+AM_CONDITIONAL(IS64BITLINUX, [test `uname -m` = x86_64])
+
+AC_OUTPUT([src/include/switch_version.h])
Modified: freeswitch/branches/cypromis/trunk/libs/libspeakup/Makefile.am
==============================================================================
Modified: freeswitch/branches/cypromis/trunk/libs/libspeakup/Makefile.in
==============================================================================
Modified: freeswitch/branches/cypromis/trunk/libs/libspeakup/aclocal.m4
==============================================================================
Modified: freeswitch/branches/cypromis/trunk/libs/libspeakup/configure
==============================================================================
Modified: freeswitch/branches/cypromis/trunk/libs/libspeakup/configure.in
==============================================================================
Modified: freeswitch/branches/cypromis/trunk/libs/libteletone/INSTALL
==============================================================================
Modified: freeswitch/branches/cypromis/trunk/libs/libteletone/Makefile.am
==============================================================================
Modified: freeswitch/branches/cypromis/trunk/libs/libteletone/Makefile.in
==============================================================================
Modified: freeswitch/branches/cypromis/trunk/libs/libteletone/aclocal.m4
==============================================================================
Modified: freeswitch/branches/cypromis/trunk/libs/libteletone/config.guess
==============================================================================
Modified: freeswitch/branches/cypromis/trunk/libs/libteletone/config.sub
==============================================================================
Modified: freeswitch/branches/cypromis/trunk/libs/libteletone/configure
==============================================================================
Modified: freeswitch/branches/cypromis/trunk/libs/libteletone/configure.in
==============================================================================
Modified: freeswitch/branches/cypromis/trunk/libs/libteletone/depcomp
==============================================================================
Modified: freeswitch/branches/cypromis/trunk/libs/libteletone/install-sh
==============================================================================
Modified: freeswitch/branches/cypromis/trunk/libs/libteletone/ltmain.sh
==============================================================================
Modified: freeswitch/branches/cypromis/trunk/libs/libteletone/missing
==============================================================================
Modified: freeswitch/branches/cypromis/trunk/libs/libteletone/mkinstalldirs
==============================================================================
Modified: freeswitch/branches/cypromis/trunk/libs/srtp.build.sh
==============================================================================
Added: freeswitch/branches/cypromis/trunk/libs/srtp/acsite.m4
==============================================================================
--- (empty file)
+++ freeswitch/branches/cypromis/trunk/libs/srtp/acsite.m4 Wed Jul 12 15:08:58 2006
@@ -0,0 +1 @@
+m4_include([build/compiler.m4])
Added: freeswitch/branches/cypromis/trunk/libs/srtp/build/compiler.m4
==============================================================================
--- (empty file)
+++ freeswitch/branches/cypromis/trunk/libs/srtp/build/compiler.m4 Wed Jul 12 15:08:58 2006
@@ -0,0 +1,411 @@
+#### Find the compiler vendor ####
+AC_DEFUN([AX_COMPILER_VENDOR],
+[
+AC_CACHE_CHECK([for _AC_LANG compiler vendor], ax_cv_[]_AC_LANG_ABBREV[]_compiler_vendor,
+ [ax_cv_[]_AC_LANG_ABBREV[]_compiler_vendor=unknown
+ # note: don't check for gcc first since some other compilers define __GNUC__
+ for ventest in intel:__ICC,__ECC,__INTEL_COMPILER ibm:__xlc__,__xlC__,__IBMC__,__IBMCPP__ gnu:__GNUC__ sun:__SUNPRO_C,__SUNPRO_CC hp:__HP_cc,__HP_aCC dec:__DECC,__DECCXX,__DECC_VER,__DECCXX_VER borland:__BORLANDC__,__TURBOC__ comeau:__COMO__ cray:_CRAYC kai:__KCC lcc:__LCC__ metrowerks:__MWERKS__ sgi:__sgi,sgi microsoft:_MSC_VER watcom:__WATCOMC__ portland:__PGI; do
+ vencpp="defined("`echo $ventest | cut -d: -f2 | sed 's/,/) || defined(/g'`")"
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM(,[
+#if !($vencpp)
+ thisisanerror;
+#endif
+])], [ax_cv_]_AC_LANG_ABBREV[_compiler_vendor=`echo $ventest | cut -d: -f1`; break])
+ done
+ ])
+])
+
+
+#### Find the maximum optimisation for a centrain compiler ####
+AC_DEFUN([AX_CC_MAXOPT],
+[
+AC_REQUIRE([AC_PROG_CC])
+AC_REQUIRE([AX_COMPILER_VENDOR])
+
+AC_ARG_ENABLE(portable-binary, [AC_HELP_STRING([--enable-portable-binary], [disable compiler optimizations that would produce unportable binaries])],
+ acx_maxopt_portable=$withval, acx_maxopt_portable=no)
+
+# Try to determine "good" native compiler flags if none specified via CFLAGS
+if test "$ac_test_CFLAGS" != "set"; then
+ CFLAGS=""
+ case $ax_cv_c_compiler_vendor in
+ dec) CFLAGS="-newc -w0 -O5 -ansi_alias -ansi_args -fp_reorder -tune host"
+ if test "x$acx_maxopt_portable" = xno; then
+ CFLAGS="$CFLAGS -arch host"
+ fi;;
+
+ sun) CFLAGS="-native -fast -xO5 -dalign -xc99=all"
+ if test "x$acx_maxopt_portable" = xyes; then
+ CFLAGS="$CFLAGS -xarch=generic"
+ fi;;
+
+ hp) CFLAGS="+Oall +Optrs_ansi +DSnative"
+ if test "x$acx_maxopt_portable" = xyes; then
+ CFLAGS="$CFLAGS +DAportable"
+ fi;;
+
+ intel) CFLAGS="-O3 -ansi_alias"
+ if test "x$acx_maxopt_portable" = xno; then
+ icc_archflag=unknown
+ icc_flags=""
+ case $host_cpu in
+ i686*|x86_64*)
+ # icc accepts gcc assembly syntax, so these should work:
+ AX_GCC_X86_CPUID(0)
+ AX_GCC_X86_CPUID(1)
+ case $ax_cv_gcc_x86_cpuid_0 in # see AX_GCC_ARCHFLAG
+ *:756e6547:*:*) # Intel
+ case $ax_cv_gcc_x86_cpuid_1 in
+ *6a?:*[[234]]:*:*|*6[[789b]]?:*:*:*) icc_flags="-xK";;
+ *f3[[347]]:*:*:*|*f4[1347]:*:*:*) icc_flags="-xP -xN -xW -xK";;
+ *f??:*:*:*) icc_flags="-xN -xW -xK";;
+ esac ;;
+ esac ;;
+ esac
+ if test "x$icc_flags" != x; then
+ for flag in $icc_flags; do
+ AX_CHECK_COMPILER_FLAGS($flag, [icc_archflag=$flag; break])
+ done
+ fi
+ AC_MSG_CHECKING([for icc architecture flag])
+ AC_MSG_RESULT($icc_archflag)
+ if test "x$icc_archflag" != xunknown; then
+ CFLAGS="$CFLAGS $icc_archflag"
+ fi
+ fi
+ ;;
+
+ gnu)
+ # default optimization flags for gcc on all systems
+ CFLAGS="-O3 -fomit-frame-pointer"
+
+ # -malign-double for x86 systems
+ AX_CHECK_COMPILER_FLAGS(-malign-double, CFLAGS="$CFLAGS -malign-double")
+
+ # -fstrict-aliasing for gcc-2.95+
+ AX_CHECK_COMPILER_FLAGS(-fstrict-aliasing,
+ CFLAGS="$CFLAGS -fstrict-aliasing")
+
+ # note that we enable "unsafe" fp optimization with other compilers, too
+ AX_CHECK_COMPILER_FLAGS(-ffast-math, CFLAGS="$CFLAGS -ffast-math")
+
+ AX_GCC_ARCHFLAG($acx_maxopt_portable)
+ ;;
+ esac
+
+ if test -z "$CFLAGS"; then
+ echo ""
+ echo "********************************************************"
+ echo "* WARNING: Don't know the best CFLAGS for this system *"
+ echo "* Use ./configure CFLAGS=... to specify your own flags *"
+ echo "* (otherwise, a default of CFLAGS=-O3 will be used) *"
+ echo "********************************************************"
+ echo ""
+ CFLAGS="-O3"
+ fi
+
+ AX_CHECK_COMPILER_FLAGS($CFLAGS, [], [
+ echo ""
+ echo "********************************************************"
+ echo "* WARNING: The guessed CFLAGS don't seem to work with *"
+ echo "* your compiler. *"
+ echo "* Use ./configure CFLAGS=... to specify your own flags *"
+ echo "********************************************************"
+ echo ""
+ CFLAGS=""
+ ])
+
+fi
+])
+
+#### Find the max compiler warning options for ANSI C ####
+AC_DEFUN([AX_CFLAGS_WARN_ALL_ANSI],[dnl
+AS_VAR_PUSHDEF([FLAGS],[CFLAGS])dnl
+AS_VAR_PUSHDEF([VAR],[ac_cv_cflags_warn_all_ansi])dnl
+AC_CACHE_CHECK([m4_ifval($1,$1,FLAGS) for maximum ansi warnings],
+VAR,[VAR="no, unknown"
+ AC_LANG_SAVE
+ AC_LANG_C
+ ac_save_[]FLAGS="$[]FLAGS"
+# IRIX C compiler:
+# -use_readonly_const is the default for IRIX C,
+# puts them into .rodata, but they are copied later.
+# need to be "-G0 -rdatashared" for strictmode but
+# I am not sure what effect that has really. - guidod
+for ac_arg dnl
+in "-pedantic % -Wall -std=c99 -pedantic" dnl GCC
+ "-xstrconst % -v -Xc -xc99=all" dnl Solaris C
+ "-std1 % -verbose -w0 -warnprotos -std1" dnl Digital Unix
+ " % -qlanglvl=ansi -qsrcmsg -qinfo=all:noppt:noppc:noobs:nocnd" dnl AIX
+ " % -ansi -ansiE -fullwarn" dnl IRIX
+ "+ESlit % +w1 -Aa" dnl HP-UX C
+ "-Xc % -pvctl[,]fullmsg -Xc" dnl NEC SX-5 (Super-UX 10)
+ "-h conform % -h msglevel 2 -h conform" dnl Cray C (Unicos)
+ #
+do FLAGS="$ac_save_[]FLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'`
+ AC_TRY_COMPILE([],[return 0;],
+ [VAR=`echo $ac_arg | sed -e 's,.*% *,,'` ; break])
+done
+ FLAGS="$ac_save_[]FLAGS"
+ AC_LANG_RESTORE
+])
+case ".$VAR" in
+ .ok|.ok,*) m4_ifvaln($3,$3) ;;
+ .|.no|.no,*) m4_ifvaln($4,$4,[m4_ifval($2,[
+ AC_RUN_LOG([: m4_ifval($1,$1,FLAGS)="$m4_ifval($1,$1,FLAGS) $2"])
+ m4_ifval($1,$1,FLAGS)="$m4_ifval($1,$1,FLAGS) $2"])]) ;;
+ *) m4_ifvaln($3,$3,[
+ if echo " $[]m4_ifval($1,$1,FLAGS) " | grep " $VAR " 2>&1 >/dev/null
+ then AC_RUN_LOG([: m4_ifval($1,$1,FLAGS) does contain $VAR])
+ else AC_RUN_LOG([: m4_ifval($1,$1,FLAGS)="$m4_ifval($1,$1,FLAGS) $VAR"])
+ m4_ifval($1,$1,FLAGS)="$m4_ifval($1,$1,FLAGS) $VAR"
+ fi ]) ;;
+esac
+AS_VAR_POPDEF([VAR])dnl
+AS_VAR_POPDEF([FLAGS])dnl
+])
+
+dnl the only difference - the LANG selection... and the default FLAGS
+
+AC_DEFUN([AX_CXXFLAGS_WARN_ALL_ANSI],[dnl
+AS_VAR_PUSHDEF([FLAGS],[CXXFLAGS])dnl
+AS_VAR_PUSHDEF([VAR],[ac_cv_cxxflags_warn_all_ansi])dnl
+AC_CACHE_CHECK([m4_ifval($1,$1,FLAGS) for maximum ansi warnings],
+VAR,[VAR="no, unknown"
+ AC_LANG_SAVE
+ AC_LANG_CXX
+ ac_save_[]FLAGS="$[]FLAGS"
+# IRIX C compiler:
+# -use_readonly_const is the default for IRIX C,
+# puts them into .rodata, but they are copied later.
+# need to be "-G0 -rdatashared" for strictmode but
+# I am not sure what effect that has really. - guidod
+for ac_arg dnl
+in "-pedantic % -Wall -ansi -pedantic" dnl GCC
+ "-xstrconst % -v -Xc" dnl Solaris C
+ "-std1 % -verbose -w0 -warnprotos -std1" dnl Digital Unix
+ " % -qlanglvl=ansi -qsrcmsg -qinfo=all:noppt:noppc:noobs:nocnd" dnl AIX
+ " % -ansi -ansiE -fullwarn" dnl IRIX
+ "+ESlit % +w1 -Aa" dnl HP-UX C
+ "-Xc % -pvctl[,]fullmsg -Xc" dnl NEC SX-5 (Super-UX 10)
+ "-h conform % -h msglevel 2 -h conform" dnl Cray C (Unicos)
+ #
+do FLAGS="$ac_save_[]FLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'`
+ AC_TRY_COMPILE([],[return 0;],
+ [VAR=`echo $ac_arg | sed -e 's,.*% *,,'` ; break])
+done
+ FLAGS="$ac_save_[]FLAGS"
+ AC_LANG_RESTORE
+])
+case ".$VAR" in
+ .ok|.ok,*) m4_ifvaln($3,$3) ;;
+ .|.no|.no,*) m4_ifvaln($4,$4,[m4_ifval($2,[
+ AC_RUN_LOG([: m4_ifval($1,$1,FLAGS)="$m4_ifval($1,$1,FLAGS) $2"])
+ m4_ifval($1,$1,FLAGS)="$m4_ifval($1,$1,FLAGS) $2"])]) ;;
+ *) m4_ifvaln($3,$3,[
+ if echo " $[]m4_ifval($1,$1,FLAGS) " | grep " $VAR " 2>&1 >/dev/null
+ then AC_RUN_LOG([: m4_ifval($1,$1,FLAGS) does contain $VAR])
+ else AC_RUN_LOG([: m4_ifval($1,$1,FLAGS)="$m4_ifval($1,$1,FLAGS) $VAR"])
+ m4_ifval($1,$1,FLAGS)="$m4_ifval($1,$1,FLAGS) $VAR"
+ fi ]) ;;
+esac
+AS_VAR_POPDEF([VAR])dnl
+AS_VAR_POPDEF([FLAGS])dnl
+])
+
+
+AC_DEFUN([AX_GCC_X86_CPUID],
+[AC_REQUIRE([AC_PROG_CC])
+AC_LANG_PUSH([C])
+AC_CACHE_CHECK(for x86 cpuid $1 output, ax_cv_gcc_x86_cpuid_$1,
+ [AC_RUN_IFELSE([AC_LANG_PROGRAM([#include <stdio.h>], [
+ int op = $1, eax, ebx, ecx, edx;
+ FILE *f;
+ __asm__("cpuid"
+ : "=a" (eax), "=b" (ebx), "=c" (ecx), "=d" (edx)
+ : "a" (op));
+ f = fopen("conftest_cpuid", "w"); if (!f) return 1;
+ fprintf(f, "%x:%x:%x:%x\n", eax, ebx, ecx, edx);
+ fclose(f);
+ return 0;
+])],
+ [ax_cv_gcc_x86_cpuid_$1=`cat conftest_cpuid`; rm -f conftest_cpuid],
+ [ax_cv_gcc_x86_cpuid_$1=unknown; rm -f conftest_cpuid],
+ [ax_cv_gcc_x86_cpuid_$1=unknown])])
+AC_LANG_POP([C])
+])
+
+AC_DEFUN([AX_GCC_ARCHFLAG],
+[AC_REQUIRE([AC_PROG_CC])
+
+AC_ARG_WITH(gcc-arch, [AC_HELP_STRING([--with-gcc-arch=<arch>], [use architecture <arch> for gcc -march/-mtune, instead of guessing])],
+ ax_gcc_arch=$withval, ax_gcc_arch=yes)
+
+AC_MSG_CHECKING([for gcc architecture flag])
+AC_MSG_RESULT([])
+AC_CACHE_VAL(ax_cv_gcc_archflag,
+[
+ax_cv_gcc_archflag="unknown"
+
+if test "$GCC" = yes; then
+
+if test "x$ax_gcc_arch" = xyes; then
+ax_gcc_arch=""
+if test "$cross_compiling" = no; then
+case $host_cpu in
+ i[[3456]]86*|x86_64*) # use cpuid codes, in part from x86info-1.7 by D. Jones
+ AX_GCC_X86_CPUID(0)
+ AX_GCC_X86_CPUID(1)
+ case $ax_cv_gcc_x86_cpuid_0 in
+ *:756e6547:*:*) # Intel
+ case $ax_cv_gcc_x86_cpuid_1 in
+ *5[[48]]?:*:*:*) ax_gcc_arch="pentium-mmx pentium" ;;
+ *5??:*:*:*) ax_gcc_arch=pentium ;;
+ *6[[3456]]?:*:*:*) ax_gcc_arch="pentium2 pentiumpro" ;;
+ *6a?:*[[01]]:*:*) ax_gcc_arch="pentium2 pentiumpro" ;;
+ *6a?:*[[234]]:*:*) ax_gcc_arch="pentium3 pentiumpro" ;;
+ *6[[9d]]?:*:*:*) ax_gcc_arch="pentium-m pentium3 pentiumpro" ;;
+ *6[[78b]]?:*:*:*) ax_gcc_arch="pentium3 pentiumpro" ;;
+ *6??:*:*:*) ax_gcc_arch=pentiumpro ;;
+ *f3[[347]]:*:*:*|*f4[1347]:*:*:*)
+ case $host_cpu in
+ x86_64*) ax_gcc_arch="nocona pentium4 pentiumpro" ;;
+ *) ax_gcc_arch="prescott pentium4 pentiumpro" ;;
+ esac ;;
+ *f??:*:*:*) ax_gcc_arch="pentium4 pentiumpro";;
+ esac ;;
+ *:68747541:*:*) # AMD
+ case $ax_cv_gcc_x86_cpuid_1 in
+ *5[[67]]?:*:*:*) ax_gcc_arch=k6 ;;
+ *5[[8d]]?:*:*:*) ax_gcc_arch="k6-2 k6" ;;
+ *5[[9]]?:*:*:*) ax_gcc_arch="k6-3 k6" ;;
+ *60?:*:*:*) ax_gcc_arch=k7 ;;
+ *6[[12]]?:*:*:*) ax_gcc_arch="athlon k7" ;;
+ *6[[34]]?:*:*:*) ax_gcc_arch="athlon-tbird k7" ;;
+ *67?:*:*:*) ax_gcc_arch="athlon-4 athlon k7" ;;
+ *6[[68a]]?:*:*:*)
+ AX_GCC_X86_CPUID(0x80000006) # L2 cache size
+ case $ax_cv_gcc_x86_cpuid_0x80000006 in
+ *:*:*[[1-9a-f]]??????:*) # (L2 = ecx >> 16) >= 256
+ ax_gcc_arch="athlon-xp athlon-4 athlon k7" ;;
+ *) ax_gcc_arch="athlon-4 athlon k7" ;;
+ esac ;;
+ *f[[4cef8b]]?:*:*:*) ax_gcc_arch="athlon64 k8" ;;
+ *f5?:*:*:*) ax_gcc_arch="opteron k8" ;;
+ *f7?:*:*:*) ax_gcc_arch="athlon-fx opteron k8" ;;
+ *f??:*:*:*) ax_gcc_arch="k8" ;;
+ esac ;;
+ *:746e6543:*:*) # IDT
+ case $ax_cv_gcc_x86_cpuid_1 in
+ *54?:*:*:*) ax_gcc_arch=winchip-c6 ;;
+ *58?:*:*:*) ax_gcc_arch=winchip2 ;;
+ *6[[78]]?:*:*:*) ax_gcc_arch=c3 ;;
+ *69?:*:*:*) ax_gcc_arch="c3-2 c3" ;;
+ esac ;;
+ esac
+ if test x"$ax_gcc_arch" = x; then # fallback
+ case $host_cpu in
+ i586*) ax_gcc_arch=pentium ;;
+ i686*) ax_gcc_arch=pentiumpro ;;
+ esac
+ fi
+ ;;
+
+ sparc*)
+ AC_PATH_PROG([PRTDIAG], [prtdiag], [prtdiag], [$PATH:/usr/platform/`uname -i`/sbin/:/usr/platform/`uname -m`/sbin/])
+ cputype=`(((grep cpu /proc/cpuinfo | cut -d: -f2) ; ($PRTDIAG -v |grep -i sparc) ; grep -i cpu /var/run/dmesg.boot ) | head -n 1) 2> /dev/null`
+ cputype=`echo "$cputype" | tr -d ' -' |tr $as_cr_LETTERS $as_cr_letters`
+ case $cputype in
+ *ultrasparciv*) ax_gcc_arch="ultrasparc4 ultrasparc3 ultrasparc v9" ;;
+ *ultrasparciii*) ax_gcc_arch="ultrasparc3 ultrasparc v9" ;;
+ *ultrasparc*) ax_gcc_arch="ultrasparc v9" ;;
+ *supersparc*|*tms390z5[[05]]*) ax_gcc_arch="supersparc v8" ;;
+ *hypersparc*|*rt62[[056]]*) ax_gcc_arch="hypersparc v8" ;;
+ *cypress*) ax_gcc_arch=cypress ;;
+ esac ;;
+
+ alphaev5) ax_gcc_arch=ev5 ;;
+ alphaev56) ax_gcc_arch=ev56 ;;
+ alphapca56) ax_gcc_arch="pca56 ev56" ;;
+ alphapca57) ax_gcc_arch="pca57 pca56 ev56" ;;
+ alphaev6) ax_gcc_arch=ev6 ;;
+ alphaev67) ax_gcc_arch=ev67 ;;
+ alphaev68) ax_gcc_arch="ev68 ev67" ;;
+ alphaev69) ax_gcc_arch="ev69 ev68 ev67" ;;
+ alphaev7) ax_gcc_arch="ev7 ev69 ev68 ev67" ;;
+ alphaev79) ax_gcc_arch="ev79 ev7 ev69 ev68 ev67" ;;
+
+ powerpc*)
+ cputype=`((grep cpu /proc/cpuinfo | head -n 1 | cut -d: -f2 | cut -d, -f1 | sed 's/ //g') ; /usr/bin/machine ; /bin/machine; grep CPU /var/run/dmesg.boot | head -n 1 | cut -d" " -f2) 2> /dev/null`
+ cputype=`echo $cputype | sed -e 's/ppc//g;s/ *//g'`
+ case $cputype in
+ *750*) ax_gcc_arch="750 G3" ;;
+ *740[[0-9]]*) ax_gcc_arch="$cputype 7400 G4" ;;
+ *74[[4-5]][[0-9]]*) ax_gcc_arch="$cputype 7450 G4" ;;
+ *74[[0-9]][[0-9]]*) ax_gcc_arch="$cputype G4" ;;
+ *970*) ax_gcc_arch="970 G5 power4";;
+ *POWER4*|*power4*|*gq*) ax_gcc_arch="power4 970";;
+ *POWER5*|*power5*|*gr*|*gs*) ax_gcc_arch="power5 power4 970";;
+ 603ev|8240) ax_gcc_arch="$cputype 603e 603";;
+ *) ax_gcc_arch=$cputype ;;
+ esac
+ ax_gcc_arch="$ax_gcc_arch powerpc"
+ ;;
+esac
+fi # not cross-compiling
+fi # guess arch
+
+if test "x$ax_gcc_arch" != x -a "x$ax_gcc_arch" != xno; then
+for arch in $ax_gcc_arch; do
+ if test "x[]m4_default([$1],yes)" = xyes; then # if we require portable code
+ flags="-mtune=$arch"
+ # -mcpu=$arch and m$arch generate nonportable code on every arch except
+ # x86. And some other arches (e.g. Alpha) don't accept -mtune. Grrr.
+ case $host_cpu in i*86|x86_64*) flags="$flags -mcpu=$arch -m$arch";; esac
+ else
+ flags="-march=$arch -mcpu=$arch -m$arch"
+ fi
+ for flag in $flags; do
+ AX_CHECK_COMPILER_FLAGS($flag, [ax_cv_gcc_archflag=$flag; break])
+ done
+ test "x$ax_cv_gcc_archflag" = xunknown || break
+done
+fi
+
+fi # $GCC=yes
+])
+AC_MSG_CHECKING([for gcc architecture flag])
+AC_MSG_RESULT($ax_cv_gcc_archflag)
+if test "x$ax_cv_gcc_archflag" = xunknown; then
+ m4_default([$3],:)
+else
+ m4_default([$2], [CFLAGS="$CFLAGS $ax_cv_gcc_archflag"])
+fi
+])
+
+AC_DEFUN([AX_CHECK_COMPILER_FLAGS],
+[AC_PREREQ(2.59) dnl for _AC_LANG_PREFIX
+AC_MSG_CHECKING([whether _AC_LANG compiler accepts $1])
+dnl Some hackery here since AC_CACHE_VAL can't handle a non-literal varname:
+AS_LITERAL_IF([$1],
+ [AC_CACHE_VAL(AS_TR_SH(ax_cv_[]_AC_LANG_ABBREV[]_flags_$1), [
+ ax_save_FLAGS=$[]_AC_LANG_PREFIX[]FLAGS
+ _AC_LANG_PREFIX[]FLAGS="$1"
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM()],
+ AS_TR_SH(ax_cv_[]_AC_LANG_ABBREV[]_flags_$1)=yes,
+ AS_TR_SH(ax_cv_[]_AC_LANG_ABBREV[]_flags_$1)=no)
+ _AC_LANG_PREFIX[]FLAGS=$ax_save_FLAGS])],
+ [ax_save_FLAGS=$[]_AC_LANG_PREFIX[]FLAGS
+ _AC_LANG_PREFIX[]FLAGS="$1"
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM()],
+ eval AS_TR_SH(ax_cv_[]_AC_LANG_ABBREV[]_flags_$1)=yes,
+ eval AS_TR_SH(ax_cv_[]_AC_LANG_ABBREV[]_flags_$1)=no)
+ _AC_LANG_PREFIX[]FLAGS=$ax_save_FLAGS])
+eval ax_check_compiler_flags=$AS_TR_SH(ax_cv_[]_AC_LANG_ABBREV[]_flags_$1)
+AC_MSG_RESULT($ax_check_compiler_flags)
+if test "x$ax_check_compiler_flags" = xyes; then
+ m4_default([$2], :)
+else
+ m4_default([$3], :)
+fi
+])dnl AX_CHECK_COMPILER_FLAG
Modified: freeswitch/branches/cypromis/trunk/libs/srtp/configure.in
==============================================================================
Modified: freeswitch/branches/cypromis/trunk/src/include/switch_am_config.h.in
==============================================================================
Modified: freeswitch/branches/cypromis/trunk/src/include/switch_platform.h
==============================================================================
Modified: freeswitch/branches/cypromis/trunk/src/switch_rtp.c
==============================================================================
More information about the Freeswitch-svn
mailing list