Diff of /trunk/configure

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

revision 37 by harbaum, Fri Jul 31 11:17:08 2009 UTC revision 135 by harbaum, Wed Oct 14 11:26:50 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.7.5.  # 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.7.5'  PACKAGE_VERSION='0.8.12'
578  PACKAGE_STRING='GPXView 0.7.5'  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 661  gtk_LIBS Line 661  gtk_LIBS
661  gnome2_CFLAGS  gnome2_CFLAGS
662  gnome2_LIBS  gnome2_LIBS
663  EXTRA_OBJS  EXTRA_OBJS
664    ICON
665  INSTALL_PLATTFORM  INSTALL_PLATTFORM
666  LIBOBJS  LIBOBJS
667  LTLIBOBJS'  LTLIBOBJS'
# Line 1206  if test "$ac_init_help" = "long"; then Line 1207  if test "$ac_init_help" = "long"; then
1207    # Omit some internal or obsolete options to make the list less imposing.    # Omit some internal or obsolete options to make the list less imposing.
1208    # 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.
1209    cat <<_ACEOF    cat <<_ACEOF
1210  \`configure' configures GPXView 0.7.5 to adapt to many kinds of systems.  \`configure' configures GPXView 0.8.12 to adapt to many kinds of systems.
1211    
1212  Usage: $0 [OPTION]... [VAR=VALUE]...  Usage: $0 [OPTION]... [VAR=VALUE]...
1213    
# Line 1267  fi Line 1268  fi
1268    
1269  if test -n "$ac_init_help"; then  if test -n "$ac_init_help"; then
1270    case $ac_init_help in    case $ac_init_help in
1271       short | recursive ) echo "Configuration of GPXView 0.7.5:";;       short | recursive ) echo "Configuration of GPXView 0.8.12:";;
1272     esac     esac
1273    cat <<\_ACEOF    cat <<\_ACEOF
1274    
# Line 1398  fi Line 1399  fi
1399  test -n "$ac_init_help" && exit $ac_status  test -n "$ac_init_help" && exit $ac_status
1400  if $ac_init_version; then  if $ac_init_version; then
1401    cat <<\_ACEOF    cat <<\_ACEOF
1402  GPXView configure 0.7.5  GPXView configure 0.8.12
1403  generated by GNU Autoconf 2.61  generated by GNU Autoconf 2.61
1404    
1405  Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,  Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
# Line 1412  cat >config.log <<_ACEOF Line 1413  cat >config.log <<_ACEOF
1413  This file contains any messages produced by compilers while  This file contains any messages produced by compilers while
1414  running configure, to aid debugging if configure makes a mistake.  running configure, to aid debugging if configure makes a mistake.
1415    
1416  It was created by GPXView $as_me 0.7.5, which was  It was created by GPXView $as_me 0.8.12, which was
1417  generated by GNU Autoconf 2.61.  Invocation command line was  generated by GNU Autoconf 2.61.  Invocation command line was
1418    
1419    $ $0 $@    $ $0 $@
# Line 3281  else Line 3282  else
3282          { echo "$as_me:$LINENO: result: yes" >&5          { echo "$as_me:$LINENO: result: yes" >&5
3283  echo "${ECHO_T}yes" >&6; }  echo "${ECHO_T}yes" >&6; }
3284    
3285      EXTRA_OBJS="$EXTRA_OBJS converter.o osm-gps-map.o map-tool.o"      EXTRA_OBJS="$EXTRA_OBJS converter.o osm-gps-map.o map-tool.o osm-gps-map-osd-classic.o"
3286      CFLAGS="$CFLAGS $libsoup22_CFLAGS -DLIBSOUP22 -DENABLE_OSM_GPS_MAP"      CFLAGS="$CFLAGS $libsoup22_CFLAGS -DLIBSOUP22 -DENABLE_OSM_GPS_MAP"
3287      LIBS="$LIBS $libsoup22_LIBS"      LIBS="$LIBS $libsoup22_LIBS"
3288    
# Line 3365  else Line 3366  else
3366          { echo "$as_me:$LINENO: result: yes" >&5          { echo "$as_me:$LINENO: result: yes" >&5
3367  echo "${ECHO_T}yes" >&6; }  echo "${ECHO_T}yes" >&6; }
3368    
3369      EXTRA_OBJS="$EXTRA_OBJS converter.o osm-gps-map.o map-tool.o"      EXTRA_OBJS="$EXTRA_OBJS converter.o osm-gps-map.o map-tool.o osm-gps-map-osd-classic.o"
3370      CFLAGS="$CFLAGS $libsoup22_CFLAGS -DLIBSOUP22 -DENABLE_OSM_GPS_MAP"      CFLAGS="$CFLAGS $libsoup22_CFLAGS -DLIBSOUP22 -DENABLE_OSM_GPS_MAP"
3371      LIBS="$LIBS $libsoup22_LIBS"      LIBS="$LIBS $libsoup22_LIBS"
3372    
# Line 3377  else Line 3378  else
3378          { echo "$as_me:$LINENO: result: yes" >&5          { echo "$as_me:$LINENO: result: yes" >&5
3379  echo "${ECHO_T}yes" >&6; }  echo "${ECHO_T}yes" >&6; }
3380    
3381    EXTRA_OBJS="$EXTRA_OBJS converter.o osm-gps-map.o map-tool.o"    EXTRA_OBJS="$EXTRA_OBJS converter.o osm-gps-map.o map-tool.o osm-gps-map-osd-classic.o"
3382    CFLAGS="$CFLAGS $libsoup24_CFLAGS -DENABLE_OSM_GPS_MAP"    CFLAGS="$CFLAGS $libsoup24_CFLAGS -DENABLE_OSM_GPS_MAP"
3383    LIBS="$LIBS $libsoup24_LIBS"    LIBS="$LIBS $libsoup24_LIBS"
3384    
# Line 4322  echo "$as_me: error: maemo-version not f Line 4323  echo "$as_me: error: maemo-version not f
4323    
4324  fi  fi
4325    
4326      INSTALL_PLATTFORM="install-maemo"
4327    
4328      # fremantle uses icons of 48x48 pixels for the app installer,
4329      # older versions used 26x26
4330      if [ "$MAJOR" == "5" ]; then
4331         ICONNAME=gpxview.48.png
4332         datarootdir=/opt
4333      else
4334         ICONNAME=gpxview.26.png
4335         { echo "$as_me:$LINENO: Enabling Maemo Mapper support" >&5
4336    echo "$as_me: Enabling Maemo Mapper support" >&6;}
4337         CFLAGS="$CFLAGS -DENABLE_MAEMO_MAPPER"
4338         EXTRA_OBJS="$EXTRA_OBJS mm_poi.o"
4339      fi
4340    
4341    # maemo uses dbus for ipc with maemo mapper    # maemo uses dbus for ipc with maemo mapper
4342    EXTRA_OBJS="$EXTRA_OBJS mm_poi.o dbus.o"    EXTRA_OBJS="$EXTRA_OBJS dbus.o"
4343    
4344    INSTALL_PLATTFORM="install-maemo"    { echo "$as_me:$LINENO: Using application installer icon \"$ICONNAME\"" >&5
4345    echo "$as_me: Using application installer icon \"$ICONNAME\"" >&6;}
4346    
4347      # add icon entry to debian/control
4348      ICON=" Maemo icon $ICONNAME
4349    XB-Maemo-Icon-26:
4350    "
4351    
4352      # generate base64 icon, remove first and last line
4353      # and add a space before each line
4354      ICON="$ICON`uuencode -m data/$ICONNAME $ICONNAME | sed '1d;$d;s/^/ /' -`"
4355    
4356    
4357  else  else
# Line 4333  else Line 4359  else
4359    { echo "$as_me:$LINENO: result: no" >&5    { echo "$as_me:$LINENO: result: no" >&5
4360  echo "${ECHO_T}no" >&6; }  echo "${ECHO_T}no" >&6; }
4361    
4362      EXTRA_OBJS="$EXTRA_OBJS bct.o"
4363      CFLAGS="$CFLAGS -DBCT"
4364    
4365    # check for gtk+-2.0    # check for gtk+-2.0
4366    
4367  pkg_failed=no  pkg_failed=no
# Line 4493  fi Line 4522  fi
4522    
4523    INSTALL_PLATTFORM="install-debian"    INSTALL_PLATTFORM="install-debian"
4524    
4525      ICON=" No icon"
4526    
4527  fi  fi
4528    
4529    
4530    
4531  ac_config_files="$ac_config_files Makefile src/Makefile data/Makefile"  
4532    ac_config_files="$ac_config_files Makefile src/Makefile data/Makefile debian/control"
4533    
4534    
4535  cat >confcache <<\_ACEOF  cat >confcache <<\_ACEOF
# Line 4926  exec 6>&1 Line 4958  exec 6>&1
4958  # report actual input values of CONFIG_FILES etc. instead of their  # report actual input values of CONFIG_FILES etc. instead of their
4959  # values after options handling.  # values after options handling.
4960  ac_log="  ac_log="
4961  This file was extended by GPXView $as_me 0.7.5, which was  This file was extended by GPXView $as_me 0.8.12, which was
4962  generated by GNU Autoconf 2.61.  Invocation command line was  generated by GNU Autoconf 2.61.  Invocation command line was
4963    
4964    CONFIG_FILES    = $CONFIG_FILES    CONFIG_FILES    = $CONFIG_FILES
# Line 4969  Report bugs to <bug-autoconf@gnu.org>." Line 5001  Report bugs to <bug-autoconf@gnu.org>."
5001  _ACEOF  _ACEOF
5002  cat >>$CONFIG_STATUS <<_ACEOF  cat >>$CONFIG_STATUS <<_ACEOF
5003  ac_cs_version="\\  ac_cs_version="\\
5004  GPXView config.status 0.7.5  GPXView config.status 0.8.12
5005  configured by $0, generated by GNU Autoconf 2.61,  configured by $0, generated by GNU Autoconf 2.61,
5006    with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"    with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
5007    
# Line 5071  do Line 5103  do
5103      "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;      "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
5104      "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;      "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
5105      "data/Makefile") CONFIG_FILES="$CONFIG_FILES data/Makefile" ;;      "data/Makefile") CONFIG_FILES="$CONFIG_FILES data/Makefile" ;;
5106        "debian/control") CONFIG_FILES="$CONFIG_FILES debian/control" ;;
5107    
5108    *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5    *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
5109  echo "$as_me: error: invalid argument: $ac_config_target" >&2;}  echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
# Line 5213  gtk_LIBS!$gtk_LIBS$ac_delim Line 5246  gtk_LIBS!$gtk_LIBS$ac_delim
5246  gnome2_CFLAGS!$gnome2_CFLAGS$ac_delim  gnome2_CFLAGS!$gnome2_CFLAGS$ac_delim
5247  gnome2_LIBS!$gnome2_LIBS$ac_delim  gnome2_LIBS!$gnome2_LIBS$ac_delim
5248  EXTRA_OBJS!$EXTRA_OBJS$ac_delim  EXTRA_OBJS!$EXTRA_OBJS$ac_delim
5249    ICON!$ICON$ac_delim
5250  INSTALL_PLATTFORM!$INSTALL_PLATTFORM$ac_delim  INSTALL_PLATTFORM!$INSTALL_PLATTFORM$ac_delim
5251  LIBOBJS!$LIBOBJS$ac_delim  LIBOBJS!$LIBOBJS$ac_delim
5252  LTLIBOBJS!$LTLIBOBJS$ac_delim  LTLIBOBJS!$LTLIBOBJS$ac_delim
5253  _ACEOF  _ACEOF
5254    
5255    if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 85; then    if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 86; then
5256      break      break
5257    elif $ac_last_try; then    elif $ac_last_try; then
5258      { { 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.37  
changed lines
  Added in v.135