diff options
| -rw-r--r-- | configure.ac | 18 | ||||
| -rw-r--r-- | include/Makefile.am | 3 | ||||
| -rw-r--r-- | lib/Makefile.am | 9 | ||||
| -rw-r--r-- | m4/baltisot.m4 | 53 | ||||
| -rw-r--r-- | m4/sdl.m4 | 175 | ||||
| -rw-r--r-- | po/POTFILES.in | 4 | ||||
| -rw-r--r-- | po/fr.po | 19 |
7 files changed, 280 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index b8f4e62..5983291 100644 --- a/configure.ac +++ b/configure.ac @@ -22,11 +22,26 @@ AM_PROG_LIBTOOL # Checks for libraries. AC_CHECK_LIB([c], [printf]) +AM_PATH_SDL(1.2.0, , AC_MSG_ERROR([SDL needed.])) +AM_PATH_BALTISOT(, AC_MSG_ERROR([Baltisot needed.])) +AC_SEARCH_LIBS(glVertex3d, GL, , [ + unset ac_cv_search_glVertex3d + AC_MSG_NOTICE([OpenGL not found in standard path. Looking in /usr/X11R6/lib]) + LDFLAGS="-L/usr/X11R6/lib $LDFLAGS" + AC_SEARCH_LIBS(glVertex3d, GL, , AC_MSG_ERROR([can't find OpenGL])) +]) +AC_SEARCH_LIBS(gluPerspective, GLU, , [ + unset ac_cv_search_gluPerspective + AC_MSG_NOTICE([GLU not found in standard path. Looking in /usr/X11R6/lib]) + LDFLAGS="-L/usr/X11R6/lib $LDFLAGS" + AC_SEARCH_LIBS(gluPerspective, GLU, , AC_MSG_ERROR([can't find GLU])) +]) # Checks for header files. AC_FUNC_ALLOCA AC_HEADER_STDC AC_CHECK_HEADERS([argz.h fcntl.h inttypes.h langinfo.h libintl.h limits.h locale.h malloc.h stddef.h stdint.h stdio_ext.h stdlib.h string.h strings.h sys/param.h unistd.h]) +AC_HEADER_STDBOOL # Checks for typedefs, structures, and compiler characteristics. AC_C_CONST @@ -41,7 +56,8 @@ ALL_LINGUAS="fr" AC_FUNC_MALLOC AC_FUNC_MMAP AC_FUNC_REALLOC -AC_CHECK_FUNCS([__argz_count __argz_next __argz_stringify getcwd mempcpy munmap nl_langinfo setlocale stpcpy strcasecmp strchr strcspn strdup strstr strtoul]) +AC_CHECK_FUNCS([__argz_count __argz_next __argz_stringify getcwd mempcpy munmap nl_langinfo setlocale stpcpy strcasecmp strchr strcspn strdup strstr strtoul atexit]) + AC_PATH_PROG(gmakepath, gmake) AC_PATH_PROG(unamepath, uname) diff --git a/include/Makefile.am b/include/Makefile.am index 1ad46fb..be0dd07 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -1 +1,4 @@ +pkginclude_HEADERS = \ +engine.h glbase.h glfont.h gltexture.h + noinst_HEADERS = gettext.h diff --git a/lib/Makefile.am b/lib/Makefile.am index e69de29..ffe8471 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -0,0 +1,9 @@ +localedir = $(datadir)/locale +DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@ +AM_CPPFLAGS = -Wall -Wstrict-prototypes @SDL_CFLAGS@ @BALTISOT_CFLAGS@ +LIBS = @SDL_LIBS@ @BALTISOT_LIBS@ +INCLUDES = -I.. -I../include -I$(includedir) +lib_LTLIBRARIES = libmogltk.la + +libmogltk_la_SOURCES = engine.cc glbase.cc glfont.cc gltexture.cc + diff --git a/m4/baltisot.m4 b/m4/baltisot.m4 new file mode 100644 index 0000000..bcb75e9 --- /dev/null +++ b/m4/baltisot.m4 @@ -0,0 +1,53 @@ +# Configure paths for Baltisot +# Nicolas Noble 2002-12-06 +# stolen from Sam Lantinga +# stolen from Manish Singh +# stolen back from Frank Belew +# stolen from Manish Singh +# Shamelessly stolen from Owen Taylor + +dnl AM_PATH_SDL([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]) +dnl Test for BALTISOT, and define BALTISOT_CFLAGS and BALTISOT_LIBS +dnl +AC_DEFUN(AM_PATH_BALTISOT, +[dnl +dnl Get the cflags and libraries from the baltisot-config script +dnl +AC_ARG_WITH(baltisot-prefix,[ --with-baltisot-prefix=PFX Prefix where Baltisot is installed (optional)], + baltisot_prefix="$withval", baltisot_prefix="") +AC_ARG_WITH(baltisot-exec-prefix,[ --with-baltisot-exec-prefix=PFX Exec prefix where Baltisot is installed (optional)], + baltisot_exec_prefix="$withval", baltisot_exec_prefix="") + + if test x$baltisot_exec_prefix != x ; then + baltisot_args="$baltisot_args --exec-prefix=$baltisot_exec_prefix" + if test x${BALTISOT_CONFIG+set} != xset ; then + BALTISOT_CONFIG=$baltisot_exec_prefix/bin/baltisot-config + fi + fi + if test x$baltisot_prefix != x ; then + baltisot_args="$baltisot_args --prefix=$baltisot_prefix" + if test x${BALTISOT_CONFIG+set} != xset ; then + BALTISOT_CONFIG=$baltisot_prefix/bin/baltisot-config + fi + fi + + PATH="$prefix/bin:$prefix/usr/bin:$PATH" + AC_PATH_PROG(BALTISOT_CONFIG, baltisot-config, no, [$PATH]) + no_baltisot="" + if test "$BALTISOT_CONFIG" = "no" ; then + no_baltisot=yes + else + BALTISOT_CFLAGS=`$BALTISOT_CONFIG $baltisotconf_args --cflags` + BALTISOT_LIBS=`$BALTISOT_CONFIG $baltisotconf_args --libs` + fi + + if test "x$no_baltisot" = x ; then + ifelse([$1], , :, [$1]) + else + BALTISOT_CFLAGS="" + BALTISOT_LIBS="" + ifelse([$2], , :, [$2]) + fi + AC_SUBST(BALTISOT_CFLAGS) + AC_SUBST(BALTISOT_LIBS) +]) diff --git a/m4/sdl.m4 b/m4/sdl.m4 new file mode 100644 index 0000000..4cba2c4 --- /dev/null +++ b/m4/sdl.m4 @@ -0,0 +1,175 @@ +# Configure paths for SDL +# Sam Lantinga 9/21/99 +# stolen from Manish Singh +# stolen back from Frank Belew +# stolen from Manish Singh +# Shamelessly stolen from Owen Taylor + +dnl AM_PATH_SDL([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) +dnl Test for SDL, and define SDL_CFLAGS and SDL_LIBS +dnl +AC_DEFUN(AM_PATH_SDL, +[dnl +dnl Get the cflags and libraries from the sdl-config script +dnl +AC_ARG_WITH(sdl-prefix,[ --with-sdl-prefix=PFX Prefix where SDL is installed (optional)], + sdl_prefix="$withval", sdl_prefix="") +AC_ARG_WITH(sdl-exec-prefix,[ --with-sdl-exec-prefix=PFX Exec prefix where SDL is installed (optional)], + sdl_exec_prefix="$withval", sdl_exec_prefix="") +AC_ARG_ENABLE(sdltest, [ --disable-sdltest Do not try to compile and run a test SDL program], + , enable_sdltest=yes) + + if test x$sdl_exec_prefix != x ; then + sdl_args="$sdl_args --exec-prefix=$sdl_exec_prefix" + if test x${SDL_CONFIG+set} != xset ; then + SDL_CONFIG=$sdl_exec_prefix/bin/sdl-config + fi + fi + if test x$sdl_prefix != x ; then + sdl_args="$sdl_args --prefix=$sdl_prefix" + if test x${SDL_CONFIG+set} != xset ; then + SDL_CONFIG=$sdl_prefix/bin/sdl-config + fi + fi + + AC_REQUIRE([AC_CANONICAL_TARGET]) + PATH="$prefix/bin:$prefix/usr/bin:$PATH" + AC_PATH_PROG(SDL_CONFIG, sdl-config, no, [$PATH]) + min_sdl_version=ifelse([$1], ,0.11.0,$1) + AC_MSG_CHECKING(for SDL - version >= $min_sdl_version) + no_sdl="" + if test "$SDL_CONFIG" = "no" ; then + no_sdl=yes + else + SDL_CFLAGS=`$SDL_CONFIG $sdlconf_args --cflags` + SDL_LIBS=`$SDL_CONFIG $sdlconf_args --libs` + + sdl_major_version=`$SDL_CONFIG $sdl_args --version | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` + sdl_minor_version=`$SDL_CONFIG $sdl_args --version | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` + sdl_micro_version=`$SDL_CONFIG $sdl_config_args --version | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` + if test "x$enable_sdltest" = "xyes" ; then + ac_save_CFLAGS="$CFLAGS" + ac_save_LIBS="$LIBS" + CFLAGS="$CFLAGS $SDL_CFLAGS" + LIBS="$LIBS $SDL_LIBS" +dnl +dnl Now check if the installed SDL is sufficiently new. (Also sanity +dnl checks the results of sdl-config to some extent +dnl + rm -f conf.sdltest + AC_TRY_RUN([ +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include "SDL.h" + +char* +my_strdup (char *str) +{ + char *new_str; + + if (str) + { + new_str = (char *)malloc ((strlen (str) + 1) * sizeof(char)); + strcpy (new_str, str); + } + else + new_str = NULL; + + return new_str; +} + +int main (int argc, char *argv[]) +{ + int major, minor, micro; + char *tmp_version; + + /* This hangs on some systems (?) + system ("touch conf.sdltest"); + */ + { FILE *fp = fopen("conf.sdltest", "a"); if ( fp ) fclose(fp); } + + /* HP/UX 9 (%@#!) writes to sscanf strings */ + tmp_version = my_strdup("$min_sdl_version"); + if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { + printf("%s, bad version string\n", "$min_sdl_version"); + exit(1); + } + + if (($sdl_major_version > major) || + (($sdl_major_version == major) && ($sdl_minor_version > minor)) || + (($sdl_major_version == major) && ($sdl_minor_version == minor) && ($sdl_micro_version >= micro))) + { + return 0; + } + else + { + printf("\n*** 'sdl-config --version' returned %d.%d.%d, but the minimum version\n", $sdl_major_version, $sdl_minor_version, $sdl_micro_version); + printf("*** of SDL required is %d.%d.%d. If sdl-config is correct, then it is\n", major, minor, micro); + printf("*** best to upgrade to the required version.\n"); + printf("*** If sdl-config was wrong, set the environment variable SDL_CONFIG\n"); + printf("*** to point to the correct copy of sdl-config, and remove the file\n"); + printf("*** config.cache before re-running configure\n"); + return 1; + } +} + +],, no_sdl=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) + CFLAGS="$ac_save_CFLAGS" + LIBS="$ac_save_LIBS" + fi + fi + if test "x$no_sdl" = x ; then + AC_MSG_RESULT(yes) + ifelse([$2], , :, [$2]) + else + AC_MSG_RESULT(no) + if test "$SDL_CONFIG" = "no" ; then + echo "*** The sdl-config script installed by SDL could not be found" + echo "*** If SDL was installed in PREFIX, make sure PREFIX/bin is in" + echo "*** your path, or set the SDL_CONFIG environment variable to the" + echo "*** full path to sdl-config." + else + if test -f conf.sdltest ; then + : + else + echo "*** Could not run SDL test program, checking why..." + CFLAGS="$CFLAGS $SDL_CFLAGS" + LIBS="$LIBS $SDL_LIBS" + AC_TRY_LINK([ +#include <stdio.h> +#include "SDL.h" + +int main(int argc, char *argv[]) +{ return 0; } +#undef main +#define main K_and_R_C_main +], [ return 0; ], + [ echo "*** The test program compiled, but did not run. This usually means" + echo "*** that the run-time linker is not finding SDL or finding the wrong" + echo "*** version of SDL. If it is not finding SDL, you'll need to set your" + echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" + echo "*** to the installed location Also, make sure you have run ldconfig if that" + echo "*** is required on your system" + echo "***" + echo "*** If you have an old version installed, it is best to remove it, although" + echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"], + [ echo "*** The test program failed to compile or link. See the file config.log for the" + echo "*** exact error that occured. This usually means SDL was incorrectly installed" + echo "*** or that you have moved SDL since it was installed. In the latter case, you" + echo "*** may want to edit the sdl-config script: $SDL_CONFIG" ]) + CFLAGS="$ac_save_CFLAGS" + LIBS="$ac_save_LIBS" + fi + fi + SDL_CFLAGS="" + SDL_LIBS="" + ifelse([$3], , :, [$3]) + fi + AC_SUBST(SDL_CFLAGS) + AC_SUBST(SDL_LIBS) + rm -f conf.sdltest +]) diff --git a/po/POTFILES.in b/po/POTFILES.in index e69de29..edc12ca 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -0,0 +1,4 @@ +lib/engine.cc +lib/glbase.cc +lib/glfont.cc +lib/gltexture.cc @@ -0,0 +1,19 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR Free Software Foundation, Inc. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +msgid "" +msgstr "" +"Project-Id-Version: mogltk 1.0.1\n" +"POT-Creation-Date: 2002-12-06 01:47+0100\n" +"PO-Revision-Date: 2001-10-29 08:26GMT\n" +"Last-Translator: Nicolas Noble <nicolas@nobis-crew.org>\n" +"Language-Team: French <fr@li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=ISO-8859-1\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 0.8\n" + +#: lib/engine.cc:13 +msgid "Unable to start SDL base system" +msgstr "" |