Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 275067 | Differences between
and this patch

Collapse All | Expand All

(-)a/configure.ac (-38 / +139 lines)
Lines 55-89 AC_DEFINE_UNQUOTED(DBUS_SERVICES_DIR, "$DBUS_SERVICES_DIR", [Where services dir Link Here
55
55
56
CFLAGS="$CFLAGS -g -Wall -Werror -Wno-format"
56
CFLAGS="$CFLAGS -g -Wall -Werror -Wno-format"
57
57
58
# -----------------------------------------------------------
59
# gtk+
60
# -----------------------------------------------------------
61
AC_ARG_ENABLE(gtk,
62
              AS_HELP_STRING([--enable-gtk=@<:@no/yes/auto@:>@],
63
                             [build with gtk support]), ,
64
                             enable_gtk=auto)
58
65
66
if test "x$enable_gtk" != "xno"; then
67
   PKG_CHECK_MODULES(GTK,
68
   [
69
      gtk+-2.0
70
   ], have_gtk="yes", have_gtk="no")
59
71
60
PKG_CHECK_MODULES(GTK, [
72
   if test "x$have_gtk" = "xyes"; then
61
		  gtk+-2.0
73
      AC_DEFINE(HAVE_GTK, 1, [Define if you have gtk+])
62
], HAVE_GTK=yes, HAVE_GTK=no)
74
   fi
63
AM_CONDITIONAL(HAVE_GTK, test "x$HAVE_GTK" = "xyes")
75
else
76
   have_gtk=no
77
fi
78
79
if test "x$enable_gtk" = "xyes" -a "x$have_gtk" != "xyes"; then
80
   AC_MSG_ERROR([Couldn't find gtk dependencies.])
81
fi
82
83
AM_CONDITIONAL(HAVE_GTK, test "x$have_gtk" = "xyes")
64
AC_SUBST(GTK_LIBS)
84
AC_SUBST(GTK_LIBS)
65
AC_SUBST(GTK_CFLAGS)
85
AC_SUBST(GTK_CFLAGS)
66
86
87
# -----------------------------------------------------------
88
# connectivity
89
# -----------------------------------------------------------
90
67
CONNECTIVITY="None"
91
CONNECTIVITY="None"
68
92
69
PKG_CHECK_MODULES(CONIC, [
93
AC_ARG_ENABLE(conic,
70
		  conic
94
              AS_HELP_STRING([--enable-conic=@<:@no/yes/auto@:>@],
71
], HAVE_CONIC=yes, HAVE_CONIC=no)
95
                             [build with conic support]), ,
72
if test "x$HAVE_CONIC" = "xyes"; then
96
                             enable_conic=auto)
73
	CONNECTIVITY="Maemo LibConIC"
97
74
	CONNECTIVITY_LIBS=${CONIC_LIBS}
98
if test "x$enable_conic" != "xno"; then
75
	CONNECTIVITY_CFLAGS=${CONIC_CFLAGS}
99
   PKG_CHECK_MODULES(CONIC,
76
	AC_DEFINE(HAVE_CONIC, 1, [define if libconic is installed])
100
   [
101
      conic
102
   ], have_conic="yes", have_conic="no")
103
104
   if test "x$have_conic" = "xyes"; then
105
      CONNECTIVITY="Maemo LibConIC"
106
      CONNECTIVITY_LIBS=${CONIC_LIBS}
107
      CONNECTIVITY_CFLAGS=${CONIC_CFLAGS}
108
      AC_DEFINE(HAVE_CONIC, 1, [define if libconic is installed])
109
   fi
110
else
111
   have_conic=no
112
fi
113
114
if test "x$enable_conic" = "xyes" -a "x$have_conic" != "xyes"; then
115
   AC_MSG_ERROR([Couldn't find conic dependencies.])
77
fi
116
fi
78
117
79
PKG_CHECK_MODULES(NETWORK_MANAGER, [
118
80
		  NetworkManager
119
AC_ARG_ENABLE(networkmanager,
81
], HAVE_NETWORK_MANAGER=yes, HAVE_NETWORK_MANAGER=no)
120
              AS_HELP_STRING([--enable-networkmanager=@<:@no/yes/auto@:>@],
82
if test "x$HAVE_NETWORK_MANAGER" = "xyes"; then
121
                             [build with NetworkManager support]), ,
83
	CONNECTIVITY="Network Manager"
122
                             enable_networkmanager=auto)
84
	CONNECTIVITY_LIBS=${NETWORK_MANAGER_LIBS}
123
85
	CONNECTIVITY_CFLAGS=${NETWORK_MANAGER_CFLAGS}
124
if test "x$enable_networkmanager" != "xno"; then
86
	AC_DEFINE(HAVE_NETWORK_MANAGER, 1, [define if Network Manager is installed])
125
   PKG_CHECK_MODULES(NETWORKMANAGER,
126
   [
127
      NetworkManager
128
   ], have_networkmanager="yes", have_networkmanager="no")
129
130
   if test "x$have_networkmanager" = "xyes"; then
131
      CONNECTIVITY="Network Manager"
132
      CONNECTIVITY_LIBS=${NETWORK_MANAGER_LIBS}
133
      CONNECTIVITY_CFLAGS=${NETWORK_MANAGER_CFLAGS}
134
      AC_DEFINE(HAVE_NETWORK_MANAGER, 1, [define if Network Manager is installed])
135
   fi
136
else
137
   have_networkmanager=no
138
fi
139
140
if test "x$enable_networkmanager" = "xyes" -a "x$have_networkmanager" != "xyes"; then
141
   AC_MSG_ERROR([Couldn't find Network Manager dependencies.])
87
fi
142
fi
88
143
89
AC_SUBST(CONNECTIVITY_LIBS)
144
AC_SUBST(CONNECTIVITY_LIBS)
Lines 92-126 AC_SUBST(CONNECTIVITY_CFLAGS) Link Here
92
147
93
PROVIDER_SUBDIRS="example hostip geonames manual plazes localnet yahoo"
148
PROVIDER_SUBDIRS="example hostip geonames manual plazes localnet yahoo"
94
149
95
PKG_CHECK_MODULES(GSMLOC, [
150
# -----------------------------------------------------------
96
		  gammu >= 1.12
151
# gsmloc / gypsy / gpsd
97
], HAVE_GSMLOC=yes, HAVE_GSMLOC=no)
152
# -----------------------------------------------------------
98
if test "x$HAVE_GSMLOC" = "xyes"; then
153
99
	PROVIDER_SUBDIRS="$PROVIDER_SUBDIRS gsmloc"
154
AC_ARG_ENABLE(gsmloc,
155
              AS_HELP_STRING([--enable-gsmloc=@<:@no/yes/auto@:>@],
156
                             [build with gsmloc support]), ,
157
                             enable_gsmloc=auto)
158
159
if test "x$enable_gsmloc" != "xno"; then
160
   PKG_CHECK_MODULES(GSMLOC,
161
   [
162
      gammu >= 1.12
163
   ], have_gsmloc="yes", have_gsmloc="no")
164
165
   if test "x$have_gsmloc" = "xyes"; then
166
      PROVIDER_SUBDIRS="$PROVIDER_SUBDIRS gsmloc"
167
   else
168
      NO_BUILD_PROVIDERS="$NO_BUILD_PROVIDERS gsmloc"
169
   fi
100
else
170
else
101
	NO_BUILD_PROVIDERS="$NO_BUILD_PROVIDERS gsmloc"
171
   have_gsmloc=no
172
fi
173
174
if test "x$enable_gsmloc" = "xyes" -a "x$have_gsmloc" != "xyes"; then
175
   AC_MSG_ERROR([Couldn't find gsmloc dependencies.])
102
fi
176
fi
103
AC_SUBST(GSMLOC_LIBS)
177
AC_SUBST(GSMLOC_LIBS)
104
AC_SUBST(GSMLOC_CFLAGS)
178
AC_SUBST(GSMLOC_CFLAGS)
105
179
106
180
107
PKG_CHECK_MODULES(GYPSY, [
181
AC_ARG_ENABLE(gypsy,
108
		  gypsy
182
              AS_HELP_STRING([--enable-gypsy=@<:@no/yes/auto@:>@],
109
], HAVE_GYPSY=yes,HAVE_GYPSY=no)
183
                             [build with gypsy support]), ,
110
if test "x$HAVE_GYPSY" = "xyes"; then
184
                             enable_gypsy=auto)
111
	PROVIDER_SUBDIRS="$PROVIDER_SUBDIRS gypsy"
185
186
if test "x$enable_gypsy" != "xno"; then
187
   PKG_CHECK_MODULES(GYPSY,
188
   [
189
      gypsy
190
   ], have_gypsy="yes", have_gypsy="no")
191
192
   if test "x$have_gypsy" = "xyes"; then
193
      PROVIDER_SUBDIRS="$PROVIDER_SUBDIRS gypsy"
194
   else
195
      NO_BUILD_PROVIDERS="$NO_BUILD_PROVIDERS gypsy"
196
   fi
112
else
197
else
113
	NO_BUILD_PROVIDERS="$NO_BUILD_PROVIDERS gypsy"
198
   have_gypsy=no
199
fi
200
201
if test "x$enable_gypsy" = "xyes" -a "x$have_gypsy" != "xyes"; then
202
   AC_MSG_ERROR([Couldn't find gypsy dependencies.])
114
fi
203
fi
115
AC_SUBST(GYPSY_LIBS)
204
AC_SUBST(GYPSY_LIBS)
116
AC_SUBST(GYPSY_CFLAGS)
205
AC_SUBST(GYPSY_CFLAGS)
117
206
118
AC_CHECK_LIB(gps, gps_open,[libgps=yes] )
207
AC_ARG_ENABLE(gpsd,
119
if test "x$libgps" = xyes; then
208
              AS_HELP_STRING([--enable-gpsd=@<:@no/yes/auto@:>@],
120
	PROVIDER_SUBDIRS="$PROVIDER_SUBDIRS gpsd"
209
                             [build with gpsd support]), ,
121
    GPSD_LIBS="-lgps"
210
                             enable_gpsd=auto)
211
212
if test "x$enable_gpsd" != "xno"; then
213
   AC_CHECK_LIB(gps, gps_open,[libgps=yes] )
214
   if test "x$have_gpsd" = "xyes"; then
215
      PROVIDER_SUBDIRS="$PROVIDER_SUBDIRS gpsd"
216
      GPSD_LIBS="-lgps"
217
   else
218
      NO_BUILD_PROVIDERS="$NO_BUILD_PROVIDERS gpsd"
219
   fi
122
else
220
else
123
	NO_BUILD_PROVIDERS="$NO_BUILD_PROVIDERS gpsd"
221
   have_gpsd=no
222
fi
223
224
if test "x$enable_gpsd" = "xyes" -a "x$have_gpsd" != "xyes"; then
225
   AC_MSG_ERROR([Couldn't find gpsd dependencies.])
124
fi
226
fi
125
AC_SUBST(GPSD_LIBS)
227
AC_SUBST(GPSD_LIBS)
126
AC_SUBST(GPSD_CFLAGS)
228
AC_SUBST(GPSD_CFLAGS)
127
- 

Return to bug 275067