Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

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 with 23 additions and 9 deletions.
  1. +13 −9 Makefile.in
  2. +10 −0 mapserver-config.in
22 Makefile.in
View
@@ -212,15 +212,17 @@ LD_SONAME_LIBMAP = -W1,@SO_COMMAND_NAME@,$(LIBMAP_SH_VER)
XTRALIBS= @XTRALIBS@
RUNPATHS= @RPATHS@
-FLAGS = @DEBUG_FLAGS@ \
- $(IGNORE_MISSING_DATA) $(USE_POINT_Z_M) $(STRINGS) $(EPPL) $(PROJ) \
- $(OWS) $(MING) $(ORACLESPATIAL) $(TIFF) $(JPEG) $(GD) $(AGG) $(PDF) $(SDE) \
- $(SDERASTER) $(OGR) $(GDAL) $(GEOS) $(ICONV) $(FASTCGI) $(PHP_REGEX) \
- $(REGEX_INC) $(POSTGIS) $(MYGIS) $(THREAD) $(ZLIB) \
- $(GD_INC) $(AGG_INC) $(PDF_INC) $(PROJ_INC) $(TIFF_INC) $(JPEG_INC) $(EGIS_INC) \
- $(SDE_INC) $(GDAL_INC) $(POSTGIS_INC) $(MYGIS_INC) \
- $(CURL_INC) $(MING_INC) $(ORACLESPATIAL_INC) $(GEOS_INC) $(ICONV_INC) \
- $(FASTCGI_INC) $(ZLIB_INC) $(XML2_INC)
+DEFINES = $(IGNORE_MISSING_DATA) $(USE_POINT_Z_M) $(STRINGS) $(EPPL) $(PROJ) \
+ $(OWS) $(MING) $(ORACLESPATIAL) $(TIFF) $(JPEG) $(GD) $(AGG) $(PDF) $(SDE) \
+ $(SDERASTER) $(OGR) $(GDAL) $(GEOS) $(ICONV) $(FASTCGI) $(PHP_REGEX) \
+ $(POSTGIS) $(MYGIS) $(THREAD) $(ZLIB)
+
+INCLUDES = $(REGEX_INC) $(GD_INC) $(AGG_INC) $(PDF_INC) $(PROJ_INC) $(TIFF_INC) $(JPEG_INC) $(EGIS_INC) \
+ $(SDE_INC) $(GDAL_INC) $(POSTGIS_INC) $(MYGIS_INC) \
+ $(CURL_INC) $(MING_INC) $(ORACLESPATIAL_INC) $(GEOS_INC) $(ICONV_INC) \
+ $(FASTCGI_INC) $(ZLIB_INC) $(XML2_INC)
+
+FLAGS = @DEBUG_FLAGS@ $(DEFINES) $(INCLUDES)
CFLAGS = @CFLAGS@ $(FLAGS)
CXXFLAGS = @CXXFLAGS@ $(FLAGS)
@@ -349,6 +351,8 @@ mapserver-config: Makefile
echo 'CONFIG_LIBS="$(SUP_LIBS)"' >> mapserver-config
echo 'CONFIG_DEP_LIBS="$(LIBS)"' >> mapserver-config
echo 'CONFIG_CFLAGS="$(CFLAGS)"' >> mapserver-config
+ echo 'CONFIG_DEFINES="$(DEFINES)"' >> mapserver-config
+ echo 'CONFIG_INCLUDES="$(INCLUDES)"' >> mapserver-config
echo 'CONFIG_VERSION="'`grep '#define MS_VERSION' map.h | sed 's/\"//g' | sed 's/#define MS_VERSION //'`'"' >> mapserver-config
cat mapserver-config.in >> mapserver-config
chmod a+x mapserver-config
10 mapserver-config.in
View
@@ -6,6 +6,8 @@ Options:
[--libs]
[--dep-libs]
[--cflags]
+ [--defines]
+ [--includes]
[--version]
EOF
exit $1
@@ -20,6 +22,14 @@ case $1 in
echo $CONFIG_LIBS
;;
+ --defines)
+ echo $CONFIG_DEFINES
+ ;;
+
+ --includes)
+ echo $CONFIG_INCLUDES
+ ;;
+
--dep-libs)
echo $CONFIG_DEP_LIBS
;;
Please sign in to comment.
Something went wrong with that request. Please try again.