--- configure.in.orig	2004-04-29 23:17:01 +0300

+++ configure.in	2006-01-21 18:53:56 +0200

@@ -22,126 +22,14 @@

 dnl 

 AM_CONFIG_HEADER(config.h)

-AC_C_CONST

-AC_PROG_CXX

-

-

-dnl

-dnl Switches

-dnl These allow packagers to "trim" openmortal, and split it into smaller packages.

-dnl

-                                                                                   

-AC_ARG_ENABLE(main,

-[  --enable-main           Include main data and binary [default: yes]],

-[case "${enableval}" in

-  yes) main=true ;;

-  no)  main=false ;;

-  *) AC_MSG_ERROR(bad value ${enableval} for --enable-main) ;;

-esac],[main=true])

-AM_CONDITIONAL(MAIN, test x$main = xtrue)

-

-AC_ARG_ENABLE(characters,

-[  --enable-characters     Include the first batch of characters [default: yes]],

-[case "${enableval}" in

-  yes) characters=true ;;

-  no)  characters=false ;;

-  *) AC_MSG_ERROR(bad value ${enableval} for --enable-characters) ;;

-esac],[characters=true])

-AM_CONDITIONAL(CHARACTERS, test x$characters = xtrue)

-

-AC_ARG_ENABLE(additional,

-[  --enable-additional     Include the second batch of characters [default: yes]],

-[case "${enableval}" in

-  yes) additional=true ;;

-  no)  additional=false ;;

-  *) AC_MSG_ERROR(bad value ${enableval} for --enable-additional) ;;

-esac],[additional=true])

-AM_CONDITIONAL(ADDITIONAL, test x$additional = xtrue)

-

-AC_ARG_ENABLE(thirdparty,

-[  --enable-thirdparty     Include the 3rd party characters [default: yes]],

-[case "${enableval}" in

-  yes) thirdparty=true ;;

-  no)  thirdparty=false ;;

-  *) AC_MSG_ERROR(bad value ${enableval} for --enable-thirdparty) ;;

-esac],[thirdparty=true])

-AM_CONDITIONAL(THIRDPARTY, test x$thirdparty = xtrue)

-

-

-

-

-

-dnl checks for programs.

-dnl first check for c/c++ compilers

-dnl AC_CHECK_COMPILERS

-

-dnl create only shared libtool-libraries

-dnl AC_ENABLE_SHARED(yes)

-

-dnl set the following to yes, if you want to create static

-dnl libtool-libraries

-dnl AC_ENABLE_STATIC(no)

 AC_SUBST(AUTODIRS)

-dnl in this space add everything you want to check for

-dnl examples are specific headers, libraries, etc.

-

-dnl Check for SDL

-SDL_VERSION=1.2.0

-AM_PATH_SDL($SDL_VERSION,

-	:,

-	AC_MSG_ERROR([*** SDL version $SDL_VERSION not found!])

-)

-CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"

-LIBS="$LIBS $SDL_LIBS"

-

-dnl Check for SDL_image

-

-AC_CHECK_LIB(SDL_image,

-	IMG_Load,

-	LIBS="$LIBS -lSDL_image",

-	AC_MSG_ERROR([*** SDL_image library not found!])

-)

-

-dnl Check for SDL_mixer

-

-AC_CHECK_LIB(SDL_mixer,

-	Mix_OpenAudio,

-	LIBS="$LIBS -lSDL_mixer",

-	AC_MSG_ERROR([*** SDL_mixer library not found!])

-)

-

-dnl Check for SDL_net

-

-AC_CHECK_LIB(SDL_net,

-	SDLNet_ResolveHost,

-	LIBS="$LIBS -lSDL_net",

-	AC_MSG_ERROR([*** SDL_net library not found!])

-)

-

-dnl Check for Freetype 2 library

-

-FT2_VERSION=2.1.0

-AC_CHECK_FT2(

-	$FT2_VERSION,

-	:,

-	AC_MSG_ERROR([*** FreeType 2 version $FT2_VERSION not found!])

-)

-CXXFLAGS="$CXXFLAGS $FT2_CFLAGS"

-LIBS="$LIBS $FT2_LIBS"

-

-dnl Perl-related stuff...

-

-OMAC_PERL_EMBED_FLAGS

-CXXFLAGS="$CXXFLAGS $perl_embed_ccflags"

-LIBS="$LIBS $perl_embed_ldflags"

-

 dnl perform program name transformation

 AC_ARG_PROGRAM

 dnl add here all your Makefiles. These will be created by configure

-AC_OUTPUT(Makefile src/Makefile

+AC_OUTPUT(Makefile

 data/Makefile

 data/characters/Makefile

 data/fonts/Makefile