Diff of /trunk/configure.in

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

revision 126 by harbaum, Mon Sep 28 19:01:03 2009 UTC revision 154 by harbaum, Tue Nov 3 07:36:35 2009 UTC
# Line 21  Line 21 
21  # along with GPXView.  If not, see <http://www.gnu.org/licenses/>.  # along with GPXView.  If not, see <http://www.gnu.org/licenses/>.
22    
23  AC_PREREQ(2.61)  AC_PREREQ(2.61)
24  AC_INIT([GPXView],[0.8.10],[till@harbaum.org])  AC_INIT([GPXView],[0.8.12],[till@harbaum.org])
25  AC_CONFIG_SRCDIR([src/main.c])  AC_CONFIG_SRCDIR([src/main.c])
26  # AC_CONFIG_HEADER([src/config.h])  # AC_CONFIG_HEADER([src/config.h])
27    
# Line 150  PKG_CHECK_EXISTS(maemo-version, [ Line 150  PKG_CHECK_EXISTS(maemo-version, [
150      CFLAGS="$CFLAGS -DMAEMO_VERSION=\\\"$VERSION\\\""      CFLAGS="$CFLAGS -DMAEMO_VERSION=\\\"$VERSION\\\""
151      MAJOR=`echo $VERSION | cut -b1 -`      MAJOR=`echo $VERSION | cut -b1 -`
152      CFLAGS="$CFLAGS -DMAEMO_VERSION_MAJOR=$MAJOR"      CFLAGS="$CFLAGS -DMAEMO_VERSION_MAJOR=$MAJOR"
153    
154        MAEMO_VERSION_MAJOR=$MAJOR
155        AC_SUBST(MAEMO_VERSION_MAJOR)
156    ], [    ], [
157      AC_MSG_ERROR([maemo-version not found])      AC_MSG_ERROR([maemo-version not found])
158    ])    ])
# Line 160  PKG_CHECK_EXISTS(maemo-version, [ Line 163  PKG_CHECK_EXISTS(maemo-version, [
163    # older versions used 26x26    # older versions used 26x26
164    if [[ "$MAJOR" == "5" ]]; then    if [[ "$MAJOR" == "5" ]]; then
165       ICONNAME=gpxview.48.png       ICONNAME=gpxview.48.png
166         datarootdir=/opt
167    else    else
168       ICONNAME=gpxview.26.png       ICONNAME=gpxview.26.png
169       AC_MSG_NOTICE([Enabling Maemo Mapper support])       AC_MSG_NOTICE([Enabling Maemo Mapper support])
# Line 185  XB-Maemo-Icon-26: Line 189  XB-Maemo-Icon-26:
189    AC_MSG_RESULT(no)    AC_MSG_RESULT(no)
190    
191    EXTRA_OBJS="$EXTRA_OBJS bct.o"    EXTRA_OBJS="$EXTRA_OBJS bct.o"
192      CFLAGS="$CFLAGS -DBCT"
193    
194    # check for gtk+-2.0    # check for gtk+-2.0
195    PKG_CHECK_MODULES([gtk], [gtk+-2.0], [], [AC_MSG_ERROR([gtk+-2.0 missing!])])    PKG_CHECK_MODULES([gtk], [gtk+-2.0], [], [AC_MSG_ERROR([gtk+-2.0 missing!])])
Legend:
Removed from v.126  
changed lines
  Added in v.154