Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 4130 in orxonox.OLD for orxonox


Ignore:
Timestamp:
May 9, 2005, 7:43:27 PM (20 years ago)
Author:
bensch
Message:

orxonox/trunk: configure now nicer for GTK

Location:
orxonox/trunk
Files:
12 edited

Legend:

Unmodified
Added
Removed

  • orxonox/trunk/Makefile.in

    r4061 r4130  
    129129PACKAGE_VERSION = @PACKAGE_VERSION@
    130130PATH_SEPARATOR = @PATH_SEPARATOR@
     131PKG_CONFIG = @PKG_CONFIG@
    131132RANLIB = @RANLIB@
    132133SET_MAKE = @SET_MAKE@

  • orxonox/trunk/configure

    r4061 r4130  
    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 RANLIB ac_ct_RANLIB CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP DEBUG SUB_PROJECTS_TRUE SUB_PROJECTS_FALSE DOCUMENTATION_TRUE DOCUMENTATION_FALSE DOXYGEN DOXYGEN_TRUE DOXYGEN_FALSE GPROF MSBITFIELDS GTK2_LIBS GTK2_CFLAGS HAVE_GTK2_TRUE HAVE_GTK2_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 RANLIB ac_ct_RANLIB CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP DEBUG SUB_PROJECTS_TRUE SUB_PROJECTS_FALSE DOCUMENTATION_TRUE DOCUMENTATION_FALSE DOXYGEN DOXYGEN_TRUE DOXYGEN_FALSE GPROF PKG_CONFIG MSBITFIELDS GTK2_LIBS GTK2_CFLAGS HAVE_GTK2_TRUE HAVE_GTK2_FALSE CURL_LIBS CURL_CFLAGS HAVE_CURL_TRUE HAVE_CURL_FALSE LIBOBJS LTLIBOBJS'
    315315ac_subst_files=''
    316316
    … …  
    42164216
    42174217
     4218#-------------------------#
     4219# checking for pkg-config #
     4220#-------------------------#
     4221if test x$def_gtk = xyes; then
     4222 # Extract the first word of "pkg-config", so it can be a program name with args.
     4223set dummy pkg-config; ac_word=$2
     4224echo "$as_me:$LINENO: checking for $ac_word" >&5
     4225echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
     4226if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
     4227  echo $ECHO_N "(cached) $ECHO_C" >&6
     4228else
     4229  case $PKG_CONFIG in
     4230  [\\/]* | ?:[\\/]*)
     4231  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
     4232  ;;
     4233  *)
     4234  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
     4235for as_dir in $PATH
     4236do
     4237  IFS=$as_save_IFS
     4238  test -z "$as_dir" && as_dir=.
     4239  for ac_exec_ext in '' $ac_executable_extensions; do
     4240  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     4241    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
     4242    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     4243    break 2
     4244  fi
     4245done
     4246done
     4247
     4248  ;;
     4249esac
     4250fi
     4251PKG_CONFIG=$ac_cv_path_PKG_CONFIG
     4252
     4253if test -n "$PKG_CONFIG"; then
     4254  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
     4255echo "${ECHO_T}$PKG_CONFIG" >&6
     4256else
     4257  echo "$as_me:$LINENO: result: no" >&5
     4258echo "${ECHO_T}no" >&6
     4259fi
     4260
     4261fi
     4262
     4263
    42184264#########################
    42194265## CHECKING FOR SYSTEM ##
    … …  
    66746720#-----#
    66756721if test x$def_gtk = xyes; then
    6676 
    66776722        #PKG_CHECK_MODULES(GTK2, gtk+-2.0 >= 2.0.3 gthread-2.0 >= 2.0.3, have_gtk2=yes, have_gtk2=no)
    66786723        echo "$as_me:$LINENO: checking for gtk2.0" >&5
    66796724echo $ECHO_N "checking for gtk2.0... $ECHO_C" >&6
    6680         if `pkg-config --exists gtk+-2.0`; then
     6725        if `$PKG_CONFIG --exists gtk+-2.0`; then
    66816726                echo "yes"
    66826727                have_gtk2=yes
    6683                 GTK2_LIBS=`pkg-config --libs gtk+-2.0`
    6684                 GTK2_CFLAGS=`pkg-config --cflags gtk+-2.0`
     6728                GTK2_LIBS=`$PKG_CONFIG --libs gtk+-2.0`
     6729                GTK2_CFLAGS=`$PKG_CONFIG --cflags gtk+-2.0`
    66856730
    66866731cat >>confdefs.h <<_ACEOF
    … …  
    66886733_ACEOF
    66896734
     6735                if test $DEBUG -ge 3; then
     6736                 echo "cflags: $GTK2_CFLAGS"
     6737                 echo "libs: $GTK2_LIBS"
     6738                fi
    66906739        else
    66916740                echo "no"
    … …  
    86718720s,@DOXYGEN_FALSE@,$DOXYGEN_FALSE,;t t
    86728721s,@GPROF@,$GPROF,;t t
     8722s,@PKG_CONFIG@,$PKG_CONFIG,;t t
    86738723s,@MSBITFIELDS@,$MSBITFIELDS,;t t
    86748724s,@GTK2_LIBS@,$GTK2_LIBS,;t t

  • orxonox/trunk/configure.ac

    r4061 r4130  
    192192AC_PATH_PROG(GPROF, gprof)
    193193
     194#-------------------------#
     195# checking for pkg-config #
     196#-------------------------#
     197if test x$def_gtk = xyes; then
     198 AC_PATH_PROG(PKG_CONFIG, pkg-config)
     199fi
     200
     201
    194202#########################
    195203## CHECKING FOR SYSTEM ##
    … …  
    435443#-----#
    436444if test x$def_gtk = xyes; then
    437 
    438445        #PKG_CHECK_MODULES(GTK2, gtk+-2.0 >= 2.0.3 gthread-2.0 >= 2.0.3, have_gtk2=yes, have_gtk2=no)
    439446        AC_MSG_CHECKING([for gtk2.0])
    440         if `pkg-config --exists gtk+-2.0`; then
     447        if `$PKG_CONFIG --exists gtk+-2.0`; then
    441448                echo "yes"
    442449                have_gtk2=yes
    443                 GTK2_LIBS=`pkg-config --libs gtk+-2.0`
    444                 GTK2_CFLAGS=`pkg-config --cflags gtk+-2.0`
     450                GTK2_LIBS=`$PKG_CONFIG --libs gtk+-2.0`
     451                GTK2_CFLAGS=`$PKG_CONFIG --cflags gtk+-2.0`
    445452                AC_DEFINE_UNQUOTED(HAVE_GTK2, 1, [if we have GTK2])
     453                if test $DEBUG -ge 3; then
     454                 echo "cflags: $GTK2_CFLAGS"
     455                 echo "libs: $GTK2_LIBS"
     456                fi
    446457        else
    447458                echo "no"

  • orxonox/trunk/src/Makefile.in

    r4091 r4130  
    219219PACKAGE_VERSION = @PACKAGE_VERSION@
    220220PATH_SEPARATOR = @PATH_SEPARATOR@
     221PKG_CONFIG = @PKG_CONFIG@
    221222RANLIB = @RANLIB@
    222223SET_MAKE = @SET_MAKE@

  • orxonox/trunk/src/lib/Makefile.in

    r4061 r4130  
    113113PACKAGE_VERSION = @PACKAGE_VERSION@
    114114PATH_SEPARATOR = @PATH_SEPARATOR@
     115PKG_CONFIG = @PKG_CONFIG@
    115116RANLIB = @RANLIB@
    116117SET_MAKE = @SET_MAKE@

  • orxonox/trunk/src/lib/graphics/Makefile.in

    r4061 r4130  
    113113PACKAGE_VERSION = @PACKAGE_VERSION@
    114114PATH_SEPARATOR = @PATH_SEPARATOR@
     115PKG_CONFIG = @PKG_CONFIG@
    115116RANLIB = @RANLIB@
    116117SET_MAKE = @SET_MAKE@

  • orxonox/trunk/src/lib/graphics/importer/Makefile.in

    r4061 r4130  
    143143PACKAGE_VERSION = @PACKAGE_VERSION@
    144144PATH_SEPARATOR = @PATH_SEPARATOR@
     145PKG_CONFIG = @PKG_CONFIG@
    145146RANLIB = @RANLIB@
    146147SET_MAKE = @SET_MAKE@

  • orxonox/trunk/src/lib/gui/Makefile.in

    r4061 r4130  
    113113PACKAGE_VERSION = @PACKAGE_VERSION@
    114114PATH_SEPARATOR = @PATH_SEPARATOR@
     115PKG_CONFIG = @PKG_CONFIG@
    115116RANLIB = @RANLIB@
    116117SET_MAKE = @SET_MAKE@

  • orxonox/trunk/src/lib/gui/console/Makefile.in

    r4061 r4130  
    132132PACKAGE_VERSION = @PACKAGE_VERSION@
    133133PATH_SEPARATOR = @PATH_SEPARATOR@
     134PKG_CONFIG = @PKG_CONFIG@
    134135RANLIB = @RANLIB@
    135136SET_MAKE = @SET_MAKE@

  • orxonox/trunk/src/lib/gui/gui/Makefile.in

    r4120 r4130  
    150150PACKAGE_VERSION = @PACKAGE_VERSION@
    151151PATH_SEPARATOR = @PATH_SEPARATOR@
     152PKG_CONFIG = @PKG_CONFIG@
    152153RANLIB = @RANLIB@
    153154SET_MAKE = @SET_MAKE@

  • orxonox/trunk/src/subprojects/Makefile.in

    r4061 r4130  
    113113PACKAGE_VERSION = @PACKAGE_VERSION@
    114114PATH_SEPARATOR = @PATH_SEPARATOR@
     115PKG_CONFIG = @PKG_CONFIG@
    115116RANLIB = @RANLIB@
    116117SET_MAKE = @SET_MAKE@

  • orxonox/trunk/src/subprojects/testmain/Makefile.in

    r4061 r4130  
    128128PACKAGE_VERSION = @PACKAGE_VERSION@
    129129PATH_SEPARATOR = @PATH_SEPARATOR@
     130PKG_CONFIG = @PKG_CONFIG@
    130131RANLIB = @RANLIB@
    131132SET_MAKE = @SET_MAKE@
Note: See TracChangeset for help on using the changeset viewer.