[mapguide-commits] r8788 - sandbox/jng/diet_vs2015/MgDev
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Mon Oct 19 03:44:54 PDT 2015
Author: jng
Date: 2015-10-19 03:44:54 -0700 (Mon, 19 Oct 2015)
New Revision: 8788
Modified:
sandbox/jng/diet_vs2015/MgDev/configure.in
Log:
Undo r8782 to allow a clean merge from the old diet branch
Modified: sandbox/jng/diet_vs2015/MgDev/configure.in
===================================================================
--- sandbox/jng/diet_vs2015/MgDev/configure.in 2015-10-19 08:44:02 UTC (rev 8787)
+++ sandbox/jng/diet_vs2015/MgDev/configure.in 2015-10-19 10:44:54 UTC (rev 8788)
@@ -39,329 +39,6 @@
map_opt_oem_distsubdirs=""
dnl *******************************************************
-dnl Oem root configuration
-dnl *******************************************************
-AC_ARG_WITH([oem],
- MAP_HELP_STRING([--with-oem],
- [specify root path of oem components [[default=no]]]),
- [with_oem=$withval],
- [with_oem=no])
-
-if test $with_oem = "no"; then
- AC_MSG_WARN([--with-oem not specified. Assuming each required component is passed in the configure script. If anything goes wrong, it's probably because of this])
-else
- AC_MSG_NOTICE([Using oem component root path of $with_oem. All component paths will be implicitly be based from this path unless overridden individually])
-fi
-
-dnl *******************************************************
-dnl ACE 6.2.6 Configuration
-dnl *******************************************************
-AC_ARG_WITH([ace],
- MAP_HELP_STRING([--with-ace],
- [specify ACE source dir prefix as args [[default=no]]]),
- [with_ace=$withval],
- [with_ace=no])
-
-if test $with_ace == "no"; then
- mg_oem_ace_src=$with_oem/ACE
-else
- mg_oem_ace_src=$with_ace
-fi
-AC_MSG_NOTICE([Using ACE source dir: $mg_oem_ace_src])
-if test -d $mg_oem_ace_src; then
- AC_MSG_NOTICE([ACE source directory is: $mg_oem_ace_src])
-else
- AC_MSG_ERROR([ACE source directory ($mg_oem_ace_src) does not exist])
-fi
-AC_SUBST(mg_oem_ace_src)
-
-dnl *******************************************************
-dnl DWF Toolkit 7.7 Configuration
-dnl *******************************************************
-AC_ARG_WITH([dwftk],
- MAP_HELP_STRING([--with-dwftk],
- [specify DWF Toolkit source dir prefix as args [[default=no]]]),
- [with_dwftk=$withval],
- [with_dwftk=no])
-
-if test $with_dwftk == "no"; then
- mg_oem_dwftk_src=$with_oem/DWFTK
-else
- mg_oem_dwftk_src=$with_dwftk
-fi
-AC_MSG_NOTICE([Using DWF Toolkit source dir: $mg_oem_dwftk_src])
-if test -d $mg_oem_dwftk_src; then
- AC_MSG_NOTICE([DWF Toolkit source directory is: $mg_oem_dwftk_src])
-else
- AC_MSG_ERROR([DWF Toolkit source directory ($mg_oem_dwftk_src) does not exist])
-fi
-AC_SUBST(mg_oem_dwftk_src)
-
-dnl *******************************************************
-dnl GEOS 3.4.2 configuration
-dnl *******************************************************
-AC_ARG_WITH([geos],
- MAP_HELP_STRING([--with-geos],
- [specify GEOS source dir prefix as args [[default=no]]]),
- [with_geos=$withval],
- [with_geos=no])
-
-if test $with_geos == "no"; then
- mg_oem_geos_src=$with_oem/geos
-else
- mg_oem_geos_src=$with_geos
-fi
-AC_MSG_NOTICE([Using GEOS source dir: $mg_oem_geos_src])
-if test -d $mg_oem_geos_src; then
- AC_MSG_NOTICE([GEOS source directory is: $mg_oem_geos_src])
-else
- AC_MSG_ERROR([GEOS source directory ($mg_oem_geos_src) does not exist])
-fi
-AC_SUBST(mg_oem_geos_src)
-
-dnl *******************************************************
-dnl SWIGEx configuration
-dnl *******************************************************
-AC_ARG_WITH([swig],
- MAP_HELP_STRING([--with-swig],
- [specify SWIG source dir prefix as args [[default=no]]]),
- [with_swig=$withval],
- [with_swig=no])
-
-if test $with_swig == "no"; then
- mg_oem_swig_src=$with_oem/SWIGEx
-else
- mg_oem_swig_src=$with_swig
-fi
-AC_MSG_NOTICE([Using SWIG source dir: $mg_oem_swig_src])
-if test -d $mg_oem_swig_src; then
- AC_MSG_NOTICE([SWIG source directory is: $mg_oem_swig_src])
-else
- AC_MSG_ERROR([SWIG source directory ($mg_oem_swig_src) does not exist])
-fi
-AC_SUBST(mg_oem_swig_src)
-
-dnl *******************************************************
-dnl DBXML configuration
-dnl *******************************************************
-AC_ARG_WITH([dbxml],
- MAP_HELP_STRING([--with-dbxml],
- [specify DBXML source dir prefix as args [[default=no]]]),
- [with_dbxml=$withval],
- [with_dbxml=no])
-
-if test $with_dbxml == "no"; then
- mg_oem_dbxml_src=$with_oem/dbxml
-else
- mg_oem_dbxml_src=$with_dbxml
-fi
-AC_MSG_NOTICE([Using DBXML source dir: $mg_oem_dbxml_src])
-if test -d $mg_oem_dbxml_src; then
- AC_MSG_NOTICE([DBXML source directory is: $mg_oem_dbxml_src])
-else
- AC_MSG_ERROR([DBXML source directory ($mg_oem_dbxml_src) does not exist])
-fi
-AC_SUBST(mg_oem_dbxml_src)
-
-dnl *******************************************************
-dnl CppUnit configuration
-dnl *******************************************************
-AC_ARG_WITH([cppunit],
- MAP_HELP_STRING([--with-cppunit],
- [specify cppunit source dir prefix as args [[default=no]]]),
- [with_cppunit=$withval],
- [with_cppunit=no])
-
-if test $with_cppunit == "no"; then
- mg_oem_cppunit_src=$with_oem/CppUnit-1.9.14
-else
- mg_oem_cppunit_src=$with_cppunit
-fi
-AC_MSG_NOTICE([Using cppunit source dir: $mg_oem_cppunit_src])
-if test -d $mg_oem_cppunit_src; then
- AC_MSG_NOTICE([cppunit source directory is: $mg_oem_cppunit_src])
-else
- AC_MSG_ERROR([cppunit source directory ($mg_oem_cppunit_src) does not exist])
-fi
-AC_SUBST(mg_oem_cppunit_src)
-
-dnl *******************************************************
-dnl IMake configuration
-dnl *******************************************************
-AC_ARG_WITH([imake],
- MAP_HELP_STRING([--with-imake],
- [specify imake source dir prefix as args [[default=no]]]),
- [with_imake=$withval],
- [with_imake=no])
-
-if test $with_imake == "no"; then
- mg_oem_imake_src=$with_oem/WebTools/IMake
-else
- mg_oem_imake_src=$with_imake
-fi
-AC_MSG_NOTICE([Using imake source dir: $mg_oem_imake_src])
-if test -d $mg_oem_imake_src; then
- AC_MSG_NOTICE([imake source directory is: $mg_oem_imake_src])
-else
- AC_MSG_ERROR([imake source directory ($mg_oem_imake_src) does not exist])
-fi
-AC_SUBST(mg_oem_imake_src)
-
-dnl *******************************************************
-dnl ZLib configuration
-dnl *******************************************************
-AC_ARG_WITH([zlib],
- MAP_HELP_STRING([--with-zlib],
- [specify zlib source dir prefix as args [[default=no]]]),
- [with_zlib=$withval],
- [with_zlib=no])
-
-if test $with_zlib == "no"; then
- mg_oem_zlib_src=$with_oem/gd/zlib
-else
- mg_oem_zlib_src=$with_zlib
-fi
-AC_MSG_NOTICE([Using zlib source dir: $mg_oem_zlib_src])
-if test -d $mg_oem_zlib_src; then
- AC_MSG_NOTICE([zlib source directory is: $mg_oem_zlib_src])
-else
- AC_MSG_ERROR([zlib source directory ($mg_oem_zlib_src) does not exist])
-fi
-AC_SUBST(mg_oem_zlib_src)
-
-dnl *******************************************************
-dnl libpng configuration
-dnl *******************************************************
-AC_ARG_WITH([libpng],
- MAP_HELP_STRING([--with-libpng],
- [specify libpng source dir prefix as args [[default=no]]]),
- [with_libpng=$withval],
- [with_libpng=no])
-
-if test $with_libpng == "no"; then
- mg_oem_libpng_src=$with_oem/gd/lpng
-else
- mg_oem_libpng_src=$with_libpng
-fi
-AC_MSG_NOTICE([Using libpng source dir: $mg_oem_libpng_src])
-if test -d $mg_oem_libpng_src; then
- AC_MSG_NOTICE([libpng source directory is: $mg_oem_libpng_src])
-else
- AC_MSG_ERROR([libpng source directory ($mg_oem_libpng_src) does not exist])
-fi
-AC_SUBST(mg_oem_libpng_src)
-
-dnl *******************************************************
-dnl libjpeg configuration
-dnl *******************************************************
-AC_ARG_WITH([libjpeg],
- MAP_HELP_STRING([--with-libjpeg],
- [specify libjpeg source dir prefix as args [[default=no]]]),
- [with_libjpeg=$withval],
- [with_libjpeg=no])
-
-if test $with_libjpeg == "no"; then
- mg_oem_libjpeg_src=$with_oem/gd/jpeg
-else
- mg_oem_libjpeg_src=$with_libjpeg
-fi
-AC_MSG_NOTICE([Using libjpeg source dir: $mg_oem_libjpeg_src])
-if test -d $mg_oem_libjpeg_src; then
- AC_MSG_NOTICE([libjpeg source directory is: $mg_oem_libjpeg_src])
-else
- AC_MSG_ERROR([libjpeg source directory ($mg_oem_libjpeg_src) does not exist])
-fi
-AC_SUBST(mg_oem_libjpeg_src)
-
-dnl *******************************************************
-dnl freetype configuration
-dnl *******************************************************
-AC_ARG_WITH([freetype],
- MAP_HELP_STRING([--with-freetype],
- [specify freetype source dir prefix as args [[default=no]]]),
- [with_freetype=$withval],
- [with_freetype=no])
-
-if test $with_freetype == "no"; then
- mg_oem_freetype_src=$with_oem/gd/freetype
-else
- mg_oem_freetype_src=$with_freetype
-fi
-AC_MSG_NOTICE([Using freetype source dir: $mg_oem_freetype_src])
-if test -d $mg_oem_freetype_src; then
- AC_MSG_NOTICE([freetype source directory is: $mg_oem_freetype_src])
-else
- AC_MSG_ERROR([freetype source directory ($mg_oem_freetype_src) does not exist])
-fi
-AC_SUBST(mg_oem_freetype_src)
-
-dnl *******************************************************
-dnl gd configuration
-dnl *******************************************************
-AC_ARG_WITH([gd],
- MAP_HELP_STRING([--with-gd],
- [specify gd source dir prefix as args [[default=no]]]),
- [with_gd=$withval],
- [with_gd=no])
-
-if test $with_gd == "no"; then
- mg_oem_gd_src=$with_oem/gd/gd
-else
- mg_oem_gd_src=$with_gd
-fi
-AC_MSG_NOTICE([Using gd source dir: $mg_oem_gd_src])
-if test -d $mg_oem_gd_src; then
- AC_MSG_NOTICE([gd source directory is: $mg_oem_gd_src])
-else
- AC_MSG_ERROR([gd source directory ($mg_oem_gd_src) does not exist])
-fi
-AC_SUBST(mg_oem_gd_src)
-
-dnl *******************************************************
-dnl JSONCPP configuration
-dnl *******************************************************
-AC_ARG_WITH([jsoncpp],
- MAP_HELP_STRING([--with-jsoncpp],
- [specify jsoncpp source dir prefix as args [[default=no]]]),
- [with_jsoncpp=$withval],
- [with_jsoncpp=no])
-
-if test $with_jsoncpp == "no"; then
- mg_oem_jsoncpp_src=$with_oem/jsoncpp
-else
- mg_oem_jsoncpp_src=$with_jsoncpp
-fi
-AC_MSG_NOTICE([Using jsoncpp source dir: $mg_oem_jsoncpp_src])
-if test -d $mg_oem_jsoncpp_src; then
- AC_MSG_NOTICE([jsoncpp source directory is: $mg_oem_jsoncpp_src])
-else
- AC_MSG_ERROR([jsoncpp source directory ($mg_oem_jsoncpp_src) does not exist])
-fi
-AC_SUBST(mg_oem_jsoncpp_src)
-
-dnl *******************************************************
-dnl CS-Map configuration
-dnl *******************************************************
-AC_ARG_WITH([csmap],
- MAP_HELP_STRING([--with-csmap],
- [specify csmap source dir prefix as args [[default=no]]]),
- [with_csmap=$withval],
- [with_csmap=no])
-
-if test $with_csmap == "no"; then
- mg_oem_csmap_src=$with_oem/CsMap
-else
- mg_oem_csmap_src=$with_csmap
-fi
-AC_MSG_NOTICE([Using csmap source dir: $mg_oem_csmap_src])
-if test -d $mg_oem_csmap_src; then
- AC_MSG_NOTICE([csmap source directory is: $mg_oem_csmap_src])
-else
- AC_MSG_ERROR([csmap source directory ($mg_oem_csmap_src) does not exist])
-fi
-AC_SUBST(mg_oem_csmap_src)
-
-dnl *******************************************************
dnl PHP 5.5.17 Configuration
dnl *******************************************************
AC_ARG_WITH([php],
@@ -372,7 +49,7 @@
if test $with_php = "no"; then
AC_MSG_NOTICE([Using php 5.5.17 from included Oem Directory])
- php_src=$with_oem/LinuxApt/php-5.5.17
+ php_src=`pwd`/Oem/LinuxApt/php-5.5.17
else
AC_MSG_NOTICE([Using custom PHP source directory])
php_src=$with_php
@@ -395,7 +72,7 @@
if test $with_httpd = "no"; then
AC_MSG_NOTICE([Using httpd 2.4.10 from included Oem Directory])
- httpd_src=$with_oem/LinuxApt/httpd-2.4.10
+ httpd_src=`pwd`/Oem/LinuxApt/httpd-2.4.10
else
AC_MSG_NOTICE([Using custom httpd source directory])
httpd_src=$with_httpd
More information about the mapguide-commits
mailing list