Skip to content

Commit

Permalink
Added a --with-wfs switch to the auto* build system to compile the wf…
Browse files Browse the repository at this point in the history
…s plugin

git-svn-id: http://svn.osgeo.org/qgis/trunk@5906 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
mhugent committed Oct 2, 2006
1 parent eab3164 commit c1907b3
Show file tree
Hide file tree
Showing 5 changed files with 30 additions and 4 deletions.
2 changes: 1 addition & 1 deletion acinclude.m4
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ else
AC_MSG_ERROR([Geos Version 2.x.x is needed, but you have $ac_geos_version!])
else
AC_MSG_CHECKING([GEOS_CFLAGS])
GEOS_CFLAGS=`$GEOS_CONFIG --cflags`
GEOS_CFLAGS="`$GEOS_CONFIG --cflags` `$GEOS_CONFIG --cflags`/geos"
AC_MSG_RESULT($GEOS_CFLAGS)
AC_MSG_CHECKING([GEOS_LDADD])
Expand Down
17 changes: 17 additions & 0 deletions configure.in
Original file line number Diff line number Diff line change
Expand Up @@ -424,6 +424,22 @@ fi
AM_CONDITIONAL([HAVE_GSL], [test "$ac_gsl" = "yes"])


dnl ---------------------------------------------------------------------------
dnl WFS plugin
dnl ---------------------------------------------------------------------------
AC_MSG_CHECKING([for WFS])

if test -n "$with_wfs" -a x"$with_wfs" != "xno"; then
ac_wfs=yes
AC_DEFINE([HAVE_WFS],1,
[Define to 1 if wfs plugin/provider is requested])
AC_MSG_RESULT([yes])
else
ac_wfs=no
AC_MSG_RESULT([no])
fi
AM_CONDITIONAL([HAVE_WFS], [test "$ac_wfs" = "yes"])

dnl ---------------------------------------------------------------------------
dnl Debugging
dnl ---------------------------------------------------------------------------
Expand Down Expand Up @@ -541,6 +557,7 @@ echo "PostgreSQL : $ac_postgresql $postgresql_version_string"
echo "GRASS : $ac_grass"
echo "SPIT : $ac_spit"
echo "Georeferencer : $ac_gsl"
echo "WFS : $ac_wfs"
echo "GPS/GPX : $have_expat_lib"
echo "PROJ4 : $have_proj_lib"
echo "SQLITE3 : $have_sqlite3_lib"
Expand Down
6 changes: 5 additions & 1 deletion src/plugins/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@ if HAVE_GRASS
GRASS = grass
endif

if HAVE_WFS
WFS = wfs
endif

SUBDIRS = $(GEOPROCESSING) \
$(SPIT) \
Expand All @@ -23,7 +26,8 @@ SUBDIRS = $(GEOPROCESSING) \
grid_maker \
north_arrow \
copyright_label \
scale_bar
scale_bar \
$(WFS)

EXTRA_DIST = \
plugin_builder.pl \
Expand Down
3 changes: 2 additions & 1 deletion src/plugins/wfs/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ wfsplugin_la_CXXFLAGS = $(CXXFLAGS) \
-I../../raster \
-I../../../include/qgis \
-I../../providers/wfs \
-I../../widgets/projectionselector
-I../../widgets/projectionselector \
-I..

wfsplugin_la_LDFLAGS = -avoid-version -module
6 changes: 5 additions & 1 deletion src/providers/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,8 @@ if HAVE_GRASS
GRASS = grass
endif

SUBDIRS = ogr $(POSTGRESQL) $(GRASS) delimitedtext gpx wms
if HAVE_WFS
WFS = wfs
endif

SUBDIRS = ogr $(POSTGRESQL) $(GRASS) delimitedtext gpx wms $(WFS)

0 comments on commit c1907b3

Please sign in to comment.