~vitty/armagetronad/trunk-armagetronad-breakpad

Viewing changes to configure.ac

Committer: z-man
Date: 2010-08-06 07:05:46 UTC
Revision ID: svn-v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs:7d95bf1e-0414-0410-9756-b78462a59f44:armagetronad%2Ftrunk%2Farmagetronad:9426

Merging branch 0.2.8 from revision 9356 to 9425:
------------------------------------------------------------------------
r9424 | bazaarmagetron | 2010-06-28 17:45:41 +0200 (Mon, 28 Jun 2010) | 2 lines

Manuel Moos: Improving readability of console and in-game menu by fading the background to black with an alpha quad.

------------------------------------------------------------------------
r9423 | bazaarmagetron | 2010-06-25 16:03:21 +0200 (Fri, 25 Jun 2010) | 2 lines

Manuel Moos: Finishing passing of configuration directory from last merge.

------------------------------------------------------------------------
r9422 | bazaarmagetron | 2010-06-25 16:02:48 +0200 (Fri, 25 Jun 2010) | 5 lines

author: Manuel Moos
Merging own changes from earlier:
- Added passing down of $CONFIG directory in serverstarter scripts.
- Hovering over color menu items no longer breaks debug recording playback fast forward.

------------------------------------------------------------------------
r9421 | bazaarmagetron | 2010-06-24 01:04:25 +0200 (Thu, 24 Jun 2010) | 2 lines

Manuel Moos: Merging own forgotten changes.

------------------------------------------------------------------------
r9420 | bazaarmagetron | 2010-06-07 15:19:04 +0200 (Mon, 07 Jun 2010) | 2 lines

Manuel Moos: Avoiding player list read overflow. How did this go unnoticed for so long?

------------------------------------------------------------------------
r9419 | bazaarmagetron | 2010-05-27 13:36:19 +0200 (Thu, 27 May 2010) | 2 lines

Manuel Moos: Fixing aspect ratio calculations. In all practical cases, ensuring vertical fov did not happen; in those where something happened (really, really high screens), it overcompensated and distorted the image.

------------------------------------------------------------------------
r9418 | bazaarmagetron | 2010-05-26 15:04:31 +0200 (Wed, 26 May 2010) | 2 lines

Manuel Moos: Taking ownership of ALL network objects formerly belonging to a deleted user.

------------------------------------------------------------------------
r9417 | bazaarmagetron | 2010-05-26 15:03:55 +0200 (Wed, 26 May 2010) | 2 lines

Manuel Moos: Clearing send queue on new user login. Fixes one instance of odd authentication dialogs popping up.

------------------------------------------------------------------------
r9416 | bazaarmagetron | 2010-05-26 15:03:19 +0200 (Wed, 26 May 2010) | 2 lines

Manuel Moos: Simplified default login procedure for @forums accounts.

------------------------------------------------------------------------
r9415 | bazaarmagetron | 2010-04-25 23:27:21 +0200 (Sun, 25 Apr 2010) | 2 lines

Manuel Moos: Updated to current version from gnu.org. Address change, formatting, and LGPL is now the lesser GNU License.

------------------------------------------------------------------------
r9414 | bazaarmagetron | 2010-04-25 23:26:49 +0200 (Sun, 25 Apr 2010) | 2 lines

Manuel Moos: Using OUR version of COPYING.

------------------------------------------------------------------------
r9413 | bazaarmagetron | 2010-04-22 12:33:03 +0200 (Thu, 22 Apr 2010) | 2 lines

Manuel Moos: Avoiding reloading of title screen when textures are reloaded and it isn't actually getting displayed.

------------------------------------------------------------------------
r9412 | bazaarmagetron | 2010-04-19 20:02:56 +0200 (Mon, 19 Apr 2010) | 1 line

Luke Dashjr: replace references to guru3.sytes.net with working URIs at forums.armagetronad.net
------------------------------------------------------------------------
r9408 | bazaarmagetron | 2010-04-17 19:02:43 +0200 (Sat, 17 Apr 2010) | 1 line

Luke Dashjr: main is not a valid hack for AC_CHECK_LIB... use valid values
------------------------------------------------------------------------
r9400 | bazaarmagetron | 2010-03-19 23:41:45 +0100 (Fri, 19 Mar 2010) | 1 line

Luke Dashjr: png_sig_cmp is in both libpng12 and libpng14, where as png_check_sig is only libpng12 --ssuominen
------------------------------------------------------------------------
r9377 | bazaarmagetron | 2010-02-22 20:39:56 +0100 (Mon, 22 Feb 2010) | 1 line

Manuel Moos: partial portugese translation
------------------------------------------------------------------------
r9375 | bazaarmagetron | 2010-02-21 01:16:35 +0100 (Sun, 21 Feb 2010) | 2 lines

Manuel Moos: More typo fixes.

------------------------------------------------------------------------
r9368 | bazaarmagetron | 2010-02-20 18:08:58 +0100 (Sat, 20 Feb 2010) | 2 lines

Manuel Moos: Rebranding support for configure error messages.

------------------------------------------------------------------------
r9367 | bazaarmagetron | 2010-02-20 18:08:00 +0100 (Sat, 20 Feb 2010) | 2 lines

Manuel Moos: Merging start menu branch.

------------------------------------------------------------------------
r9366 | bazaarmagetron | 2010-02-20 18:06:37 +0100 (Sat, 20 Feb 2010) | 2 lines

Manuel Moos: Merging tooltip branch.

------------------------------------------------------------------------
r9365 | bazaarmagetron | 2010-02-20 18:04:54 +0100 (Sat, 20 Feb 2010) | 2 lines

Manuel Moos: Merging luke's spelling fix branch.

------------------------------------------------------------------------
r9364 | bazaarmagetron | 2010-02-19 19:25:59 +0100 (Fri, 19 Feb 2010) | 2 lines

Manuel Moos: "Winner..." message only shown if there is a non-zero win score. Yeah, we don't care if it's negative.

------------------------------------------------------------------------

files added:
config/keys_cursor.cfg

config/keys_cursor_single.cfg

config/keys_twohand.cfg

config/keys_wasd.cfg

config/keys_x.cfg

config/keys_zqsd.cfg

language/portugese.txt

files modified:
COPYING.txt

batch/rcd_startstop.in

batch/serverstarter.in

bootstrap.sh

config/Makefile.am

config/default.cfg

config/settings.cfg

configure.ac

language/american.txt

language/british.txt

language/deutsch.txt

language/english_base.txt

language/english_base_notranslate.txt

src/doc/bugs.html.m4

src/doc/changelog.html.m4

src/engine/eCamera.cpp

src/engine/eCamera.h

src/engine/eGameObject.cpp

src/engine/ePlayer.cpp

src/engine/ePlayer.h

src/network/nNetObject.cpp

src/network/nNetwork.cpp

src/render/rConsole.h

src/render/rConsoleGraph.cpp

src/render/rFont.h

src/render/rViewport.cpp

src/tools/tColor.h

src/tools/tRecorder.cpp

src/tools/tSysTime.cpp

src/tron/gArmagetron.cpp

src/tron/gCycle.cpp

src/tron/gGame.cpp

src/tron/gGame.h

src/tron/gLanguageMenu.cpp

src/tron/gLanguageMenu.h

src/tron/gLogo.cpp

src/tron/gMenus.cpp

src/tron/gTeam.cpp

src/ui/uInput.cpp

src/ui/uInput.h

src/ui/uMenu.cpp

src/ui/uMenu.h

Show diffs side-by-side

added added

removed removed

configure.ac

650

CPPFLAGS="$CPPFLAGS `$XML2_CONFIG --cflags`"

651

LIBS="`$XML2_CONFIG --libs` $LIBS"

652

AC_DEFINE(HAVE_LIBXML2, 1, [Define if you have the xml2 library (-lxml2).]),

653

AC_MSG_ERROR([You need the library xml2 to compile Armagetron. Read the file doc/install_linux.html.])

653

AC_MSG_ERROR([You need the library xml2 to compile ${progtitle}. Read the file doc/install_linux.html.])

654

,`$XML2_CONFIG --libs`)

655

656

AC_CHECK_FUNC(xmlParserInputBufferCreateFilenameDefault,

780

781

AC_CHECK_FUNC(SDL_Init,

782

AC_DEFINE(HAVE_LIBSDL,,[Define if you have the library SDL]),

783

AC_MSG_ERROR([You need the library SDL to compile Armagetron. Read the file doc/install_linux.html.])

783

AC_MSG_ERROR([You need the library SDL to compile ${progtitle}. Read the file doc/install_linux.html.])

784

785

786

dnl ***************** OPTIONAL STUFF AFTER THIS POINT **********************

814

815

816

dnl *************************************************

817

dnl Winsock linking for cross-compilation. Not really supported.

818

dnl *************************************************

819

820

if test "`${SDL_CONFIG} --libs | grep windows`" ; then

821

AC_CHECK_LIB(wsock32, connect)

822

823

824

dnl *************************************************

817

825

dnl GL

818

826

dnl *************************************************

819

827

823

831

824

832

AC_CHECK_LIB($SYS_GL_LIB, glVertex3f,,

825

833

AC_MSG_RESULT([OpenGL not found. Maybe it needs X11 to compile? Checking that...])

826

AC_CHECK_LIB(X11,main,

834

AC_CHECK_LIB(X11,XOpenDisplay,

827

835

LIBS="-lX11 -L/usr/X11R6/lib $LIBS"

828

836

AC_DEFINE(HAVE_LIBX11, 1, [Define if you have the X11 library (-lX11).])

829

837

830

838

AC_MSG_WARN([

831

839

Standard X11 library needed by OpenGL not found.

832

840

]),-L/usr/X11R6/lib)

833

AC_CHECK_LIB(Xext,main,-L/usr/X11R6/lib)

834

AC_CHECK_LIB(Xt,main,-L/usr/X11R6/lib)

835

AC_CHECK_LIB(Xi,main,-L/usr/X11R6/lib)

836

AC_CHECK_LIB(Xmu,main,-L/usr/X11R6/lib)

841

AC_CHECK_LIB(Xext,XextFindDisplay,-L/usr/X11R6/lib)

842

AC_CHECK_LIB(Xt,XtFree,-L/usr/X11R6/lib)

843

AC_CHECK_LIB(Xi,XOpenDevice,-L/usr/X11R6/lib)

844

AC_CHECK_LIB(Xmu,XmuDrawLogo,-L/usr/X11R6/lib)

837

845

AC_CHECK_LIB($SYS_GL_LIB, glBegin,,AC_MSG_ERROR([

838

You need Mesa or an OpenGL-System to compile Armagetron.

846

You need Mesa or an OpenGL-System to compile ${progtitle}.

839

847

Maybe your libGL needs the X libraries and your system does not

840

848

find them? Read the file doc/install_linux.html.]),-L/usr/X11R6/lib)

841

849

)

855

863

dnl AC_CHECK_LIB($SYS_GLU_LIB, gluBuild2DMipmaps,,

856

864

AC_CHECK_LIB($SYS_GLU_LIB, gluBuild3DMipmaps,,

857

865

AC_MSG_ERROR([

858

You need GLU to compile Armagetron; it SHOULD have come with OpenGL.

866

You need GLU to compile ${progtitle}; it SHOULD have come with OpenGL.

859

867

Read the file doc/install_linux.html.]))

860

868

861

869

dnl *************************************************

965

973

dnl Other Stuff

966

974

dnl *************************************************

967

975

968

dnl AC_CHECK_LIB(g++, main,,

976

dnl AC_CHECK_LIB(g++, cin,,

969

977

dnl AC_MSG_WARN([C++ standard library not found. You can ignore this warning on non-GNU-systems.]))

970

978

971

979

AC_LANG([C])

972

980

973

AC_CHECK_LIB(z, main,,

974

AC_MSG_ERROR([You need libz to compile Armagetron.]))

981

AC_CHECK_LIB(z, gzread,,

982

AC_MSG_ERROR([You need libz to compile ${progtitle}.]))

975

983

976

984

AC_MSG_CHECKING(whether libpng is installed)

977

985

if PNGLIBS=`libpng-config --libs`; then

981

989

CPPFLAGS="$CPPFLAGS `libpng-config --cflags`"

982

990

LIBS="$LIBS $PNGLIBS"

983

991

984

AC_CHECK_FUNC(png_check_sig,

992

AC_CHECK_FUNC(png_sig_cmp,

985

993

986

AC_MSG_ERROR([You need libpng to compile Armagetron.]))

994

AC_MSG_ERROR([You need libpng to compile ${progtitle}.]))

987

995

988

AC_CHECK_LIB(jpeg, main,,

996

AC_CHECK_LIB(jpeg, jpeg_read_header,,

989

997

AC_MSG_WARN([

990

998

libjpeg not found. Expect small graphical errors ( missing moviepack title screen ).]

991

999

)

993

1001

994

1002

AC_CHECK_LIB(SDL_image, IMG_Load,,

995

1003

dnl AC_CHECK_LIB(IMG, main,,

996

AC_MSG_ERROR([You need the library SDL_image to compile Armagetron.]

1004

AC_MSG_ERROR([You need the library SDL_image to compile ${progtitle}.]

997

1005

dnl )

998

1006

))

999

1007

1033

1041

1034

1042

1035

1043

1036

dnl Replace `main' with a function in -lpthread:

1037

1038

1044

dnl Checks for header files.

1039

1045

AC_HEADER_STDC

1040

1046

AC_CHECK_HEADERS(unistd.h)

Older »