Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 3561 in orxonox.OLD for orxonox/branches


Ignore:
Timestamp:
Mar 15, 2005, 5:59:44 PM (20 years ago)
Author:
bensch
Message:

orxonox/branches: deleted obsolete branche trackManager. all necessary data already moved into the trunk

Location:
orxonox/branches
Files:
1 deleted
18 edited
1 copied

Legend:

Unmodified
Added
Removed

  • orxonox/branches/levelloader/Makefile.in

    r3530 r3561  
    1 # Makefile.in generated by automake 1.8.2 from Makefile.am.
     1# Makefile.in generated by automake 1.8.5 from Makefile.am.
    22# @configure_input@
    33
    … …  
    3838        $(srcdir)/Makefile.in $(srcdir)/config.h.in \
    3939        $(srcdir)/doc/documentation.am $(top_srcdir)/configure AUTHORS \
    40         COPYING ChangeLog INSTALL NEWS TODO config.guess config.sub \
    41         depcomp install-sh missing mkinstalldirs
     40        COPYING ChangeLog INSTALL NEWS config.guess config.sub depcomp \
     41        install-sh missing mkinstalldirs
    4242subdir = .
    4343ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
    … …  
    326326        tags=; \
    327327        here=`pwd`; \
    328         if (etags --etags-include --version) >/dev/null 2>&1; then \
     328        if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
    329329          include_option=--etags-include; \
     330          empty_fix=.; \
    330331        else \
    331332          include_option=--include; \
     333          empty_fix=; \
    332334        fi; \
    333335        list='$(SUBDIRS)'; for subdir in $$list; do \
    334336          if test "$$subdir" = .; then :; else \
    335             test -f $$subdir/TAGS && \
     337            test ! -f $$subdir/TAGS || \
    336338              tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
    337339          fi; \
    … …  
    343345          $(AWK) '    { files[$$0] = 1; } \
    344346               END { for (i in files) print i; }'`; \
    345         test -z "$(ETAGS_ARGS)$$tags$$unique" \
    346           || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
    347              $$tags $$unique
     347        if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
     348          test -n "$$unique" || unique=$$empty_fix; \
     349          $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
     350            $$tags $$unique; \
     351        fi
    348352ctags: CTAGS
    349353CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
    … …  
    454458          uncompress -c $(distdir).tar.Z | $(AMTAR) xf - ;;\
    455459        *.shar.gz*) \
    456           GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | unshar ;;\
     460          GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
    457461        *.zip*) \
    458462          unzip $(distdir).zip ;;\
    … …  
    477481          && chmod -R a-w "$$dc_install_base" \
    478482          && ({ \
    479                (cd ../.. && $(mkdir_p) "$$dc_destdir") \
     483               (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
    480484               && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
    481485               && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \

  • orxonox/branches/levelloader/aclocal.m4

    r3530 r3561  
    1 # generated automatically by aclocal 1.8.2 -*- Autoconf -*-
     1# generated automatically by aclocal 1.8.5 -*- Autoconf -*-
    22
    33# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
    … …  
    4141# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
    4242AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
    43          [AM_AUTOMAKE_VERSION([1.8.2])])
     43         [AM_AUTOMAKE_VERSION([1.8.5])])
    4444
    4545# AM_AUX_DIR_EXPAND
    … …  
    150150fi])])
    151151
    152 # serial 6                                              -*- Autoconf -*-
     152# serial 7                                              -*- Autoconf -*-
    153153
    154154# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004
    … …  
    237237    for i in 1 2 3 4 5 6; do
    238238      echo '#include "conftst'$i'.h"' >> sub/conftest.c
    239       : > sub/conftst$i.h
     239      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
     240      # Solaris 8's {/usr,}/bin/sh.
     241      touch sub/conftst$i.h
    240242    done
    241243    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
    … …  
    265267       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
    266268      # icc doesn't choke on unknown options, it will just issue warnings
    267       # (even with -Werror).  So we grep stderr for any message
    268       # that says an option was ignored.
    269       if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else
     269      # or remarks (even with -Werror).  So we grep stderr for any message
     270      # that says an option was ignored or not supported.
     271      # When given -MP, icc 7.0 and 7.1 complain thusly:
     272      #   icc: Command line warning: ignoring option '-M'; no argument required
     273      # The diagnosis changed in icc 8.0:
     274      #   icc: Command line remark: option '-MP' not supported
     275      if (grep 'ignoring option' conftest.err ||
     276          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
    270277        am_cv_$1_dependencies_compiler_type=$depmode
    271278        break
    … …  
    313320# Generate code to set up dependency tracking.   -*- Autoconf -*-
    314321
    315 # Copyright (C) 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
     322# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
    316323
    317324# This program is free software; you can redistribute it and/or modify
    … …  
    352359  # Extract the definition of DEP_FILES from the Makefile without
    353360  # running `make'.
    354   DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"`
     361  DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
    355362  test -z "$DEPDIR" && continue
    356363  # When using ansi2knr, U may be empty or an underscore; expand it
    357   U=`sed -n -e '/^U = / s///p' < "$mf"`
     364  U=`sed -n 's/^U = //p' < "$mf"`
    358365  test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR"
    359366  # We invoke sed twice because it is the simplest approach to
    360367  # changing $(DEPDIR) to its actual value in the expansion.
    361   for file in `sed -n -e '
     368  for file in `sed -n '
    362369    /^DEP_FILES = .*\\\\$/ {
    363370      s/^DEP_FILES = //
    … …  
    718725# Do not use -m 0755 and let people choose whatever they expect by
    719726# setting umask.
     727#
     728# We cannot accept any implementation of `mkdir' that recognizes `-p'.
     729# Some implementations (such as Solaris 8's) are not thread-safe: if a
     730# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c'
     731# concurrently, both version can detect that a/ is missing, but only
     732# one can create it and the other will error out.  Consequently we
     733# restrict ourselves to GNU make (using the --version option ensures
     734# this.)
    720735AC_DEFUN([AM_PROG_MKDIR_P],
    721 [if mkdir -p -- . 2>/dev/null; then
     736[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
    722737  # Keeping the `.' argument allows $(mkdir_p) to be used without
    723738  # argument.  Indeed, we sometimes output rules like
    … …  
    732747  # directories to create, and then abort because `.' already
    733748  # exists.
    734   for d in ./-p ./--;
     749  for d in ./-p ./--version;
    735750  do
    736751    test -d $d && rmdir $d

  • orxonox/branches/levelloader/configure

    r3530 r3561  
    15991599fi
    16001600
    1601 if mkdir -p -- . 2>/dev/null; then
     1601if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
    16021602  # Keeping the `.' argument allows $(mkdir_p) to be used without
    16031603  # argument.  Indeed, we sometimes output rules like
    … …  
    16121612  # directories to create, and then abort because `.' already
    16131613  # exists.
    1614   for d in ./-p ./--;
     1614  for d in ./-p ./--version;
    16151615  do
    16161616    test -d $d && rmdir $d
    … …  
    25182518    for i in 1 2 3 4 5 6; do
    25192519      echo '#include "conftst'$i'.h"' >> sub/conftest.c
    2520       : > sub/conftst$i.h
     2520      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
     2521      # Solaris 8's {/usr,}/bin/sh.
     2522      touch sub/conftst$i.h
    25212523    done
    25222524    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
    … …  
    25462548       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
    25472549      # icc doesn't choke on unknown options, it will just issue warnings
    2548       # (even with -Werror).  So we grep stderr for any message
    2549       # that says an option was ignored.
    2550       if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else
     2550      # or remarks (even with -Werror).  So we grep stderr for any message
     2551      # that says an option was ignored or not supported.
     2552      # When given -MP, icc 7.0 and 7.1 complain thusly:
     2553      #   icc: Command line warning: ignoring option '-M'; no argument required
     2554      # The diagnosis changed in icc 8.0:
     2555      #   icc: Command line remark: option '-MP' not supported
     2556      if (grep 'ignoring option' conftest.err ||
     2557          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
    25512558        am_cv_CXX_dependencies_compiler_type=$depmode
    25522559        break
    … …  
    33493356    for i in 1 2 3 4 5 6; do
    33503357      echo '#include "conftst'$i'.h"' >> sub/conftest.c
    3351       : > sub/conftst$i.h
     3358      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
     3359      # Solaris 8's {/usr,}/bin/sh.
     3360      touch sub/conftst$i.h
    33523361    done
    33533362    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
    … …  
    33773386       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
    33783387      # icc doesn't choke on unknown options, it will just issue warnings
    3379       # (even with -Werror).  So we grep stderr for any message
    3380       # that says an option was ignored.
    3381       if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else
     3388      # or remarks (even with -Werror).  So we grep stderr for any message
     3389      # that says an option was ignored or not supported.
     3390      # When given -MP, icc 7.0 and 7.1 complain thusly:
     3391      #   icc: Command line warning: ignoring option '-M'; no argument required
     3392      # The diagnosis changed in icc 8.0:
     3393      #   icc: Command line remark: option '-MP' not supported
     3394      if (grep 'ignoring option' conftest.err ||
     3395          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
    33823396        am_cv_CC_dependencies_compiler_type=$depmode
    33833397        break
    … …  
    95599573  # Extract the definition of DEP_FILES from the Makefile without
    95609574  # running `make'.
    9561   DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"`
     9575  DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
    95629576  test -z "$DEPDIR" && continue
    95639577  # When using ansi2knr, U may be empty or an underscore; expand it
    9564   U=`sed -n -e '/^U = / s///p' < "$mf"`
     9578  U=`sed -n 's/^U = //p' < "$mf"`
    95659579  test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR"
    95669580  # We invoke sed twice because it is the simplest approach to
    95679581  # changing $(DEPDIR) to its actual value in the expansion.
    9568   for file in `sed -n -e '
     9582  for file in `sed -n '
    95699583    /^DEP_FILES = .*\\\\$/ {
    95709584      s/^DEP_FILES = //

  • orxonox/branches/levelloader/src/Makefile.in

    r3525 r3561  
    1 # Makefile.in generated by automake 1.8.2 from Makefile.am.
     1# Makefile.in generated by automake 1.8.5 from Makefile.am.
    22# @configure_input@
    33
    … …  
    5050CONFIG_HEADER = $(top_builddir)/config.h
    5151CONFIG_CLEAN_FILES =
    52 am__installdirs = $(DESTDIR)$(bindir)
     52am__installdirs = "$(DESTDIR)$(bindir)"
    5353binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
    5454PROGRAMS = $(bin_PROGRAMS)
    … …  
    350350install-binPROGRAMS: $(bin_PROGRAMS)
    351351        @$(NORMAL_INSTALL)
    352         $(mkdir_p) $(DESTDIR)$(bindir)
     352        test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
    353353        @list='$(bin_PROGRAMS)'; for p in $$list; do \
    354354          p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
    … …  
    356356          ; then \
    357357            f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
    358            echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \
    359            $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f || exit 1; \
     358           echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
     359           $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
    360360          else :; fi; \
    361361        done
    … …  
    365365        @list='$(bin_PROGRAMS)'; for p in $$list; do \
    366366          f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
    367           echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
    368           rm -f $(DESTDIR)$(bindir)/$$f; \
     367          echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
     368          rm -f "$(DESTDIR)$(bindir)/$$f"; \
    369369        done
    370370
    … …  
    10071007        tags=; \
    10081008        here=`pwd`; \
    1009         if (etags --etags-include --version) >/dev/null 2>&1; then \
     1009        if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
    10101010          include_option=--etags-include; \
     1011          empty_fix=.; \
    10111012        else \
    10121013          include_option=--include; \
     1014          empty_fix=; \
    10131015        fi; \
    10141016        list='$(SUBDIRS)'; for subdir in $$list; do \
    10151017          if test "$$subdir" = .; then :; else \
    1016             test -f $$subdir/TAGS && \
     1018            test ! -f $$subdir/TAGS || \
    10171019              tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
    10181020          fi; \
    … …  
    10241026          $(AWK) '    { files[$$0] = 1; } \
    10251027               END { for (i in files) print i; }'`; \
    1026         test -z "$(ETAGS_ARGS)$$tags$$unique" \
    1027           || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
    1028              $$tags $$unique
     1028        if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
     1029          test -n "$$unique" || unique=$$empty_fix; \
     1030          $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
     1031            $$tags $$unique; \
     1032        fi
    10291033ctags: CTAGS
    10301034CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
    … …  
    10961100installdirs: installdirs-recursive
    10971101installdirs-am:
    1098         $(mkdir_p) $(DESTDIR)$(bindir)
     1102        for dir in "$(DESTDIR)$(bindir)"; do \
     1103          test -z "$$dir" || $(mkdir_p) "$$dir"; \
     1104        done
    10991105install: install-recursive
    11001106install-exec: install-exec-recursive

  • orxonox/branches/levelloader/src/lib/Makefile.in

    r3525 r3561  
    1 # Makefile.in generated by automake 1.8.2 from Makefile.am.
     1# Makefile.in generated by automake 1.8.5 from Makefile.am.
    22# @configure_input@
    33
    … …  
    276276        tags=; \
    277277        here=`pwd`; \
    278         if (etags --etags-include --version) >/dev/null 2>&1; then \
     278        if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
    279279          include_option=--etags-include; \
     280          empty_fix=.; \
    280281        else \
    281282          include_option=--include; \
     283          empty_fix=; \
    282284        fi; \
    283285        list='$(SUBDIRS)'; for subdir in $$list; do \
    284286          if test "$$subdir" = .; then :; else \
    285             test -f $$subdir/TAGS && \
     287            test ! -f $$subdir/TAGS || \
    286288              tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
    287289          fi; \
    … …  
    293295          $(AWK) '    { files[$$0] = 1; } \
    294296               END { for (i in files) print i; }'`; \
    295         test -z "$(ETAGS_ARGS)$$tags$$unique" \
    296           || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
    297              $$tags $$unique
     297        if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
     298          test -n "$$unique" || unique=$$empty_fix; \
     299          $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
     300            $$tags $$unique; \
     301        fi
    298302ctags: CTAGS
    299303CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \

  • orxonox/branches/levelloader/src/lib/graphics/Makefile.in

    r3525 r3561  
    1 # Makefile.in generated by automake 1.8.2 from Makefile.am.
     1# Makefile.in generated by automake 1.8.5 from Makefile.am.
    22# @configure_input@
    33
    … …  
    270270        tags=; \
    271271        here=`pwd`; \
    272         if (etags --etags-include --version) >/dev/null 2>&1; then \
     272        if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
    273273          include_option=--etags-include; \
     274          empty_fix=.; \
    274275        else \
    275276          include_option=--include; \
     277          empty_fix=; \
    276278        fi; \
    277279        list='$(SUBDIRS)'; for subdir in $$list; do \
    278280          if test "$$subdir" = .; then :; else \
    279             test -f $$subdir/TAGS && \
     281            test ! -f $$subdir/TAGS || \
    280282              tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
    281283          fi; \
    … …  
    287289          $(AWK) '    { files[$$0] = 1; } \
    288290               END { for (i in files) print i; }'`; \
    289         test -z "$(ETAGS_ARGS)$$tags$$unique" \
    290           || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
    291              $$tags $$unique
     291        if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
     292          test -n "$$unique" || unique=$$empty_fix; \
     293          $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
     294            $$tags $$unique; \
     295        fi
    292296ctags: CTAGS
    293297CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \

  • orxonox/branches/levelloader/src/lib/graphics/importer/Makefile.in

    r3525 r3561  
    1 # Makefile.in generated by automake 1.8.2 from Makefile.am.
     1# Makefile.in generated by automake 1.8.5 from Makefile.am.
    22# @configure_input@
    33
    … …  
    4242subdir = src/lib/graphics/importer
    4343DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
    44         $(srcdir)/Makefile.in TODO
     44        $(srcdir)/Makefile.in
    4545ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
    4646am__aclocal_m4_deps = $(top_srcdir)/configure.ac
    … …  
    5050CONFIG_HEADER = $(top_builddir)/config.h
    5151CONFIG_CLEAN_FILES =
    52 am__installdirs = $(DESTDIR)$(bindir)
     52am__installdirs = "$(DESTDIR)$(bindir)"
    5353binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
    5454PROGRAMS = $(bin_PROGRAMS)
    … …  
    237237install-binPROGRAMS: $(bin_PROGRAMS)
    238238        @$(NORMAL_INSTALL)
    239         $(mkdir_p) $(DESTDIR)$(bindir)
     239        test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
    240240        @list='$(bin_PROGRAMS)'; for p in $$list; do \
    241241          p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
    … …  
    243243          ; then \
    244244            f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
    245            echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \
    246            $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f || exit 1; \
     245           echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
     246           $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
    247247          else :; fi; \
    248248        done
    … …  
    252252        @list='$(bin_PROGRAMS)'; for p in $$list; do \
    253253          f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
    254           echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
    255           rm -f $(DESTDIR)$(bindir)/$$f; \
     254          echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
     255          rm -f "$(DESTDIR)$(bindir)/$$f"; \
    256256        done
    257257
    … …  
    330330          $(AWK) '    { files[$$0] = 1; } \
    331331               END { for (i in files) print i; }'`; \
    332         test -z "$(ETAGS_ARGS)$$tags$$unique" \
    333           || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
    334              $$tags $$unique
     332        if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
     333          test -n "$$unique" || unique=$$empty_fix; \
     334          $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
     335            $$tags $$unique; \
     336        fi
    335337ctags: CTAGS
    336338CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
    … …  
    387389all-am: Makefile $(PROGRAMS) $(HEADERS)
    388390installdirs:
    389         $(mkdir_p) $(DESTDIR)$(bindir)
     391        for dir in "$(DESTDIR)$(bindir)"; do \
     392          test -z "$$dir" || $(mkdir_p) "$$dir"; \
     393        done
    390394install: install-am
    391395install-exec: install-exec-am

  • orxonox/branches/levelloader/src/lib/gui/Makefile.in

    r3525 r3561  
    1 # Makefile.in generated by automake 1.8.2 from Makefile.am.
     1# Makefile.in generated by automake 1.8.5 from Makefile.am.
    22# @configure_input@
    33
    … …  
    272272        tags=; \
    273273        here=`pwd`; \
    274         if (etags --etags-include --version) >/dev/null 2>&1; then \
     274        if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
    275275          include_option=--etags-include; \
     276          empty_fix=.; \
    276277        else \
    277278          include_option=--include; \
     279          empty_fix=; \
    278280        fi; \
    279281        list='$(SUBDIRS)'; for subdir in $$list; do \
    280282          if test "$$subdir" = .; then :; else \
    281             test -f $$subdir/TAGS && \
     283            test ! -f $$subdir/TAGS || \
    282284              tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
    283285          fi; \
    … …  
    289291          $(AWK) '    { files[$$0] = 1; } \
    290292               END { for (i in files) print i; }'`; \
    291         test -z "$(ETAGS_ARGS)$$tags$$unique" \
    292           || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
    293              $$tags $$unique
     293        if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
     294          test -n "$$unique" || unique=$$empty_fix; \
     295          $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
     296            $$tags $$unique; \
     297        fi
    294298ctags: CTAGS
    295299CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \

  • orxonox/branches/levelloader/src/lib/gui/console/Makefile.in

    r3525 r3561  
    1 # Makefile.in generated by automake 1.8.2 from Makefile.am.
     1# Makefile.in generated by automake 1.8.5 from Makefile.am.
    22# @configure_input@
    33
    … …  
    5050CONFIG_HEADER = $(top_builddir)/config.h
    5151CONFIG_CLEAN_FILES =
    52 am__installdirs = $(DESTDIR)$(bindir)
     52am__installdirs = "$(DESTDIR)$(bindir)"
    5353binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
    5454PROGRAMS = $(bin_PROGRAMS)
    … …  
    225225install-binPROGRAMS: $(bin_PROGRAMS)
    226226        @$(NORMAL_INSTALL)
    227         $(mkdir_p) $(DESTDIR)$(bindir)
     227        test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
    228228        @list='$(bin_PROGRAMS)'; for p in $$list; do \
    229229          p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
    … …  
    231231          ; then \
    232232            f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
    233            echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \
    234            $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f || exit 1; \
     233           echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
     234           $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
    235235          else :; fi; \
    236236        done
    … …  
    240240        @list='$(bin_PROGRAMS)'; for p in $$list; do \
    241241          f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
    242           echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
    243           rm -f $(DESTDIR)$(bindir)/$$f; \
     242          echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
     243          rm -f "$(DESTDIR)$(bindir)/$$f"; \
    244244        done
    245245
    … …  
    297297          $(AWK) '    { files[$$0] = 1; } \
    298298               END { for (i in files) print i; }'`; \
    299         test -z "$(ETAGS_ARGS)$$tags$$unique" \
    300           || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
    301              $$tags $$unique
     299        if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
     300          test -n "$$unique" || unique=$$empty_fix; \
     301          $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
     302            $$tags $$unique; \
     303        fi
    302304ctags: CTAGS
    303305CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
    … …  
    354356all-am: Makefile $(PROGRAMS) $(HEADERS)
    355357installdirs:
    356         $(mkdir_p) $(DESTDIR)$(bindir)
     358        for dir in "$(DESTDIR)$(bindir)"; do \
     359          test -z "$$dir" || $(mkdir_p) "$$dir"; \
     360        done
    357361install: install-am
    358362install-exec: install-exec-am

  • orxonox/branches/levelloader/src/lib/gui/gui/Makefile.in

    r3525 r3561  
    1 # Makefile.in generated by automake 1.8.2 from Makefile.am.
     1# Makefile.in generated by automake 1.8.5 from Makefile.am.
    22# @configure_input@
    33
    … …  
    5050CONFIG_HEADER = $(top_builddir)/config.h
    5151CONFIG_CLEAN_FILES =
    52 am__installdirs = $(DESTDIR)$(bindir)
     52am__installdirs = "$(DESTDIR)$(bindir)"
    5353binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
    5454PROGRAMS = $(bin_PROGRAMS)
    … …  
    258258install-binPROGRAMS: $(bin_PROGRAMS)
    259259        @$(NORMAL_INSTALL)
    260         $(mkdir_p) $(DESTDIR)$(bindir)
     260        test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
    261261        @list='$(bin_PROGRAMS)'; for p in $$list; do \
    262262          p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
    … …  
    264264          ; then \
    265265            f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
    266            echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \
    267            $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f || exit 1; \
     266           echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
     267           $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
    268268          else :; fi; \
    269269        done
    … …  
    273273        @list='$(bin_PROGRAMS)'; for p in $$list; do \
    274274          f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
    275           echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
    276           rm -f $(DESTDIR)$(bindir)/$$f; \
     275          echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
     276          rm -f "$(DESTDIR)$(bindir)/$$f"; \
    277277        done
    278278
    … …  
    336336          $(AWK) '    { files[$$0] = 1; } \
    337337               END { for (i in files) print i; }'`; \
    338         test -z "$(ETAGS_ARGS)$$tags$$unique" \
    339           || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
    340              $$tags $$unique
     338        if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
     339          test -n "$$unique" || unique=$$empty_fix; \
     340          $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
     341            $$tags $$unique; \
     342        fi
    341343ctags: CTAGS
    342344CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
    … …  
    393395all-am: Makefile $(PROGRAMS) $(HEADERS)
    394396installdirs:
    395         $(mkdir_p) $(DESTDIR)$(bindir)
     397        for dir in "$(DESTDIR)$(bindir)"; do \
     398          test -z "$$dir" || $(mkdir_p) "$$dir"; \
     399        done
    396400install: install-am
    397401install-exec: install-exec-am

  • orxonox/branches/updater

    • Property svn:externals set to

  • orxonox/branches/updater/Makefile.am

    r3219 r3561  
    1616## doxygen stuff
    1717if DOXYGEN
    18 DOXYGEN_INPUT = "src src/gui src/importer"
     18DOXYGEN_INPUT = "src src/lib/gui/gui src/lib/graphics/importer"
    1919
    2020## Exclude the application wizard templates, and some file templates

  • orxonox/branches/updater/Makefile.in

    r3271 r3561  
    133133SHELL = @SHELL@
    134134STRIP = @STRIP@
     135SUB_PROJECTS_FALSE = @SUB_PROJECTS_FALSE@
     136SUB_PROJECTS_TRUE = @SUB_PROJECTS_TRUE@
    135137VERSION = @VERSION@
    136138ac_ct_CC = @ac_ct_CC@
    … …  
    189191             doc/doxyconf/project
    190192
    191 @DOXYGEN_TRUE@DOXYGEN_INPUT = "src src/gui src/importer"
     193@DOXYGEN_TRUE@DOXYGEN_INPUT = "src src/lib/gui/gui src/lib/graphics/importer"
    192194@DOXYGEN_TRUE@DOXYGEN_EXCLUDE =
    193195@DOXYGEN_TRUE@DOXYGEN_EXAMPLE_PATH =

  • orxonox/branches/updater/NEWS

    r3235 r3561  
    55Date: December 14, 2004
    66Topic: Repository Moved
    7 Body: Today we moved the repository. The new location of the repository is <A href="http://orxonox.ethz.ch/repos/reporx">http://orxonox.ethz.ch/repos/reporx</A>.
     7Body: Today we moved the repository. The new location of the repository is <A href="http://svn.orxonox.ethz.ch/reporx">http://svn.orxonox.ethz.ch/reporx</A>.
    88
    99Date:   November 16, 2004

  • orxonox/branches/updater/configure

    r3283 r3561  
    312312#endif"
    313313
    314 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 build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP DEBUG DOXYGEN DOXYGEN_TRUE DOXYGEN_FALSE MSBITFIELDS GTK2_LIBS GTK2_CFLAGS HAVE_GTK2_TRUE HAVE_GTK2_FALSE GTHREAD_LIBS GTHREAD_CFLAGS HAVE_GTHREAD_TRUE HAVE_GTHREAD_FALSE CURL_LIBS CURL_CFLAGS HAVE_CURL_TRUE HAVE_CURL_FALSE LIBOBJS LTLIBOBJS'
     314ac_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 build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP DEBUG SUB_PROJECTS_TRUE SUB_PROJECTS_FALSE DOXYGEN DOXYGEN_TRUE DOXYGEN_FALSE MSBITFIELDS GTK2_LIBS GTK2_CFLAGS HAVE_GTK2_TRUE HAVE_GTK2_FALSE GTHREAD_LIBS GTHREAD_CFLAGS HAVE_GTHREAD_TRUE HAVE_GTHREAD_FALSE CURL_LIBS CURL_CFLAGS HAVE_CURL_TRUE HAVE_CURL_FALSE LIBOBJS LTLIBOBJS'
    315315ac_subst_files=''
    316316
    … …  
    867867  --enable-debug          compiles in debug mode. Lots of debug info about the
    868868                          game.
     869  --enable-sub-projects   also builds the subProjects while make from srcdir
    869870
    870871Optional Packages:
    … …  
    13381339
    13391340
    1340 # Detect the canonical host and target build environment.
     1341## Detect the canonical host and target build environment.
    13411342ac_aux_dir=
    13421343for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
    … …  
    14461447    NONENONEs,x,x, &&
    14471448  program_prefix=${target_alias}-
    1448 
    14491449
    14501450am__api_version="1.8"
    … …  
    18531853
    18541854
    1855 
    1856 # Checks for programs.
     1855#########################
     1856## Checks for programs ##
     1857#########################
    18571858ac_ext=cc
    18581859ac_cpp='$CXXCPP $CPPFLAGS'
    … …  
    38413842
    38423843
    3843 ### CHECKING  OPTIONAT ARGUMENTS
    3844 ## DEBUG-statement
     3844##################################
     3845## CHECKING  OPTIONAL ARGUMENTS ##
     3846##################################
     3847
     3848#-----------------#
     3849# DEBUG-statement #
     3850#-----------------#
    38453851DEBUG=no
    38463852echo "$as_me:$LINENO: checking if DEBUG-mode should be enabled" >&5
    … …  
    38523858fi;
    38533859
    3854 if test "$DEBUG" = "no"; then
     3860if test x$DEBUG = xno; then
    38553861        echo "no"
    3856         echo " -> Setting debuglevel to 1. Like this you can still see errors."
    3857         DEBUG=1
    3858 elif test "$DEBUG" = yes; then
     3862        echo " -> Setting debuglevel to 3. (orxonox is still in Development. It really is needed."
     3863        DEBUG=3
     3864elif test x$DEBUG = xyes; then
    38593865        echo "yes"
    3860         echo " -> Setting debuglevel to 3. HARD DEBUG MODE!!."
    3861         DEBUG=3
    3862 else
    3863         echo "yes set to $DEBUG"
     3866        echo " -> Setting debuglevel to 4. HARD DEBUG MODE!!."
     3867        DEBUG=4
     3868else
     3869        echo "yes: setting debuglevel to to $DEBUG"
    38643870fi
    38653871
    … …  
    38713877
    38723878
    3873 ## GTK-disabled
     3879#--------------#
     3880# GTK-disabled #
     3881#--------------#
    38743882echo "$as_me:$LINENO: checking if gtk should be enabled" >&5
    38753883echo $ECHO_N "checking if gtk should be enabled... $ECHO_C" >&6
    … …  
    38823890  def_gtk=yes
    38833891fi;
    3884 if test "$def_gtk" = yes; then
     3892if test x$def_gtk = xyes; then
    38853893  echo "yes"
    38863894fi
    3887 if test "$def_gtk" = no; then
     3895if test x$def_gtk = xno; then
    38883896  echo "no"
    38893897fi
    38903898
    3891 ## gThread-disabled
     3899#------------------#
     3900# gThread-disabled #
     3901#------------------#
    38923902echo "$as_me:$LINENO: checking if gThread should be enabled" >&5
    38933903echo $ECHO_N "checking if gThread should be enabled... $ECHO_C" >&6
    … …  
    39003910  def_gthread=yes
    39013911fi;
    3902 if test "$def_gthread" = yes; then
     3912if test x$def_gthread = xyes; then
    39033913  echo "yes"
    39043914fi
    3905 if test "$def_gthread" = no; then
     3915if test x$def_gthread = xno; then
    39063916  echo "no"
    39073917fi
    39083918
    3909 ## pthread-disabled
     3919#------------------#
     3920# pthread-disabled #
     3921#------------------#
    39103922echo "$as_me:$LINENO: checking if pthread should be enabled" >&5
    39113923echo $ECHO_N "checking if pthread should be enabled... $ECHO_C" >&6
    … …  
    39183930  def_pthread=yes
    39193931fi;
    3920 if test "$def_pthread" = yes; then
     3932if test x$def_pthread = xyes; then
    39213933  echo "yes"
    39223934fi
    3923 if test "$def_pthread" = no; then
     3935if test x$def_pthread = xno; then
    39243936  echo "no"
    39253937fi
    39263938
    3927 ## libCurl disabled?
     3939#------------------#
     3940# libCurl-disabled #
     3941#------------------#
    39283942echo "$as_me:$LINENO: checking if libcURL should be enabled" >&5
    39293943echo $ECHO_N "checking if libcURL should be enabled... $ECHO_C" >&6
    … …  
    39363950  def_curl=yes
    39373951fi;
    3938 if test "$def_curl" = yes; then
     3952if test x$def_curl = xyes; then
    39393953  echo "yes"
    39403954fi
    3941 if test "$def_curl" = no; then
     3955if test x$def_curl = xno; then
    39423956  echo "no"
    39433957fi
    39443958
    3945 ### SDL_image-disable
     3959#-------------------#
     3960# SDL_image-disable #
     3961#-------------------#
    39463962def_sdl_image=yes
    39473963echo "$as_me:$LINENO: checking if SDL_image should be enabled" >&5
    … …  
    39533969  def_sdl_image=no
    39543970fi;
    3955 if test "$def_sdl_image" = yes; then
     3971if test x$def_sdl_image = xyes; then
    39563972  echo "yes"
    39573973fi
    3958 if test "$def_sdl_image" = no; then
     3974if test x$def_sdl_image = xno; then
    39593975  echo "no"
    39603976fi
    3961 
    3962 
    3963 ## PROGRAMM CHECKING
    3964 # checking for Doxygen
     3977#-------------------#
     3978# SubProject-enable #
     3979#-------------------#
     3980def_sub_projects=no
     3981echo "$as_me:$LINENO: checking if the SubProjects should be built" >&5
     3982echo $ECHO_N "checking if the SubProjects should be built... $ECHO_C" >&6
     3983# Check whether --enable-sub-projects or --disable-sub-projects was given.
     3984if test "${enable_sub_projects+set}" = set; then
     3985  enableval="$enable_sub_projects"
     3986  def_sub_projects=yes
     3987fi;
     3988if test x$def_sub_projects = xyes; then
     3989  echo "yes"
     3990fi
     3991if test x$def_sub_projects = xno; then
     3992  echo "no"
     3993fi
     3994
     3995
     3996if test x$def_sub_projects = xyes; then
     3997  SUB_PROJECTS_TRUE=
     3998  SUB_PROJECTS_FALSE='#'
     3999else
     4000  SUB_PROJECTS_TRUE='#'
     4001  SUB_PROJECTS_FALSE=
     4002fi
     4003
     4004
     4005#######################
     4006## PROGRAMM CHECKING ##
     4007## 3. party Programs ##
     4008#######################
     4009
     4010#----------------------#
     4011# checking for Doxygen #
     4012#----------------------#
    39654013# Extract the first word of "doxygen", so it can be a program name with args.
    39664014set dummy doxygen; ac_word=$2
    … …  
    40134061
    40144062
    4015 ### CHECKING FOR SYSTEM ###
     4063#########################
     4064## CHECKING FOR SYSTEM ##
     4065#########################
     4066## here the system is checked, and openGL is included
     4067## also checking for SDL on differen Systems
    40164068
    40174069echo "$as_me:$LINENO: checking for System" >&5
    … …  
    40194071## checking for openGL-environment and other sys-specific parameters
    40204072case "$target" in
    4021 ### WINDOWS ###
     4073#---------#
     4074# WINDOWS #
     4075#---------#
    40224076  *-*-mingw32*)
    40234077echo "mingw-WINDOWS detected"
    … …  
    43224376fi
    43234377
    4324     if test "$FOUND_opengl32" = "yes" ; then
     4378    if test x$FOUND_opengl32 = xyes ; then
    43254379        LIBS="$LIBS -lopengl32"
    43264380    else
    … …  
    45514605fi
    45524606
    4553     if test "$FOUND_glu32" = "yes" ; then
     4607    if test x$FOUND_glu32 = xyes ; then
    45544608        LIBS="$LIBS -lGLU32"
    45554609    else
    … …  
    46244678fi
    46254679
    4626     if test $FOUND_mingw32 = "yes"; then
     4680    if test x$FOUND_mingw32 = xyes; then
    46274681        LIBS="$LIBS -lmingw32"
    46284682    fi
    … …  
    48464900fi
    48474901
    4848     if test "$FOUND_sdlmain" = "yes" ; then
     4902    if test x$FOUND_sdlmain = xyes ; then
    48494903       LIBS="$LIBS -lsdlmain"
    48504904    else
    … …  
    49174971fi
    49184972
    4919     if test "$FOUND_sdl" = "yes" ; then
     4973    if test x$FOUND_sdl = xyes ; then
    49204974       LIBS="$LIBS -lsdl"
    49214975    else
    … …  
    49284982
    49294983    ;;
    4930 
    4931 ### LINUX ###
     4984#-------#
     4985# LINUX #
     4986#-------#
    49324987 *-*-linux*)
    49334988echo "Linux detected"
    … …  
    49364991
    49374992CPPFLAGS="-I/usr/X11R6/include"
    4938 LDFLAGS="-L/usr/Mesa-6.0.1/lib -L/usr/X11R6/lib $LDFLAGS"
     4993LDFLAGS="-L/usr/lib/opengl/xorg-x11/lib -L/usr/Mesa-6.0.1/lib -L/usr/X11R6/lib $LDFLAGS"
    49394994# checking gl header
    49404995
    … …  
    50945149
    50955150#  checking for Unix GL
    5096    echo "$as_me:$LINENO: checking for main in -lGL" >&5
    5097 echo $ECHO_N "checking for main in -lGL... $ECHO_C" >&6
    5098 if test "${ac_cv_lib_GL_main+set}" = set; then
     5151   echo "$as_me:$LINENO: checking for glLoadIdentity in -lGL" >&5
     5152echo $ECHO_N "checking for glLoadIdentity in -lGL... $ECHO_C" >&6
     5153if test "${ac_cv_lib_GL_glLoadIdentity+set}" = set; then
    50995154  echo $ECHO_N "(cached) $ECHO_C" >&6
    51005155else
    … …  
    51085163/* end confdefs.h.  */
    51095164
    5110 
     5165/* Override any gcc2 internal prototype to avoid an error.  */
     5166#ifdef __cplusplus
     5167extern "C"
     5168#endif
     5169/* We use char because int might match the return type of a gcc2
     5170   builtin and then its argument prototype would still apply.  */
     5171char glLoadIdentity ();
    51115172int
    51125173main ()
    51135174{
    5114 main ();
     5175glLoadIdentity ();
    51155176  ;
    51165177  return 0;
    … …  
    51395200  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    51405201  (exit $ac_status); }; }; then
    5141   ac_cv_lib_GL_main=yes
     5202  ac_cv_lib_GL_glLoadIdentity=yes
    51425203else
    51435204  echo "$as_me: failed program was:" >&5
    51445205sed 's/^/| /' conftest.$ac_ext >&5
    51455206
    5146 ac_cv_lib_GL_main=no
     5207ac_cv_lib_GL_glLoadIdentity=no
    51475208fi
    51485209rm -f conftest.err conftest.$ac_objext \
    … …  
    51505211LIBS=$ac_check_lib_save_LIBS
    51515212fi
    5152 echo "$as_me:$LINENO: result: $ac_cv_lib_GL_main" >&5
    5153 echo "${ECHO_T}$ac_cv_lib_GL_main" >&6
    5154 if test $ac_cv_lib_GL_main = yes; then
     5213echo "$as_me:$LINENO: result: $ac_cv_lib_GL_glLoadIdentity" >&5
     5214echo "${ECHO_T}$ac_cv_lib_GL_glLoadIdentity" >&6
     5215if test $ac_cv_lib_GL_glLoadIdentity = yes; then
    51555216  FOUND_GL=yes
    51565217fi
    51575218
    5158    if test "$FOUND_GL" = "yes" ; then
     5219   if test x$FOUND_GL = xyes ; then
    51595220     LIBS="$LIBS -lGL"
    51605221   else
    … …  
    53905451fi
    53915452
    5392     if test "$FOUND_GLU" = "yes" ; then
     5453    if test x$FOUND_GLU = xyes ; then
    53935454      LIBS="$LIBS -lGLU"
    53945455    else
    … …  
    56195680fi
    56205681
    5621      if test "$FOUND_SDL" = "yes" ; then
     5682     if test x$FOUND_SDL = xyes ; then
    56225683       LIBS="$LIBS -lSDL"
    56235684     else
    … …  
    56395700#    LIBS="$LIBS $SDL_LIBS"
    56405701    ;;
    5641 
    5642 ### OS X ###
     5702#-----------#
     5703# MAC -OS X #
     5704#-----------#
    56435705 *darwin*)
    5644 echo "OS X detected"
     5706 echo "OS X detected"
    56455707
    56465708 osX="yes"
    … …  
    59606022   LIBS="$LIBS -framework OpenGL"
    59616023
     6024       SDL_CFLAGS=`sdl-config --cflags`
     6025       SDL_LIBS=`sdl-config --libs`
     6026       CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
     6027       LIBS="$LIBS $SDL_LIBS"
     6028
     6029
    59626030# checking for SDL-headers
    59636031#    AC_CHECK_HEADERS(SDL/SDL.h ,,
    … …  
    59716039#      )
    59726040
    5973        SDL_CFLAGS=`sdl-config --cflags`
    5974        SDL_LIBS=`sdl-config --libs`
    5975        CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
    5976        LIBS="$LIBS $SDL_LIBS"
    59776041
    59786042    ;;
    … …  
    59846048
    59856049
    5986 ## check for SDL_Image
    5987 if test "$def_sdl_image" = "yes"; then
     6050###################################
     6051## CHECKING FOR HEADERS AND LIBS ##
     6052###################################
     6053
     6054#-----------#
     6055# SDL_Image #
     6056#-----------#
     6057if test x$def_sdl_image = xyes; then
    59886058# checking for SDL_image-headers
    59896059
    … …  
    61406210
    61416211fi
    6142 if test "$def_sdl_image" = "yes"; then
     6212if test x$def_sdl_image = xyes; then
    61436213# checking for SDL_image-lib
    61446214  echo "$as_me:$LINENO: checking for main in -lSDL_image" >&5
    … …  
    62046274fi
    62056275
    6206      if test "$FOUND_SDL_image" = "yes" ; then
     6276     if test x$FOUND_SDL_image = xyes ; then
    62076277       LIBS="$LIBS -lSDL_image"
    62086278     else
    … …  
    62156285fi
    62166286
    6217 
    6218 if test "$def_sdl_image" = "no"; then
    6219  ## checking for libjpeg
     6287## case no SDL-image:
     6288if test x$def_sdl_image = xno; then
     6289#---------#
     6290# libjpeg #
     6291#---------#
    62206292
    62216293for ac_header in jpeglib.h
    … …  
    63706442done
    63716443
    6372  if test $jpegHeader = "no"; then
     6444 if test x$jpegHeader = xno; then
    63736445        echo " not including jpeg."
    63746446 else
    … …  
    64356507fi
    64366508
    6437     if test "$FOUND_jpeg" = "yes" ; then
     6509    if test x$FOUND_jpeg = xyes ; then
    64386510      LIBS="$LIBS -ljpeg"
    64396511    else
    … …  
    64466518 fi
    64476519
    6448  ## checking for libpng
     6520#--------#
     6521# libpng #
     6522#--------#
    64496523
    64506524for ac_header in png.h
    … …  
    65996673done
    66006674
    6601  if test $pngHeader = "no"; then
     6675 if test x$pngHeader = xno; then
    66026676        echo " not including png."
    66036677 else
    … …  
    66646738fi
    66656739
    6666     if test "$FOUND_png" = "yes" ; then
     6740    if test x$FOUND_png = xyes ; then
    66676741      LIBS="$LIBS -lpng"
    66686742    else
    … …  
    66766750fi
    66776751
    6678 ## checking for GTK
    6679 if test "$def_gtk" = yes; then
     6752#-----#
     6753# GTK #
     6754#-----#
     6755if test x$def_gtk = xyes; then
    66806756
    66816757        #PKG_CHECK_MODULES(GTK2, gtk+-2.0 >= 2.0.3 gthread-2.0 >= 2.0.3, have_gtk2=yes, have_gtk2=no)
    … …  
    67106786
    67116787
    6712 ## checking for gThread
    6713 if test "$def_gthread" = yes; then
     6788#---------#
     6789# gThread #
     6790#---------#
     6791if test x$def_gthread = xyes; then
    67146792
    67156793        echo "$as_me:$LINENO: checking for gthread" >&5
    … …  
    67436821
    67446822
    6745 ## checking for libcURL
    6746 if test "$def_curl" = yes; then
     6823#---------#
     6824# libcURL #
     6825#---------#
     6826if test x$def_curl = xyes; then
    67476827
    67486828
    … …  
    69877067
    69887068
    6989 
    6990 ##checking for pthread
     7069#---------#
     7070# pthread #
     7071#---------#
    69917072if test x$def_pthread = xyes ; then
    69927073 if test x$have_gthread = xyes ; then
    … …  
    72057286fi
    72067287
    7207    if test "$FOUND_pthread" = "yes" ; then
     7288   if test x$FOUND_pthread = xyes ; then
    72087289      LIBS="$LIBS -lpthread"
    72097290   fi
    72107291 fi
    72117292fi
     7293
     7294
    72127295# FIXME: Replace `main' with a function in `-lm':
    72137296
    … …  
    80968179
    80978180
    8098                                                   ac_config_files="$ac_config_files Makefile src/console/Makefile src/gui/Makefile src/Makefile src/importer/Makefile"
     8181######################
     8182## OUTPUT CONFIGURE ##
     8183######################
     8184                                                                                ac_config_files="$ac_config_files Makefile src/Makefile src/lib/Makefile src/lib/graphics/Makefile src/lib/graphics/importer/Makefile src/lib/gui/Makefile src/lib/gui/console/Makefile src/lib/gui/gui/Makefile"
     8185
    80998186
    81008187cat >confcache <<\_ACEOF
    … …  
    82078294Usually this means the macro was only invoked conditionally." >&5
    82088295echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
     8296Usually this means the macro was only invoked conditionally." >&2;}
     8297   { (exit 1); exit 1; }; }
     8298fi
     8299if test -z "${SUB_PROJECTS_TRUE}" && test -z "${SUB_PROJECTS_FALSE}"; then
     8300  { { echo "$as_me:$LINENO: error: conditional \"SUB_PROJECTS\" was never defined.
     8301Usually this means the macro was only invoked conditionally." >&5
     8302echo "$as_me: error: conditional \"SUB_PROJECTS\" was never defined.
    82098303Usually this means the macro was only invoked conditionally." >&2;}
    82108304   { (exit 1); exit 1; }; }
    … …  
    86838777  # Handling of arguments.
    86848778  "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
    8685   "src/console/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/console/Makefile" ;;
    8686   "src/gui/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/gui/Makefile" ;;
    86878779  "src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
    8688   "src/importer/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/importer/Makefile" ;;
     8780  "src/lib/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/lib/Makefile" ;;
     8781  "src/lib/graphics/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/lib/graphics/Makefile" ;;
     8782  "src/lib/graphics/importer/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/lib/graphics/importer/Makefile" ;;
     8783  "src/lib/gui/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/lib/gui/Makefile" ;;
     8784  "src/lib/gui/console/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/lib/gui/console/Makefile" ;;
     8785  "src/lib/gui/gui/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/lib/gui/gui/Makefile" ;;
    86898786  "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
    86908787  "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
    … …  
    88318928s,@EGREP@,$EGREP,;t t
    88328929s,@DEBUG@,$DEBUG,;t t
     8930s,@SUB_PROJECTS_TRUE@,$SUB_PROJECTS_TRUE,;t t
     8931s,@SUB_PROJECTS_FALSE@,$SUB_PROJECTS_FALSE,;t t
    88338932s,@DOXYGEN@,$DOXYGEN,;t t
    88348933s,@DOXYGEN_TRUE@,$DOXYGEN_TRUE,;t t

  • orxonox/branches/updater/configure.ac

    r3283 r3561  
    1 #                                               -*- Autoconf -*-
    2 # Process this file with autoconf to produce a configure script.
    3 
     1##########################################################################
     2#   orxonox - the future of 3D-vertical-scrollers                        #
     3#                                                                        #
     4#   Copyright (C) 2004 orx                                               #
     5#                                                                        #
     6#   This program is free software; you can redistribute it and/or modify #
     7#   it under the terms of the GNU General Public License as published by #
     8#   the Free Software Foundation; either version 2, or (at your option)  #
     9#   any later version.                                                   #
     10#                                                                        #
     11#   ### File Specific:                                                   #
     12#   main-programmer: Benjamin Grauer                                     #
     13#   co-programmer: ...                                                   #
     14#                                                                        #
     15#   This is the main configuration File of autoconf.                     #
     16#   Please edit this file only, if you exactly know what you are doing.  #
     17#   It is quite fragile, and compiling orxonox on different Platforms    #
     18#   is only guarantied, if build with the right config.                  #
     19##########################################################################
     20
     21#########################
     22## AUTOCONF INIT PHASE ##
     23#########################
    424AC_PREREQ(2.56)
    525AC_INIT(orxonox, 0.2.1-pre-alpha, [orxonox-dev at mail.datacore.ch])
    626
    7 # Detect the canonical host and target build environment.
     27## Detect the canonical host and target build environment.
    828AC_CANONICAL_BUILD
    929AC_CANONICAL_HOST
    1030AC_CANONICAL_TARGET
    1131
    12 
    1332AM_INIT_AUTOMAKE
    1433
    … …  
    1635AC_CONFIG_HEADER([config.h])
    1736
    18 
    19 # Checks for programs.
     37#########################
     38## Checks for programs ##
     39#########################
    2040AC_PROG_CXX
    2141AC_HEADER_STDC
    2242
    23 ### CHECKING  OPTIONAT ARGUMENTS
    24 ## DEBUG-statement
     43##################################
     44## CHECKING  OPTIONAL ARGUMENTS ##
     45##################################
     46
     47#-----------------#
     48# DEBUG-statement #
     49#-----------------#
    2550DEBUG=no
    2651AC_MSG_CHECKING([if DEBUG-mode should be enabled])
    … …  
    2954         DEBUG=$enableval)
    3055
    31 if test "$DEBUG" = "no"; then
     56if test x$DEBUG = xno; then
    3257        echo "no"
    33         echo " -> Setting debuglevel to 1. Like this you can still see errors."
    34         DEBUG=1
    35 elif test "$DEBUG" = yes; then
     58        echo " -> Setting debuglevel to 3. (orxonox is still in Development. It really is needed."
     59        DEBUG=3
     60elif test x$DEBUG = xyes; then
    3661        echo "yes"
    37         echo " -> Setting debuglevel to 3. HARD DEBUG MODE!!."
    38         DEBUG=3
     62        echo " -> Setting debuglevel to 4. HARD DEBUG MODE!!."
     63        DEBUG=4
    3964else       
    40         echo "yes set to $DEBUG"
     65        echo "yes: setting debuglevel to to $DEBUG"
    4166fi
    4267        AC_DEFINE_UNQUOTED(DEBUG, $DEBUG, [in which debug mode we are])
    … …  
    4469AC_SUBST(DEBUG)
    4570
    46 ## GTK-disabled
     71#--------------#
     72# GTK-disabled #
     73#--------------#
    4774AC_MSG_CHECKING([if gtk should be enabled])
    4875AC_ARG_WITH([gtk],
    4976        AC_HELP_STRING( [--without-gtk],
    5077        [Prevents GTK from being loaded]), [def_gtk=no], [def_gtk=yes])
    51 if test "$def_gtk" = yes; then
     78if test x$def_gtk = xyes; then
    5279  echo "yes"
    5380fi
    54 if test "$def_gtk" = no; then
     81if test x$def_gtk = xno; then
    5582  echo "no"
    5683fi
    5784
    58 ## gThread-disabled
     85#------------------#
     86# gThread-disabled #
     87#------------------#
    5988AC_MSG_CHECKING([if gThread should be enabled])
    6089AC_ARG_WITH([gthread],
    61         AC_HELP_STRING( [--without-gthread], 
     90        AC_HELP_STRING( [--without-gthread],
    6291        [Prevents gThread from being loaded]), [def_gthread=no], [def_gthread=yes])
    63 if test "$def_gthread" = yes; then
     92if test x$def_gthread = xyes; then
    6493  echo "yes"
    6594fi
    66 if test "$def_gthread" = no; then
     95if test x$def_gthread = xno; then
    6796  echo "no"
    6897fi
    6998
    70 ## pthread-disabled
     99#------------------#
     100# pthread-disabled #
     101#------------------#
    71102AC_MSG_CHECKING([if pthread should be enabled])
    72103AC_ARG_WITH([pthread],
    73104        AC_HELP_STRING( [--without-pthread],
    74105        [Prevents pthread from being loaded]), [def_pthread=no], [def_pthread=yes])
    75 if test "$def_pthread" = yes; then
     106if test x$def_pthread = xyes; then
    76107  echo "yes"
    77108fi
    78 if test "$def_pthread" = no; then
     109if test x$def_pthread = xno; then
    79110  echo "no"
    80111fi
    81112
    82 ## libCurl disabled?
     113#------------------#
     114# libCurl-disabled #
     115#------------------#
    83116AC_MSG_CHECKING([if libcURL should be enabled])
    84117AC_ARG_WITH([curl],
    85118        AC_HELP_STRING( [--without-curl],
    86119        [Prevents libcURL from being loaded]), [def_curl=no], [def_curl=yes])
    87 if test "$def_curl" = yes; then
     120if test x$def_curl = xyes; then
    88121  echo "yes"
    89122fi
    90 if test "$def_curl" = no; then
     123if test x$def_curl = xno; then
    91124  echo "no"
    92125fi
    93126
    94 ### SDL_image-disable
     127#-------------------#
     128# SDL_image-disable #
     129#-------------------#
    95130def_sdl_image=yes
    96131AC_MSG_CHECKING([if SDL_image should be enabled])
    … …  
    98133        AC_HELP_STRING( [--without-sdl-image],
    99134        [Prevents SDL_image from being loaded]), [def_sdl_image=no])
    100 if test "$def_sdl_image" = yes; then
     135if test x$def_sdl_image = xyes; then
    101136  echo "yes"
    102137fi
    103 if test "$def_sdl_image" = no; then
     138if test x$def_sdl_image = xno; then
    104139  echo "no"
    105140fi
    106 
    107 
    108 ## PROGRAMM CHECKING
    109 # checking for Doxygen
     141#-------------------#
     142# SubProject-enable #
     143#-------------------#
     144def_sub_projects=no
     145AC_MSG_CHECKING([if the SubProjects should be built])
     146AC_ARG_ENABLE([sub-projects],
     147        AC_HELP_STRING( [--enable-sub-projects],
     148        [also builds the subProjects while make from srcdir]), [def_sub_projects=yes])
     149if test x$def_sub_projects = xyes; then
     150  echo "yes"
     151fi
     152if test x$def_sub_projects = xno; then
     153  echo "no"
     154fi
     155AM_CONDITIONAL(SUB_PROJECTS, test x$def_sub_projects = xyes)
     156
     157#######################
     158## PROGRAMM CHECKING ##
     159## 3. party Programs ##
     160#######################
     161
     162#----------------------#
     163# checking for Doxygen #
     164#----------------------#
    110165AC_PATH_PROG(DOXYGEN, doxygen)
    111166AM_CONDITIONAL(DOXYGEN, test $DOXYGEN)
    112167
    113 ### CHECKING FOR SYSTEM ###
     168#########################
     169## CHECKING FOR SYSTEM ##
     170#########################
     171## here the system is checked, and openGL is included
     172## also checking for SDL on differen Systems
    114173
    115174AC_MSG_CHECKING([for System])
    116175## checking for openGL-environment and other sys-specific parameters
    117176case "$target" in
    118 ### WINDOWS ###
     177#---------#
     178# WINDOWS #
     179#---------#
    119180  *-*-mingw32*)
    120181echo "mingw-WINDOWS detected"
    … …  
    132193#   checking for Windows openGl library
    133194    AC_CHECK_LIB([opengl32], [main], FOUND_opengl32=yes, "gl/gl.h")
    134     if test "$FOUND_opengl32" = "yes" ; then
     195    if test x$FOUND_opengl32 = xyes ; then
    135196        LIBS="$LIBS -lopengl32"
    136197    else
    … …  
    143204
    144205# cheking for GLU-header
    145     AC_CHECK_HEADERS(GL/glu.h ,,
     206    AC_CHECK_HEADERS([GL/glu.h] ,,
    146207      [AC_MSG_ERROR([cannot find opengl headers]) ])
    147208
    148209# checking for libGLU
    149210    AC_CHECK_LIB([glu32], [main], FOUND_glu32=yes)
    150     if test "$FOUND_glu32" = "yes" ; then
     211    if test x$FOUND_glu32 = xyes ; then
    151212        LIBS="$LIBS -lGLU32"
    152213    else
    … …  
    160221# checking for mingw32
    161222    AC_CHECK_LIB([mingw32], [main], FOUND_mingw32=yes)
    162     if test $FOUND_mingw32 = "yes"; then
     223    if test x$FOUND_mingw32 = xyes; then
    163224        LIBS="$LIBS -lmingw32"
    164225    fi
    165226# checking for SDL-headers
    166     AC_CHECK_HEADERS(SDL/SDL.h ,,
     227    AC_CHECK_HEADERS([SDL/SDL.h] ,,
    167228      [AC_MSG_ERROR([cannot find SDL headers]) ])
    168229
    169230#checking for libSDL
    170231    AC_CHECK_LIB([sdlmain], [main], FOUND_sdlmain=yes)
    171     if test "$FOUND_sdlmain" = "yes" ; then
     232    if test x$FOUND_sdlmain = xyes ; then
    172233       LIBS="$LIBS -lsdlmain"
    173234    else
    … …  
    179240    fi
    180241    AC_CHECK_LIB([sdl], [main], FOUND_sdl=yes)
    181     if test "$FOUND_sdl" = "yes" ; then
     242    if test x$FOUND_sdl = xyes ; then
    182243       LIBS="$LIBS -lsdl"
    183244    else
    … …  
    190251
    191252    ;;
    192 
    193 ### LINUX ###
     253#-------#
     254# LINUX #
     255#-------#
    194256 *-*-linux*)
    195257echo "Linux detected"
    … …  
    198260
    199261CPPFLAGS="-I/usr/X11R6/include"
    200 LDFLAGS="-L/usr/Mesa-6.0.1/lib -L/usr/X11R6/lib $LDFLAGS"
     262LDFLAGS="-L/usr/lib/opengl/xorg-x11/lib -L/usr/Mesa-6.0.1/lib -L/usr/X11R6/lib $LDFLAGS"
    201263# checking gl header
    202    AC_CHECK_HEADERS(GL/gl.h ,,
     264   AC_CHECK_HEADERS([GL/gl.h] ,,
    203265      [AC_MSG_ERROR([cannot find opengl headers]) ])
    204266
    205267#  checking for Unix GL
    206    AC_CHECK_LIB([GL], [main], FOUND_GL=yes)
    207    if test "$FOUND_GL" = "yes" ; then
     268   AC_CHECK_LIB([GL], [glLoadIdentity], FOUND_GL=yes)
     269   if test x$FOUND_GL = xyes ; then
    208270     LIBS="$LIBS -lGL"
    209271   else
    … …  
    216278
    217279# cheking for GLU-header
    218     AC_CHECK_HEADERS(GL/glu.h ,,
     280    AC_CHECK_HEADERS([GL/glu.h] ,,
    219281      [AC_MSG_ERROR([cannot find opengl headers]) ])
    220282
    221283    AC_CHECK_LIB([GLU], [gluProject], FOUND_GLU=yes)
    222     if test "$FOUND_GLU" = "yes" ; then
     284    if test x$FOUND_GLU = xyes ; then
    223285      LIBS="$LIBS -lGLU"
    224286    else
    … …  
    231293
    232294# checking for SDL-headers
    233     AC_CHECK_HEADERS(SDL/SDL.h ,,
     295    AC_CHECK_HEADERS([SDL/SDL.h] ,,
    234296      [AC_MSG_ERROR([cannot find SDL headers]) ])
    235297
    236298# checking for SDL-lib
    237299    AC_CHECK_LIB([SDL], [main], FOUND_SDL=yes)
    238      if test "$FOUND_SDL" = "yes" ; then
     300     if test x$FOUND_SDL = xyes ; then
    239301       LIBS="$LIBS -lSDL"
    240302     else
    … …  
    256318#    LIBS="$LIBS $SDL_LIBS"
    257319    ;;
    258 
    259 ### OS X ###
     320#-----------#
     321# MAC -OS X #
     322#-----------#
    260323 *darwin*)
    261 echo "OS X detected"
     324 echo "OS X detected"
    262325
    263326 osX="yes"
    … …  
    265328 CPPFLAGS="-I/sw/include $CPPFLAGS"
    266329# checking gl header
    267    AC_CHECK_HEADERS(OpenGL/gl.h ,,
     330   AC_CHECK_HEADERS([OpenGL/gl.h] ,,
    268331      [AC_MSG_ERROR([cannot find opengl headers]) ])
    269332# cheking for GLU-header
    270     AC_CHECK_HEADERS(OpenGL/glu.h ,,
     333    AC_CHECK_HEADERS([OpenGL/glu.h] ,,
    271334      [AC_MSG_ERROR([cannot find opengl headers]) ])
    272335
    273336   LIBS="$LIBS -framework OpenGL"
     337
     338       SDL_CFLAGS=`sdl-config --cflags`
     339       SDL_LIBS=`sdl-config --libs`
     340       CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
     341       LIBS="$LIBS $SDL_LIBS"
     342
    274343
    275344# checking for SDL-headers
    … …  
    284353#      )
    285354
    286        SDL_CFLAGS=`sdl-config --cflags`
    287        SDL_LIBS=`sdl-config --libs`
    288        CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
    289        LIBS="$LIBS $SDL_LIBS"
    290355
    291356    ;;
    … …  
    297362AC_SUBST(MSBITFIELDS)
    298363
    299 ## check for SDL_Image
    300 if test "$def_sdl_image" = "yes"; then
     364###################################
     365## CHECKING FOR HEADERS AND LIBS ##
     366###################################
     367
     368#-----------#
     369# SDL_Image #
     370#-----------#
     371if test x$def_sdl_image = xyes; then
    301372# checking for SDL_image-headers
    302   AC_CHECK_HEADERS(SDL/SDL_image.h ,,
     373  AC_CHECK_HEADERS([SDL/SDL_image.h] ,,
    303374      [echo "sdl_image not found. falling back to other options"; def_sdl_image=no ])
    304375fi
    305 if test "$def_sdl_image" = "yes"; then
     376if test x$def_sdl_image = xyes; then
    306377# checking for SDL_image-lib
    307   AC_CHECK_LIB([SDL_image], [main], FOUND_SDL_image=yes)
    308      if test "$FOUND_SDL_image" = "yes" ; then
     378  AC_CHECK_LIB([SDL_image], [main], [FOUND_SDL_image=yes])
     379     if test x$FOUND_SDL_image = xyes ; then
    309380       LIBS="$LIBS -lSDL_image"
    310381     else
    … …  
    317388fi
    318389
    319 
    320 if test "$def_sdl_image" = "no"; then
    321  ## checking for libjpeg
    322  AC_CHECK_HEADERS(jpeglib.h ,jpegHeader="yes",
    323         jpegHeader="no")
    324  if test $jpegHeader = "no"; then
     390## case no SDL-image:
     391if test x$def_sdl_image = xno; then
     392#---------#
     393# libjpeg #
     394#---------#
     395 AC_CHECK_HEADERS([jpeglib.h], [jpegHeader="yes"],
     396        [jpegHeader="no"])
     397 if test x$jpegHeader = xno; then
    325398        echo " not including jpeg."
    326399 else
    327   AC_CHECK_LIB([jpeg], [main], FOUND_jpeg=yes)
    328     if test "$FOUND_jpeg" = "yes" ; then
     400  AC_CHECK_LIB([jpeg], [main], [FOUND_jpeg=yes])
     401    if test x$FOUND_jpeg = xyes ; then
    329402      LIBS="$LIBS -ljpeg"
    330403    else
    … …  
    337410 fi
    338411
    339  ## checking for libpng
    340  AC_CHECK_HEADERS(png.h ,pngHeader="yes",
    341         pngHeader="no")
    342  if test $pngHeader = "no"; then
     412#--------#
     413# libpng #
     414#--------#
     415 AC_CHECK_HEADERS([png.h], [pngHeader="yes"],
     416        [pngHeader="no"])
     417 if test x$pngHeader = xno; then
    343418        echo " not including png."
    344419 else
    345420  AC_CHECK_LIB([png], [main], FOUND_png=yes)
    346     if test "$FOUND_png" = "yes" ; then
     421    if test x$FOUND_png = xyes ; then
    347422      LIBS="$LIBS -lpng"
    348423    else
    … …  
    356431fi
    357432
    358 ## checking for GTK
    359 if test "$def_gtk" = yes; then
     433#-----#
     434# GTK #
     435#-----#
     436if test x$def_gtk = xyes; then
    360437
    361438        #PKG_CHECK_MODULES(GTK2, gtk+-2.0 >= 2.0.3 gthread-2.0 >= 2.0.3, have_gtk2=yes, have_gtk2=no)
    … …  
    376453AM_CONDITIONAL(HAVE_GTK2, test x$have_gtk2 = xyes)
    377454
    378 ## checking for gThread
    379 if test "$def_gthread" = yes; then
     455#---------#
     456# gThread #
     457#---------#
     458if test x$def_gthread = xyes; then
    380459
    381460        AC_MSG_CHECKING([for gthread])
    … …  
    395474AM_CONDITIONAL(HAVE_GTHREAD, test x$have_gthread = xyes)
    396475
    397 ## checking for libcURL
    398 if test "$def_curl" = yes; then
    399 
    400  AC_CHECK_HEADERS([curl/curl.h], curlHeader="yes", curlHeader="no")
     476#---------#
     477# libcURL #
     478#---------#
     479if test x$def_curl = xyes; then
     480
     481 AC_CHECK_HEADERS([curl/curl.h], [curlHeader="yes"], [curlHeader="no"])
    401482 AC_CHECK_LIB([curl], [main], [FOUND_curl=yes])
    402483 if test x$curlHeader = xyes & test x$FOUND_curl = xyes ; then
    … …  
    405486  CURLCFLAGS=`curl-config --cflags`
    406487  AC_DEFINE_UNQUOTED(HAVE_CURL, 1, [if we have CURL])
    407  else 
     488 else
    408489  have_curl=no
    409490 fi
    … …  
    414495AM_CONDITIONAL(HAVE_CURL, test x$have_curl = xyes)
    415496
    416 
    417 ##checking for pthread
     497#---------#
     498# pthread #
     499#---------#
    418500if test x$def_pthread = xyes ; then
    419501 if test x$have_gthread = xyes ; then
    420   AC_CHECK_HEADERS([pthread.h], pthreadHeader="yes", pthreadHeader="no")
    421   AC_CHECK_LIB([pthread], [main], FOUND_pthread=yes)
    422    if test "$FOUND_pthread" = "yes" ; then
     502  AC_CHECK_HEADERS([pthread.h], [pthreadHeader="yes"], [pthreadHeader="no"])
     503  AC_CHECK_LIB([pthread], [main], [FOUND_pthread=yes])
     504   if test x$FOUND_pthread = xyes ; then
    423505      LIBS="$LIBS -lpthread"
    424506   fi
    425507 fi
    426508fi
     509
     510
    427511# FIXME: Replace `main' with a function in `-lm':
    428512 AC_CHECK_LIB([m], [main])
    … …  
    440524AC_CHECK_FUNCS([bzero sqrt])
    441525
     526######################
     527## OUTPUT CONFIGURE ##
     528######################
    442529AC_CONFIG_FILES([Makefile
    443                  src/console/Makefile
    444                  src/gui/Makefile
    445530                 src/Makefile
    446                  src/importer/Makefile])
     531                 src/lib/Makefile
     532                 src/lib/graphics/Makefile
     533                 src/lib/graphics/importer/Makefile
     534                 src/lib/gui/Makefile
     535                 src/lib/gui/console/Makefile
     536                 src/lib/gui/gui/Makefile])
     537
    447538AC_OUTPUT

  • orxonox/branches/updater/doc/orxodox.src

    r2710 r3561  
    77PROJECT_NAME           = Orxonox
    88PROJECT_NUMBER         = 1
    9 OUTPUT_DIRECTORY       = doc/doxygen/
     9OUTPUT_DIRECTORY       = doxygen/
    1010CREATE_SUBDIRS         = YES
    1111OUTPUT_LANGUAGE        = English
    … …  
    3434#---------------------------------------------------------------------------
    3535EXTRACT_ALL            = NO
    36 EXTRACT_PRIVATE        = NO
    37 EXTRACT_STATIC         = NO
     36EXTRACT_PRIVATE        = YES
     37EXTRACT_STATIC         = YES
    3838EXTRACT_LOCAL_CLASSES  = YES
    3939EXTRACT_LOCAL_METHODS  = NO
    … …  
    6969# configuration options related to the input files
    7070#---------------------------------------------------------------------------
    71 INPUT                  = src/
     71INPUT                  = .
    7272FILE_PATTERNS          =
    73 RECURSIVE              = YES
     73RECURSIVE              = NO
    7474EXCLUDE                =
    7575EXCLUDE_SYMLINKS       = NO

  • orxonox/branches/updater/doc/orxonox.1

    r1861 r3561  
    1414.\" the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
    1515.\"
    16 .TH ORXONOX 1 "April 13, 2004"
     16.TH ORXONOX 1 "March 2, 2004"
    1717.\" Please update the above date whenever this man page is modified.
    1818.\"
    … …  
    2828.\" for manpage-specific macros, see man(7)
    2929.SH NAME
    30 orxonox \- the future of 3D-vertical-scrollers
     30orxonox \-  High-End Vertical Scroller
    3131.SH SYNOPSIS
    3232.B orxonox
    3333.RI [ options ]
    3434.SH DESCRIPTION
    35 \fBorxonox\fP washes your windows, mends your fences, mows your lawn...
     35\fBorxonox\fP is an open-source vertical scroller game programmed in C++,OpenGL and SDL. It's designed to run on all important platforms like Linux, MacOS X, Windows.
    3636.PP
    37 It also...
     37It washes your windows, mends your fences, mows your lawn...
    3838.SH OPTIONS
    3939\fBorxonox\fP accepts the following options:
    40 .TP
    41 .BR  -q , " --quiet" , " --silent"
    42 Inhibit usual output.
    43 .TP
    44 .B  -v, --verbose
    45 Print more information.
    4640.TP
    4741.B \-h, \-\-help
    4842Show summary of options.
    4943.TP
    50 .B \-V, \-\-version
    51 Show version of program.
     44.B \-v=<i>, \-\-verbose=\<i\>
     45Prints out: 0: nothing, 1: error, 2: warnings, 3: information, 4+: debug
     46.TP
     47.B \-g, \-\-gui
     48displays the gui prior to starting orxonox. (this is also the case, if the configuration-files do not exist in your home).
     49.TP
     50.B \-q, \-\-windowed
     51starts orxonox in windowed mode. (not fullscreen)
     52.TP
     53.B \-\-no\-sound
     54Disables audio completely
     55.TP
     56.B \-w, \-\-wireframe
     57Renders everything in Wireframe mode.
     58.TP
    5259.\" .SH "SEE ALSO"
    5360.\" .BR foo (1),
    5461.\" .BR bar (1).
    5562.SH AUTHOR
    56 orx <orxonox-announce@mail.datacore.ch>.
     63orx-crew <orxonox@orxonox.ethz.ch>.
Note: See TracChangeset for help on using the changeset viewer.