Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 3105 in orxonox.OLD


Ignore:
Timestamp:
Dec 5, 2004, 5:34:52 PM (19 years ago)
Author:
bensch
Message:

orxonox/branches/images: test also in configure.ac-script.

Location:
orxonox/branches/images
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • orxonox/branches/images/Makefile.am

    r3084 r3105  
    1 SUBDIRS = src console gui importer
     1if HAVE_GTK2
     2  GTK_PROGS =gui console
     3else
     4  GTK_PROGS =
     5endif
     6
     7SUBDIRS = src importer $(GTK_PROGS)

  • orxonox/branches/images/Makefile.in

    r3084 r3105  
    6060ETAGS = etags
    6161CTAGS = ctags
    62 DIST_SUBDIRS = $(SUBDIRS)
     62DIST_SUBDIRS = src importer gui console
    6363DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
    6464distdir = $(PACKAGE)-$(VERSION)
    … …  
    118118PACKAGE_VERSION = @PACKAGE_VERSION@
    119119PATH_SEPARATOR = @PATH_SEPARATOR@
    120 PKG_CONFIG = @PKG_CONFIG@
    121120SET_MAKE = @SET_MAKE@
    122121SHELL = @SHELL@
    … …  
    165164target_os = @target_os@
    166165target_vendor = @target_vendor@
    167 SUBDIRS = src console gui importer
     166@HAVE_GTK2_FALSE@GTK_PROGS =
     167@HAVE_GTK2_TRUE@GTK_PROGS = gui console
     168SUBDIRS = src importer $(GTK_PROGS)
    168169all: config.h
    169170        $(MAKE) $(AM_MAKEFLAGS) all-recursive
    … …  
    371372          fi; \
    372373        done
    373         list='$(SUBDIRS)'; for subdir in $$list; do \
     374        list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
    374375          if test "$$subdir" = .; then :; else \
    375376            test -d "$(distdir)/$$subdir" \

  • orxonox/branches/images/aclocal.m4

    r3084 r3105  
    1111# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
    1212# PARTICULAR PURPOSE.
    13 
    14 
    15 dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not)
    16 dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page
    17 dnl also defines GSTUFF_PKG_ERRORS on error
    18 AC_DEFUN(PKG_CHECK_MODULES, [
    19   succeeded=no
    20 
    21   if test -z "$PKG_CONFIG"; then
    22     AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
    23   fi
    24 
    25   if test "$PKG_CONFIG" = "no" ; then
    26      echo "*** The pkg-config script could not be found. Make sure it is"
    27      echo "*** in your path, or set the PKG_CONFIG environment variable"
    28      echo "*** to the full path to pkg-config."
    29      echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
    30   else
    31      PKG_CONFIG_MIN_VERSION=0.9.0
    32      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
    33         AC_MSG_CHECKING(for $2)
    34 
    35         if $PKG_CONFIG --exists "$2" ; then
    36             AC_MSG_RESULT(yes)
    37             succeeded=yes
    38 
    39             AC_MSG_CHECKING($1_CFLAGS)
    40             $1_CFLAGS=`$PKG_CONFIG --cflags "$2"`
    41             AC_MSG_RESULT($$1_CFLAGS)
    42 
    43             AC_MSG_CHECKING($1_LIBS)
    44             $1_LIBS=`$PKG_CONFIG --libs "$2"`
    45             AC_MSG_RESULT($$1_LIBS)
    46         else
    47             $1_CFLAGS=""
    48             $1_LIBS=""
    49             ## If we have a custom action on failure, don't print errors, but
    50             ## do set a variable so people can do so.
    51             $1_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
    52             ifelse([$4], ,echo $$1_PKG_ERRORS,)
    53         fi
    54 
    55         AC_SUBST($1_CFLAGS)
    56         AC_SUBST($1_LIBS)
    57      else
    58         echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
    59         echo "*** See http://www.freedesktop.org/software/pkgconfig"
    60      fi
    61   fi
    62 
    63   if test $succeeded = yes; then
    64      ifelse([$3], , :, [$3])
    65   else
    66      ifelse([$4], , AC_MSG_ERROR([Library requirements ($2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.]), [$4])
    67   fi
    68 ])
    69 
    70 
    7113
    7214#                                                        -*- Autoconf -*-

  • orxonox/branches/images/config.h.in

    r3104 r3105  
    99/* Define to 1 if you have the <GL/gl.h> header file. */
    1010#undef HAVE_GL_GL_H
     11
     12/* if we have GTK2 */
     13#undef HAVE_GTK2
    1114
    1215/* Define to 1 if you have the <inttypes.h> header file. */

  • orxonox/branches/images/configure

    r3104 r3105  
    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 MSBITFIELDS PKG_CONFIG GTK2_CFLAGS GTK2_LIBS HAVE_GTK2_TRUE HAVE_GTK2_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 MSBITFIELDS GTK2_LIBS GTK2_CFLAGS HAVE_GTK2_TRUE HAVE_GTK2_FALSE LIBOBJS LTLIBOBJS'
    315315ac_subst_files=''
    316316
    … …  
    865865  --disable-dependency-tracking  speeds up one-time build
    866866  --enable-dependency-tracking   do not reject slow dependency extractors
     867  --disable-gtk           Prevents GTK from being loaded
     868  --disabel-sdl-image     Prevents SDL_image from being loaded
    867869
    868870Some influential environment variables:
    … …  
    38303832
    38313833
     3834
     3835### CHECKING  OPTIONAT ARGUMENTS
     3836## GTK-disabled
     3837def_gtk=yes
     3838echo "$as_me:$LINENO: checking if gtk should be enabled" >&5
     3839echo $ECHO_N "checking if gtk should be enabled... $ECHO_C" >&6
     3840# Check whether --enable-gtk or --disable-gtk was given.
     3841if test "${enable_gtk+set}" = set; then
     3842  enableval="$enable_gtk"
     3843  def_gtk=no
     3844fi;
     3845if test "$def_gtk" = yes; then
     3846  echo "yes"
     3847fi
     3848if test "$def_gtk" = no; then
     3849  echo "no"
     3850fi
     3851### SDL_image-disable
     3852def_sdl_image=yes
     3853echo "$as_me:$LINENO: checking if SDL_image should be enabled" >&5
     3854echo $ECHO_N "checking if SDL_image should be enabled... $ECHO_C" >&6
     3855# Check whether --enable-sdl_image or --disable-sdl_image was given.
     3856if test "${enable_sdl_image+set}" = set; then
     3857  enableval="$enable_sdl_image"
     3858  def_sdl_image=no
     3859fi;
     3860if test "$def_sdl_image" = yes; then
     3861  echo "yes"
     3862fi
     3863if test "$def_sdl_image" = no; then
     3864  echo "no"
     3865fi
     3866
    38323867### CHECKING FOR SYSTEM ###
    38333868
    … …  
    47444779    fi
    47454780
    4746 
     4781    def_sdl_image=no;
    47474782    ;;
    47484783
    … …  
    54455480     fi
    54465481
     5482## check for SDL_Image
     5483if test "$def_sdl_image" = "yes"; then
    54475484# checking for SDL_image-headers
    54485485
    … …  
    55935630
    55945631else
    5595   { { echo "$as_me:$LINENO: error: cannot find SDL_image headers" >&5
    5596 echo "$as_me: error: cannot find SDL_image headers" >&2;}
    5597    { (exit 1); exit 1; }; }
     5632  echo "sdl_image not found. falling back to other options"; def_sdl_image=no
    55985633fi
    55995634
    56005635done
    56015636
     5637fi
     5638if test "$def_sdl_image" = "yes"; then
    56025639# checking for SDL_image-lib
    56035640  echo "$as_me:$LINENO: checking for main in -lSDL_image" >&5
    … …  
    56725709        exit -1
    56735710     fi
     5711fi
    56745712
    56755713## checking for SDL
    … …  
    60176055       CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
    60186056       LIBS="$LIBS $SDL_LIBS"
     6057
     6058       def_sdl_image=no;
    60196059    ;;
    60206060
    … …  
    60256065
    60266066
    6027 ## checking for libjpeg
     6067if test "$def_sdl_image" = "no"; then
     6068 ## checking for libjpeg
    60286069
    60296070for ac_header in jpeglib.h
    … …  
    61816222
    61826223
    6183 echo "$as_me:$LINENO: checking for main in -ljpeg" >&5
     6224 echo "$as_me:$LINENO: checking for main in -ljpeg" >&5
    61846225echo $ECHO_N "checking for main in -ljpeg... $ECHO_C" >&6
    61856226if test "${ac_cv_lib_jpeg_main+set}" = set; then
    … …  
    62546295
    62556296
    6256 ## checking for libpng
     6297 ## checking for libpng
    62576298
    62586299for ac_header in png.h
    … …  
    64106451
    64116452
    6412 echo "$as_me:$LINENO: checking for main in -lpng" >&5
     6453 echo "$as_me:$LINENO: checking for main in -lpng" >&5
    64136454echo $ECHO_N "checking for main in -lpng... $ECHO_C" >&6
    64146455if test "${ac_cv_lib_png_main+set}" = set; then
    … …  
    64816522         exit -1
    64826523    fi
    6483 
     6524fi
    64846525
    64856526## checking for GTK
    6486 
    6487   succeeded=no
    6488 
    6489   if test -z "$PKG_CONFIG"; then
    6490     # Extract the first word of "pkg-config", so it can be a program name with args.
    6491 set dummy pkg-config; ac_word=$2
    6492 echo "$as_me:$LINENO: checking for $ac_word" >&5
    6493 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    6494 if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
    6495   echo $ECHO_N "(cached) $ECHO_C" >&6
    6496 else
    6497   case $PKG_CONFIG in
    6498   [\\/]* | ?:[\\/]*)
    6499   ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
    6500   ;;
    6501   *)
    6502   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
    6503 for as_dir in $PATH
    6504 do
    6505   IFS=$as_save_IFS
    6506   test -z "$as_dir" && as_dir=.
    6507   for ac_exec_ext in '' $ac_executable_extensions; do
    6508   if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
    6509     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
    6510     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
    6511     break 2
    6512   fi
    6513 done
    6514 done
    6515 
    6516   test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
    6517   ;;
    6518 esac
    6519 fi
    6520 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
    6521 
    6522 if test -n "$PKG_CONFIG"; then
    6523   echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
    6524 echo "${ECHO_T}$PKG_CONFIG" >&6
    6525 else
    6526   echo "$as_me:$LINENO: result: no" >&5
    6527 echo "${ECHO_T}no" >&6
    6528 fi
    6529 
    6530   fi
    6531 
    6532   if test "$PKG_CONFIG" = "no" ; then
    6533      echo "*** The pkg-config script could not be found. Make sure it is"
    6534      echo "*** in your path, or set the PKG_CONFIG environment variable"
    6535      echo "*** to the full path to pkg-config."
    6536      echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
    6537   else
    6538      PKG_CONFIG_MIN_VERSION=0.9.0
    6539      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
    6540         echo "$as_me:$LINENO: checking for gtk+-2.0 >= 2.0.3 gthread-2.0 >= 2.0.3" >&5
    6541 echo $ECHO_N "checking for gtk+-2.0 >= 2.0.3 gthread-2.0 >= 2.0.3... $ECHO_C" >&6
    6542 
    6543         if $PKG_CONFIG --exists "gtk+-2.0 >= 2.0.3 gthread-2.0 >= 2.0.3" ; then
    6544             echo "$as_me:$LINENO: result: yes" >&5
    6545 echo "${ECHO_T}yes" >&6
    6546             succeeded=yes
    6547 
    6548             echo "$as_me:$LINENO: checking GTK2_CFLAGS" >&5
    6549 echo $ECHO_N "checking GTK2_CFLAGS... $ECHO_C" >&6
    6550             GTK2_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 2.0.3 gthread-2.0 >= 2.0.3"`
    6551             echo "$as_me:$LINENO: result: $GTK2_CFLAGS" >&5
    6552 echo "${ECHO_T}$GTK2_CFLAGS" >&6
    6553 
    6554             echo "$as_me:$LINENO: checking GTK2_LIBS" >&5
    6555 echo $ECHO_N "checking GTK2_LIBS... $ECHO_C" >&6
    6556             GTK2_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= 2.0.3 gthread-2.0 >= 2.0.3"`
    6557             echo "$as_me:$LINENO: result: $GTK2_LIBS" >&5
    6558 echo "${ECHO_T}$GTK2_LIBS" >&6
    6559         else
    6560             GTK2_CFLAGS=""
    6561             GTK2_LIBS=""
    6562             ## If we have a custom action on failure, don't print errors, but
    6563             ## do set a variable so people can do so.
    6564             GTK2_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-2.0 >= 2.0.3 gthread-2.0 >= 2.0.3"`
    6565 
    6566         fi
    6567 
    6568 
    6569 
    6570      else
    6571         echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
    6572         echo "*** See http://www.freedesktop.org/software/pkgconfig"
    6573      fi
    6574   fi
    6575 
    6576   if test $succeeded = yes; then
    6577      have_gtk2=yes
    6578   else
    6579      have_gtk2=no
    6580   fi
    6581 
    6582 
    6583 
    6584 
    6585 
    6586 if test "x$have_gtk2" = xyes; then
     6527if test "$def_gtk" = yes; then
     6528
     6529        #PKG_CHECK_MODULES(GTK2, gtk+-2.0 >= 2.0.3 gthread-2.0 >= 2.0.3, have_gtk2=yes, have_gtk2=no)
     6530        echo "$as_me:$LINENO: checking for gtk2.0" >&5
     6531echo $ECHO_N "checking for gtk2.0... $ECHO_C" >&6
     6532        if `pkg-config --exists gtk+-2.0`; then
     6533                echo "yes"
     6534                have_gtk2=yes
     6535                GTK2_LIBS=`pkg-config --libs gtk+-2.0`
     6536                GTK2_CFLAGS=`pkg-config --cflags gtk+-2.0`
     6537
     6538cat >>confdefs.h <<_ACEOF
     6539#define HAVE_GTK2 1
     6540_ACEOF
     6541
     6542        else
     6543                echo "no"
     6544        fi
     6545
     6546fi
     6547
     6548
     6549
     6550
     6551if test x$have_gtk2 = xyes; then
    65876552  HAVE_GTK2_TRUE=
    65886553  HAVE_GTK2_FALSE='#'
    … …  
    65916556  HAVE_GTK2_FALSE=
    65926557fi
     6558
    65936559
    65946560
    … …  
    82628228s,@EGREP@,$EGREP,;t t
    82638229s,@MSBITFIELDS@,$MSBITFIELDS,;t t
    8264 s,@PKG_CONFIG@,$PKG_CONFIG,;t t
     8230s,@GTK2_LIBS@,$GTK2_LIBS,;t t
    82658231s,@GTK2_CFLAGS@,$GTK2_CFLAGS,;t t
    8266 s,@GTK2_LIBS@,$GTK2_LIBS,;t t
    82678232s,@HAVE_GTK2_TRUE@,$HAVE_GTK2_TRUE,;t t
    82688233s,@HAVE_GTK2_FALSE@,$HAVE_GTK2_FALSE,;t t

  • orxonox/branches/images/configure.ac

    r3104 r3105  
    2020AC_PROG_CXX
    2121AC_HEADER_STDC
     22
     23
     24### CHECKING  OPTIONAT ARGUMENTS
     25## GTK-disabled
     26def_gtk=yes
     27AC_MSG_CHECKING([if gtk should be enabled])
     28AC_ARG_ENABLE([gtk],
     29        AC_HELP_STRING( [--disable-gtk],
     30        [Prevents GTK from being loaded]), [def_gtk=no])
     31if test "$def_gtk" = yes; then
     32  echo "yes"
     33fi
     34if test "$def_gtk" = no; then
     35  echo "no"
     36fi
     37### SDL_image-disable
     38def_sdl_image=yes
     39AC_MSG_CHECKING([if SDL_image should be enabled])
     40AC_ARG_ENABLE([sdl_image],
     41        AC_HELP_STRING( [--disabel-sdl-image],
     42        [Prevents SDL_image from being loaded]), [def_sdl_image=no])
     43if test "$def_sdl_image" = yes; then
     44  echo "yes"
     45fi
     46if test "$def_sdl_image" = no; then
     47  echo "no"
     48fi
    2249
    2350### CHECKING FOR SYSTEM ###
    … …  
    99126    fi
    100127
    101 
     128    def_sdl_image=no;
    102129    ;;
    103130
    … …  
    155182     fi   
    156183
     184## check for SDL_Image
     185if test "$def_sdl_image" = "yes"; then
    157186# checking for SDL_image-headers
    158187  AC_CHECK_HEADERS(SDL/SDL_image.h ,,
    159       [AC_MSG_ERROR([cannot find SDL_image headers]) ])
     188      [echo "sdl_image not found. falling back to other options"; def_sdl_image=no ])
     189fi
     190if test "$def_sdl_image" = "yes"; then
    160191# checking for SDL_image-lib
    161192  AC_CHECK_LIB([SDL_image], [main], FOUND_SDL_image=yes)
    … …  
    169200        exit -1
    170201     fi   
     202fi
    171203
    172204## checking for SDL
    … …  
    210242       CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
    211243       LIBS="$LIBS $SDL_LIBS"
     244
     245       def_sdl_image=no;
    212246    ;;
    213247
    … …  
    218252AC_SUBST(MSBITFIELDS)
    219253
    220 ## checking for libjpeg
    221 AC_CHECK_HEADERS(jpeglib.h ,,
     254if test "$def_sdl_image" = "no"; then
     255 ## checking for libjpeg
     256 AC_CHECK_HEADERS(jpeglib.h ,,
    222257        [AC_MSG_ERROR([cannot find jpeg headers]) ])
    223258
    224 AC_CHECK_LIB([jpeg], [main], FOUND_jpeg=yes)
     259 AC_CHECK_LIB([jpeg], [main], FOUND_jpeg=yes)
    225260    if test "$FOUND_jpeg" = "yes" ; then
    226261      LIBS="$LIBS -ljpeg"
    … …  
    234269
    235270
    236 ## checking for libpng
    237 AC_CHECK_HEADERS(png.h ,,
     271 ## checking for libpng
     272 AC_CHECK_HEADERS(png.h ,,
    238273        [AC_MSG_ERROR([cannot find jpeg headers]) ])
    239274
    240 AC_CHECK_LIB([png], [main], FOUND_png=yes)
     275 AC_CHECK_LIB([png], [main], FOUND_png=yes)
    241276    if test "$FOUND_png" = "yes" ; then
    242277      LIBS="$LIBS -lpng"
    … …  
    248283         exit -1
    249284    fi   
    250 
     285fi
    251286
    252287## checking for GTK
    253 PKG_CHECK_MODULES(GTK2, gtk+-2.0 >= 2.0.3 gthread-2.0 >= 2.0.3, have_gtk2=yes, have_gtk2=no)
     288if test "$def_gtk" = yes; then
     289
     290        #PKG_CHECK_MODULES(GTK2, gtk+-2.0 >= 2.0.3 gthread-2.0 >= 2.0.3, have_gtk2=yes, have_gtk2=no)
     291        AC_MSG_CHECKING([for gtk2.0])
     292        if `pkg-config --exists gtk+-2.0`; then
     293                echo "yes"
     294                have_gtk2=yes
     295                GTK2_LIBS=`pkg-config --libs gtk+-2.0`
     296                GTK2_CFLAGS=`pkg-config --cflags gtk+-2.0`
     297                AC_DEFINE_UNQUOTED(HAVE_GTK2, 1, [if we have GTK2])
     298        else
     299                echo "no"
     300        fi
     301
     302fi
    254303AC_SUBST(GTK2_LIBS)
    255304AC_SUBST(GTK2_CFLAGS)
    256 AM_CONDITIONAL(HAVE_GTK2, test "x$have_gtk2" = xyes)
     305AM_CONDITIONAL(HAVE_GTK2, test x$have_gtk2 = xyes)
     306
    257307
    258308
    … …  
    267317 AC_CHECK_LIB([m], [main])
    268318
    269 
     319 
    270320# Checks for header files.
    271321AC_HEADER_STDC

  • orxonox/branches/images/console/Makefile.in

    r3086 r3105  
    121121PACKAGE_VERSION = @PACKAGE_VERSION@
    122122PATH_SEPARATOR = @PATH_SEPARATOR@
    123 PKG_CONFIG = @PKG_CONFIG@
    124123SET_MAKE = @SET_MAKE@
    125124SHELL = @SHELL@

  • orxonox/branches/images/gui/Makefile.in

    r3086 r3105  
    127127PACKAGE_VERSION = @PACKAGE_VERSION@
    128128PATH_SEPARATOR = @PATH_SEPARATOR@
    129 PKG_CONFIG = @PKG_CONFIG@
    130129SET_MAKE = @SET_MAKE@
    131130SHELL = @SHELL@

  • orxonox/branches/images/importer/Makefile.in

    r3063 r3105  
    121121PACKAGE_VERSION = @PACKAGE_VERSION@
    122122PATH_SEPARATOR = @PATH_SEPARATOR@
    123 PKG_CONFIG = @PKG_CONFIG@
    124123SET_MAKE = @SET_MAKE@
    125124SHELL = @SHELL@

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

    r3027 r3105  
    136136PACKAGE_VERSION = @PACKAGE_VERSION@
    137137PATH_SEPARATOR = @PATH_SEPARATOR@
    138 PKG_CONFIG = @PKG_CONFIG@
    139138SET_MAKE = @SET_MAKE@
    140139SHELL = @SHELL@
Note: See TracChangeset for help on using the changeset viewer.