Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Added a couple of more options to mapserver-config.in.

git-svn-id: http://svn.osgeo.org/mapserver/trunk@6182 7532c77e-422f-0410-93f4-f0b67bdd69e2
  • Loading branch information...
commit d569705ff0ee998a1e6c07cabc2c54fc33d0809c 1 parent 2e8577f
Steve Lime sdlime authored

Showing 2 changed files with 23 additions and 9 deletions. Show diff stats Hide diff stats

  1. +13 9 Makefile.in
  2. +10 0 mapserver-config.in
22 Makefile.in
@@ -212,15 +212,17 @@ LD_SONAME_LIBMAP = -W1,@SO_COMMAND_NAME@,$(LIBMAP_SH_VER)
212 212 XTRALIBS= @XTRALIBS@
213 213 RUNPATHS= @RPATHS@
214 214
215   -FLAGS = @DEBUG_FLAGS@ \
216   - $(IGNORE_MISSING_DATA) $(USE_POINT_Z_M) $(STRINGS) $(EPPL) $(PROJ) \
217   - $(OWS) $(MING) $(ORACLESPATIAL) $(TIFF) $(JPEG) $(GD) $(AGG) $(PDF) $(SDE) \
218   - $(SDERASTER) $(OGR) $(GDAL) $(GEOS) $(ICONV) $(FASTCGI) $(PHP_REGEX) \
219   - $(REGEX_INC) $(POSTGIS) $(MYGIS) $(THREAD) $(ZLIB) \
220   - $(GD_INC) $(AGG_INC) $(PDF_INC) $(PROJ_INC) $(TIFF_INC) $(JPEG_INC) $(EGIS_INC) \
221   - $(SDE_INC) $(GDAL_INC) $(POSTGIS_INC) $(MYGIS_INC) \
222   - $(CURL_INC) $(MING_INC) $(ORACLESPATIAL_INC) $(GEOS_INC) $(ICONV_INC) \
223   - $(FASTCGI_INC) $(ZLIB_INC) $(XML2_INC)
  215 +DEFINES = $(IGNORE_MISSING_DATA) $(USE_POINT_Z_M) $(STRINGS) $(EPPL) $(PROJ) \
  216 + $(OWS) $(MING) $(ORACLESPATIAL) $(TIFF) $(JPEG) $(GD) $(AGG) $(PDF) $(SDE) \
  217 + $(SDERASTER) $(OGR) $(GDAL) $(GEOS) $(ICONV) $(FASTCGI) $(PHP_REGEX) \
  218 + $(POSTGIS) $(MYGIS) $(THREAD) $(ZLIB)
  219 +
  220 +INCLUDES = $(REGEX_INC) $(GD_INC) $(AGG_INC) $(PDF_INC) $(PROJ_INC) $(TIFF_INC) $(JPEG_INC) $(EGIS_INC) \
  221 + $(SDE_INC) $(GDAL_INC) $(POSTGIS_INC) $(MYGIS_INC) \
  222 + $(CURL_INC) $(MING_INC) $(ORACLESPATIAL_INC) $(GEOS_INC) $(ICONV_INC) \
  223 + $(FASTCGI_INC) $(ZLIB_INC) $(XML2_INC)
  224 +
  225 +FLAGS = @DEBUG_FLAGS@ $(DEFINES) $(INCLUDES)
224 226
225 227 CFLAGS = @CFLAGS@ $(FLAGS)
226 228 CXXFLAGS = @CXXFLAGS@ $(FLAGS)
@@ -349,6 +351,8 @@ mapserver-config: Makefile
349 351 echo 'CONFIG_LIBS="$(SUP_LIBS)"' >> mapserver-config
350 352 echo 'CONFIG_DEP_LIBS="$(LIBS)"' >> mapserver-config
351 353 echo 'CONFIG_CFLAGS="$(CFLAGS)"' >> mapserver-config
  354 + echo 'CONFIG_DEFINES="$(DEFINES)"' >> mapserver-config
  355 + echo 'CONFIG_INCLUDES="$(INCLUDES)"' >> mapserver-config
352 356 echo 'CONFIG_VERSION="'`grep '#define MS_VERSION' map.h | sed 's/\"//g' | sed 's/#define MS_VERSION //'`'"' >> mapserver-config
353 357 cat mapserver-config.in >> mapserver-config
354 358 chmod a+x mapserver-config
10 mapserver-config.in
@@ -6,6 +6,8 @@ Options:
6 6 [--libs]
7 7 [--dep-libs]
8 8 [--cflags]
  9 + [--defines]
  10 + [--includes]
9 11 [--version]
10 12 EOF
11 13 exit $1
@@ -20,6 +22,14 @@ case $1 in
20 22 echo $CONFIG_LIBS
21 23 ;;
22 24
  25 + --defines)
  26 + echo $CONFIG_DEFINES
  27 + ;;
  28 +
  29 + --includes)
  30 + echo $CONFIG_INCLUDES
  31 + ;;
  32 +
23 33 --dep-libs)
24 34 echo $CONFIG_DEP_LIBS
25 35 ;;

0 comments on commit d569705

Please sign in to comment.
Something went wrong with that request. Please try again.