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 135 by harbaum, Wed Oct 14 11:26:50 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 154  PKG_CHECK_EXISTS(maemo-version, [ Line 154  PKG_CHECK_EXISTS(maemo-version, [
154      AC_MSG_ERROR([maemo-version not found])      AC_MSG_ERROR([maemo-version not found])
155    ])    ])
156    
   # maemo uses dbus for ipc with maemo mapper  
   EXTRA_OBJS="$EXTRA_OBJS mm_poi.o dbus.o"  
   
157    INSTALL_PLATTFORM="install-maemo"    INSTALL_PLATTFORM="install-maemo"
158    
159    # fremantle uses icons of 48x48 pixels for the app installer,    # fremantle uses icons of 48x48 pixels for the app installer,
160    # older versions used 26x26    # older versions used 26x26
161    if [[ "$MAJOR" == "5" ]]; then    if [[ "$MAJOR" == "5" ]]; then
162       ICONNAME=gpxview.48.png       ICONNAME=gpxview.48.png
163         datarootdir=/opt
164    else    else
165       ICONNAME=gpxview.26.png       ICONNAME=gpxview.26.png
166         AC_MSG_NOTICE([Enabling Maemo Mapper support])
167         CFLAGS="$CFLAGS -DENABLE_MAEMO_MAPPER"
168         EXTRA_OBJS="$EXTRA_OBJS mm_poi.o"
169    fi    fi
170    
171      # maemo uses dbus for ipc with maemo mapper
172      EXTRA_OBJS="$EXTRA_OBJS dbus.o"
173    
174    AC_MSG_NOTICE([Using application installer icon "$ICONNAME"])    AC_MSG_NOTICE([Using application installer icon "$ICONNAME"])
175    
176    # add icon entry to debian/control    # add icon entry to debian/control
# Line 181  XB-Maemo-Icon-26: Line 185  XB-Maemo-Icon-26:
185  ], [  ], [
186    AC_MSG_RESULT(no)    AC_MSG_RESULT(no)
187    
188      EXTRA_OBJS="$EXTRA_OBJS bct.o"
189      CFLAGS="$CFLAGS -DBCT"
190    
191    # check for gtk+-2.0    # check for gtk+-2.0
192    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!])])
193    CFLAGS="$CFLAGS $gtk_CFLAGS"    CFLAGS="$CFLAGS $gtk_CFLAGS"
Legend:
Removed from v.118  
changed lines
  Added in v.135