Diff of /trunk/configure.in

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

revision 118 by harbaum, Thu Sep 17 18:50:24 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.9],[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    ])    ])
159    
   # maemo uses dbus for ipc with maemo mapper  
   EXTRA_OBJS="$EXTRA_OBJS mm_poi.o dbus.o"  
   
160    INSTALL_PLATTFORM="install-maemo"    INSTALL_PLATTFORM="install-maemo"
161    
162    # fremantle uses icons of 48x48 pixels for the app installer,    # fremantle uses icons of 48x48 pixels for the app installer,
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])
170         CFLAGS="$CFLAGS -DENABLE_MAEMO_MAPPER"
171         EXTRA_OBJS="$EXTRA_OBJS mm_poi.o"
172    fi    fi
173    
174      # maemo uses dbus for ipc with maemo mapper
175      EXTRA_OBJS="$EXTRA_OBJS dbus.o"
176    
177    AC_MSG_NOTICE([Using application installer icon "$ICONNAME"])    AC_MSG_NOTICE([Using application installer icon "$ICONNAME"])
178    
179    # add icon entry to debian/control    # add icon entry to debian/control
# Line 181  XB-Maemo-Icon-26: Line 188  XB-Maemo-Icon-26:
188  ], [  ], [
189    AC_MSG_RESULT(no)    AC_MSG_RESULT(no)
190    
191      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!])])
196    CFLAGS="$CFLAGS $gtk_CFLAGS"    CFLAGS="$CFLAGS $gtk_CFLAGS"
Legend:
Removed from v.118  
changed lines
  Added in v.154