Diff of /trunk/configure

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 117 by harbaum, Thu Sep 17 07:33:13 2009 UTC revision 154 by harbaum, Tue Nov 3 07:36:35 2009 UTC
# Line 1  Line 1 
1  #! /bin/sh  #! /bin/sh
2  # Guess values for system-dependent variables and create Makefiles.  # Guess values for system-dependent variables and create Makefiles.
3  # Generated by GNU Autoconf 2.61 for GPXView 0.8.10.  # Generated by GNU Autoconf 2.61 for GPXView 0.8.12.
4  #  #
5  # Report bugs to <till@harbaum.org>.  # Report bugs to <till@harbaum.org>.
6  #  #
# Line 574  SHELL=${CONFIG_SHELL-/bin/sh} Line 574  SHELL=${CONFIG_SHELL-/bin/sh}
574  # Identity of this package.  # Identity of this package.
575  PACKAGE_NAME='GPXView'  PACKAGE_NAME='GPXView'
576  PACKAGE_TARNAME='gpxview'  PACKAGE_TARNAME='gpxview'
577  PACKAGE_VERSION='0.8.10'  PACKAGE_VERSION='0.8.12'
578  PACKAGE_STRING='GPXView 0.8.10'  PACKAGE_STRING='GPXView 0.8.12'
579  PACKAGE_BUGREPORT='till@harbaum.org'  PACKAGE_BUGREPORT='till@harbaum.org'
580    
581  ac_unique_file="src/main.c"  ac_unique_file="src/main.c"
# Line 656  gpsbt_CFLAGS Line 656  gpsbt_CFLAGS
656  gpsbt_LIBS  gpsbt_LIBS
657  liblocation_CFLAGS  liblocation_CFLAGS
658  liblocation_LIBS  liblocation_LIBS
659    MAEMO_VERSION_MAJOR
660  gtk_CFLAGS  gtk_CFLAGS
661  gtk_LIBS  gtk_LIBS
662  gnome2_CFLAGS  gnome2_CFLAGS
# Line 1207  if test "$ac_init_help" = "long"; then Line 1208  if test "$ac_init_help" = "long"; then
1208    # Omit some internal or obsolete options to make the list less imposing.    # Omit some internal or obsolete options to make the list less imposing.
1209    # This message is too long to be a string in the A/UX 3.1 sh.    # This message is too long to be a string in the A/UX 3.1 sh.
1210    cat <<_ACEOF    cat <<_ACEOF
1211  \`configure' configures GPXView 0.8.10 to adapt to many kinds of systems.  \`configure' configures GPXView 0.8.12 to adapt to many kinds of systems.
1212    
1213  Usage: $0 [OPTION]... [VAR=VALUE]...  Usage: $0 [OPTION]... [VAR=VALUE]...
1214    
# Line 1268  fi Line 1269  fi
1269    
1270  if test -n "$ac_init_help"; then  if test -n "$ac_init_help"; then
1271    case $ac_init_help in    case $ac_init_help in
1272       short | recursive ) echo "Configuration of GPXView 0.8.10:";;       short | recursive ) echo "Configuration of GPXView 0.8.12:";;
1273     esac     esac
1274    cat <<\_ACEOF    cat <<\_ACEOF
1275    
# Line 1399  fi Line 1400  fi
1400  test -n "$ac_init_help" && exit $ac_status  test -n "$ac_init_help" && exit $ac_status
1401  if $ac_init_version; then  if $ac_init_version; then
1402    cat <<\_ACEOF    cat <<\_ACEOF
1403  GPXView configure 0.8.10  GPXView configure 0.8.12
1404  generated by GNU Autoconf 2.61  generated by GNU Autoconf 2.61
1405    
1406  Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,  Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
# Line 1413  cat >config.log <<_ACEOF Line 1414  cat >config.log <<_ACEOF
1414  This file contains any messages produced by compilers while  This file contains any messages produced by compilers while
1415  running configure, to aid debugging if configure makes a mistake.  running configure, to aid debugging if configure makes a mistake.
1416    
1417  It was created by GPXView $as_me 0.8.10, which was  It was created by GPXView $as_me 0.8.12, which was
1418  generated by GNU Autoconf 2.61.  Invocation command line was  generated by GNU Autoconf 2.61.  Invocation command line was
1419    
1420    $ $0 $@    $ $0 $@
# Line 4315  echo "$as_me: Configuring for Maemo $VER Line 4316  echo "$as_me: Configuring for Maemo $VER
4316      MAJOR=`echo $VERSION | cut -b1 -`      MAJOR=`echo $VERSION | cut -b1 -`
4317      CFLAGS="$CFLAGS -DMAEMO_VERSION_MAJOR=$MAJOR"      CFLAGS="$CFLAGS -DMAEMO_VERSION_MAJOR=$MAJOR"
4318    
4319        MAEMO_VERSION_MAJOR=$MAJOR
4320    
4321    
4322  else  else
4323    
4324      { { echo "$as_me:$LINENO: error: maemo-version not found" >&5      { { echo "$as_me:$LINENO: error: maemo-version not found" >&5
# Line 4323  echo "$as_me: error: maemo-version not f Line 4327  echo "$as_me: error: maemo-version not f
4327    
4328  fi  fi
4329    
   # maemo uses dbus for ipc with maemo mapper  
   EXTRA_OBJS="$EXTRA_OBJS mm_poi.o dbus.o"  
   
4330    INSTALL_PLATTFORM="install-maemo"    INSTALL_PLATTFORM="install-maemo"
4331    
4332    # fremantle uses icons of 48x48 pixels for the app installer    # fremantle uses icons of 48x48 pixels for the app installer,
4333      # older versions used 26x26
4334    if [ "$MAJOR" == "5" ]; then    if [ "$MAJOR" == "5" ]; then
4335       ICONNAME=gpxview.48.png       ICONNAME=gpxview.48.png
4336         datarootdir=/opt
4337    else    else
4338       ICONNAME=gpxview.26.png       ICONNAME=gpxview.26.png
4339         { echo "$as_me:$LINENO: Enabling Maemo Mapper support" >&5
4340    echo "$as_me: Enabling Maemo Mapper support" >&6;}
4341         CFLAGS="$CFLAGS -DENABLE_MAEMO_MAPPER"
4342         EXTRA_OBJS="$EXTRA_OBJS mm_poi.o"
4343    fi    fi
4344    
4345      # maemo uses dbus for ipc with maemo mapper
4346      EXTRA_OBJS="$EXTRA_OBJS dbus.o"
4347    
4348    { echo "$as_me:$LINENO: Using application installer icon \"$ICONNAME\"" >&5    { echo "$as_me:$LINENO: Using application installer icon \"$ICONNAME\"" >&5
4349  echo "$as_me: Using application installer icon \"$ICONNAME\"" >&6;}  echo "$as_me: Using application installer icon \"$ICONNAME\"" >&6;}
4350    
# Line 4353  else Line 4363  else
4363    { echo "$as_me:$LINENO: result: no" >&5    { echo "$as_me:$LINENO: result: no" >&5
4364  echo "${ECHO_T}no" >&6; }  echo "${ECHO_T}no" >&6; }
4365    
4366      EXTRA_OBJS="$EXTRA_OBJS bct.o"
4367      CFLAGS="$CFLAGS -DBCT"
4368    
4369    # check for gtk+-2.0    # check for gtk+-2.0
4370    
4371  pkg_failed=no  pkg_failed=no
# Line 4949  exec 6>&1 Line 4962  exec 6>&1
4962  # report actual input values of CONFIG_FILES etc. instead of their  # report actual input values of CONFIG_FILES etc. instead of their
4963  # values after options handling.  # values after options handling.
4964  ac_log="  ac_log="
4965  This file was extended by GPXView $as_me 0.8.10, which was  This file was extended by GPXView $as_me 0.8.12, which was
4966  generated by GNU Autoconf 2.61.  Invocation command line was  generated by GNU Autoconf 2.61.  Invocation command line was
4967    
4968    CONFIG_FILES    = $CONFIG_FILES    CONFIG_FILES    = $CONFIG_FILES
# Line 4992  Report bugs to <bug-autoconf@gnu.org>." Line 5005  Report bugs to <bug-autoconf@gnu.org>."
5005  _ACEOF  _ACEOF
5006  cat >>$CONFIG_STATUS <<_ACEOF  cat >>$CONFIG_STATUS <<_ACEOF
5007  ac_cs_version="\\  ac_cs_version="\\
5008  GPXView config.status 0.8.10  GPXView config.status 0.8.12
5009  configured by $0, generated by GNU Autoconf 2.61,  configured by $0, generated by GNU Autoconf 2.61,
5010    with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"    with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
5011    
# Line 5232  gpsbt_CFLAGS!$gpsbt_CFLAGS$ac_delim Line 5245  gpsbt_CFLAGS!$gpsbt_CFLAGS$ac_delim
5245  gpsbt_LIBS!$gpsbt_LIBS$ac_delim  gpsbt_LIBS!$gpsbt_LIBS$ac_delim
5246  liblocation_CFLAGS!$liblocation_CFLAGS$ac_delim  liblocation_CFLAGS!$liblocation_CFLAGS$ac_delim
5247  liblocation_LIBS!$liblocation_LIBS$ac_delim  liblocation_LIBS!$liblocation_LIBS$ac_delim
5248    MAEMO_VERSION_MAJOR!$MAEMO_VERSION_MAJOR$ac_delim
5249  gtk_CFLAGS!$gtk_CFLAGS$ac_delim  gtk_CFLAGS!$gtk_CFLAGS$ac_delim
5250  gtk_LIBS!$gtk_LIBS$ac_delim  gtk_LIBS!$gtk_LIBS$ac_delim
5251  gnome2_CFLAGS!$gnome2_CFLAGS$ac_delim  gnome2_CFLAGS!$gnome2_CFLAGS$ac_delim
# Line 5243  LIBOBJS!$LIBOBJS$ac_delim Line 5257  LIBOBJS!$LIBOBJS$ac_delim
5257  LTLIBOBJS!$LTLIBOBJS$ac_delim  LTLIBOBJS!$LTLIBOBJS$ac_delim
5258  _ACEOF  _ACEOF
5259    
5260    if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 86; then    if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 87; then
5261      break      break
5262    elif $ac_last_try; then    elif $ac_last_try; then
5263      { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5      { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
Legend:
Removed from v.117  
changed lines
  Added in v.154