Changeset 13224

Show
Ignore:
Timestamp:
12/03/07 23:31:59 (5 months ago)
Author:
warmerdam
Message:

switched to conventional CFLAGS/CXXFLAGS compile option instead of CFG (#2014)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/gdal/GDALmake.opt.in

    r13220 r13224  
    2626INSTALL_DATA    =       $(GDAL_ROOT)/install-sh -c -m 0644 
    2727INSTALL_DIR     =       $(GDAL_ROOT)/install-sh -d 
    28  
    29 #Flags to build optimized relese version 
    30 CXX_OPTFLAGS =  @CXXFLAGS@ 
    31 C_OPTFLAGS =    @CFLAGS@ 
    32 # Flags to build debug version 
    33 CXX_DBGFLAGS =  -g -DDEBUG @CFLAGS@ 
    34 C_DBGFLAGS =    -g -DDEBUG @CXXFLAGS@ 
    35 # Flags to build profiling version 
    36 CXX_PROFFLAGS = -g3 -pg -DDEBUG @CFLAGS@ 
    37 C_PROFFLAGS =   -g3 -pg -DDEBUG @CXXFLAGS@ 
    3828 
    3929# SDE_LIB needs to be first because it embeds zlib.  We need to use its symbols instead of -lz's 
    …… 
    7161INST_MAN        =       @mandir@ 
    7262 
    73 # 
    74 #       Whether we use debug flags, or optimization is determined by 
    75 #       the CFG environment variable.  Set to debug for debug builds. 
    76 #       This is similar to the OGDI builds.  
    77 # 
    78 ifneq (,$(findstring debug,$(CFG))) 
    79 C_ODFLAGS       = $(C_DBGFLAGS) 
    80 CXX_ODFLAGS     = $(CXX_DBGFLAGS) 
    81 endif 
    82  
    83 ifneq (,$(findstring gprof,$(CFG))) 
    84 C_ODFLAGS =     $(CXX_PROFFLAGS) 
    85 CXX_ODFLAGS =   $(C_PROFFLAGS) 
    86 LNK_FLAGS =     -pg 
    87 endif 
    88  
    89 ifeq ($(CFG),) 
    90 C_ODFLAGS =     $(C_OPTFLAGS) 
    91 CXX_ODFLAGS =   $(CXX_OPTFLAGS) 
    92 endif 
    93  
    9463CPPFLAGS        = @CPPFLAGS@ -I$(GDAL_ROOT)/port @EXTRA_INCLUDES@ 
    95 CFLAGS          = @C_WFLAGS@ @C_PIC@ $(C_ODFLAGS) $(USER_DEFS) 
    96 CXXFLAGS        = @CXX_WFLAGS@ @CXX_PIC@ $(CXX_ODFLAGS) $(USER_DEFS) 
     64CFLAGS          = @CFLAGS@ @C_WFLAGS@ $(USER_DEFS) 
     65CXXFLAGS        = @CXXFLAGS@ @CXX_WFLAGS@ $(USER_DEFS) 
    9766 
    9867RANLIB          =       @RANLIB@ 

  • trunk/gdal/configure

    r13132 r13224  
    459459#endif" 
    460460 
    461 ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX CXX_WFLAGS C_WFLAGS AS ac_ct_AS DLLTOOL ac_ct_DLLTOOL OBJDUMP ac_ct_OBJDUMP LIBTOOL SED EGREP FGREP GREP LD DUMPBIN ac_ct_DUMPBIN NM LN_S AR ac_ct_AR STRIP ac_ct_STRIP RANLIB ac_ct_RANLIB lt_ECHO CPP CXXCPP CXX_PIC C_PIC LD_SHARED SO_EXT HAVE_LIBTOOL HAVE_HIDE_INTERNAL_SYMBOLS LIBZ_SETTING PG_CONFIG HAVE_PG PG_INC PG_LIB GRASS_SETTING GRASS_INCLUDE GRASS_GISBASE HAVE_GRASS FITS_SETTING PCRASTER_SETTING NETCDF_SETTING PNG_SETTING TIFF_SETTING TIFF_OPTS GEOTIFF_SETTING JPEG_SETTING GIF_SETTING HAVE_OGDI OGDI_INCLUDE X_FME_HOME HAVE_HDF4 HDF4_INCLUDE HAVE_HDF5 HDF5_INCLUDE HAVE_JASPER JASPER_FLAGS ECW_SETTING KAKDIR HAVE_MRSID MRSID_INCLUDE MRSID_FLAGS OPT_GDAL_FORMATS OGR_ENABLED MYSQL_CONFIG HAVE_MYSQL MYSQL_INC MYSQL_LIB XERCES_CFLAGS XERCES_LDFLAGS XERCES_VERSION HAVE_XERCES XERCES_INCLUDE HAVE_EXPAT EXPAT_INCLUDE ODBC_SETTING ORACLE_OCI_VERSION ORACLE_OCI_CFLAGS ORACLE_OCI_LDFLAGS HAVE_OCI OCI_INCLUDE DODS_INC LIBCURL_CONFIG CURL_SETTING CURL_INC CURL_LIB SQLITE_INC HAVE_SQLITE DWG_PLT DWGDIRECT HAVE_PANORAMA PANORAMA_INC HAVE_IDB IDB_INC IDB_LIB SDE_ENABLED SDE_INC SDE_LIB GEOS_LIBS GEOS_CFLAGS HAVE_GEOS GEOS_VERSION GEOS_CONFIG PAM_SETTING PROJ_STATIC PROJ_INCLUDE GDAL_VERSION_MAJOR GDAL_VERSION_MINOR GDAL_VERSION_REV GDAL_VER MACOSX_FRAMEWORK EXTRA_INCLUDES EXE_EXT BINTRUE PY_HAVE_SETUPTOOLS BINDINGS PYTHON pythondir pyexecdir pymoddir PYTHON_INCLUDES PYTHON_CC PYTHON_OPT PYTHON_SO PYTHON_CFLAGS PYTHON_LIBS PYTHON_LINK PY_LD_SHARED PY_SO_EXT PYTHON_DEV HAVE_NUMPY NUMPY_FLAG HAVE_OGPYTHON LIBOBJS LTLIBOBJS' 
     461ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX CXX_WFLAGS C_WFLAGS AS ac_ct_AS DLLTOOL ac_ct_DLLTOOL OBJDUMP ac_ct_OBJDUMP LIBTOOL SED EGREP FGREP GREP LD DUMPBIN ac_ct_DUMPBIN NM LN_S AR ac_ct_AR STRIP ac_ct_STRIP RANLIB ac_ct_RANLIB lt_ECHO CPP CXXCPP LD_SHARED SO_EXT HAVE_LIBTOOL HAVE_HIDE_INTERNAL_SYMBOLS LIBZ_SETTING PG_CONFIG HAVE_PG PG_INC PG_LIB GRASS_SETTING GRASS_INCLUDE GRASS_GISBASE HAVE_GRASS FITS_SETTING PCRASTER_SETTING NETCDF_SETTING PNG_SETTING TIFF_SETTING TIFF_OPTS GEOTIFF_SETTING JPEG_SETTING GIF_SETTING HAVE_OGDI OGDI_INCLUDE X_FME_HOME HAVE_HDF4 HDF4_INCLUDE HAVE_HDF5 HDF5_INCLUDE HAVE_JASPER JASPER_FLAGS ECW_SETTING KAKDIR HAVE_MRSID MRSID_INCLUDE MRSID_FLAGS OPT_GDAL_FORMATS OGR_ENABLED MYSQL_CONFIG HAVE_MYSQL MYSQL_INC MYSQL_LIB XERCES_CFLAGS XERCES_LDFLAGS XERCES_VERSION HAVE_XERCES XERCES_INCLUDE HAVE_EXPAT EXPAT_INCLUDE ODBC_SETTING ORACLE_OCI_VERSION ORACLE_OCI_CFLAGS ORACLE_OCI_LDFLAGS HAVE_OCI OCI_INCLUDE DODS_INC LIBCURL_CONFIG CURL_SETTING CURL_INC CURL_LIB SQLITE_INC HAVE_SQLITE DWG_PLT DWGDIRECT HAVE_PANORAMA PANORAMA_INC HAVE_IDB IDB_INC IDB_LIB SDE_ENABLED SDE_INC SDE_LIB GEOS_LIBS GEOS_CFLAGS HAVE_GEOS GEOS_VERSION GEOS_CONFIG PAM_SETTING PROJ_STATIC PROJ_INCLUDE GDAL_VERSION_MAJOR GDAL_VERSION_MINOR GDAL_VERSION_REV GDAL_VER MACOSX_FRAMEWORK EXTRA_INCLUDES EXE_EXT BINTRUE PY_HAVE_SETUPTOOLS BINDINGS PYTHON pythondir pyexecdir pymoddir PYTHON_INCLUDES PYTHON_CC PYTHON_OPT PYTHON_SO PYTHON_CFLAGS PYTHON_LIBS PYTHON_LINK PY_LD_SHARED PY_SO_EXT PYTHON_DEV HAVE_NUMPY NUMPY_FLAG HAVE_OGPYTHON LIBOBJS LTLIBOBJS' 
    462462ac_subst_files='' 
    463463 
    …… 
    1433814338 
    1433914339        echo 'void f(){}' > conftest.c 
    14340         if test -z "`${CC-cc} -fPIC -c conftest.c 2>&1`"; then 
    14341           C_PIC=-fPIC 
    14342         else 
    14343           C_PIC= 
     14340        if test -z "`${CC-cc} $CFLAGS -fPIC -c conftest.c 2>&1`"; then 
     14341          CFLAGS="$CFLAGS -fPIC" 
    1434414342        fi 
    14345         if test -z "`${CXX-g++} -fPIC -c conftest.c 2>&1`"; then 
    14346           CXX_PIC=-fPIC 
    14347         else 
    14348           CXX_PIC= 
     14343        if test -z "`${CXX-g++} $CXXFLAGS -fPIC -c conftest.c 2>&1`"; then 
     14344          CXXFLAGS="$CXXFLAGS -fPIC" 
    1434914345        fi 
    1435014346        rm -f conftest* 
    14351  
    14352         CXX_PIC=$CXX_PIC 
    14353  
    14354         C_PIC=$C_PIC 
    14355  
    1435614347 
    1435714348 
    …… 
    2543725428 
    2543825429fi 
    25439  
    25440  
    25441         # Remove -g from compile flags, we will add via CFG variable if 
    25442         # we need it. 
    25443         CXXFLAGS=`echo "$CXXFLAGS " | sed "s/-g //"` 
    25444         CFLAGS=`echo "$CFLAGS " | sed "s/-g //"` 
    25445  
    2544625430 
    2544725431EXTRA_INCLUDES=$EXTRA_INCLUDES 
    …… 
    2693426918s,@CPP@,$CPP,;t t 
    2693526919s,@CXXCPP@,$CXXCPP,;t t 
    26936 s,@CXX_PIC@,$CXX_PIC,;t t 
    26937 s,@C_PIC@,$C_PIC,;t t 
    2693826920s,@LD_SHARED@,$LD_SHARED,;t t 
    2693926921s,@SO_EXT@,$SO_EXT,;t t 
    …… 
    2853728519echo "  enable pthread support:    ${PTHREAD_ENABLED}" 
    2853828520 
    28539 if test "x$CFG" != "xdebug" -a "x$CFG" != "xDEBUG" ; then 
    28540     DEBUG_MODE="no" 
    28541 else 
    28542     DEBUG_MODE="yes" 
    28543 fi 
    28544  
    28545 echo "  enable debug mode:         ${DEBUG_MODE}" 
    28546  
    2854728521 
    2854828522echo "  hide internal symbols:     ${HAVE_HIDE_INTERNAL_SYMBOLS}" 

  • trunk/gdal/configure.in

    r13130 r13224  
    19881988fi 
    19891989 
    1990 AC_COMPILER_WFLAGS 
    1991  
    19921990AC_SUBST(EXTRA_INCLUDES,$EXTRA_INCLUDES) 
    19931991 
    …… 
    22162214LOC_MSG([  enable OGR building:       ${OGR_ENABLED}]) 
    22172215LOC_MSG([  enable pthread support:    ${PTHREAD_ENABLED}]) 
    2218 if test "x$CFG" != "xdebug" -a "x$CFG" != "xDEBUG" ; then  
    2219     DEBUG_MODE="no" 
    2220 else 
    2221     DEBUG_MODE="yes" 
    2222 fi 
    2223 LOC_MSG([  enable debug mode:         ${DEBUG_MODE}]) 
    22242216LOC_MSG([  hide internal symbols:     ${HAVE_HIDE_INTERNAL_SYMBOLS}]) 
    22252217LOC_MSG() 

  • trunk/gdal/m4/acinclude.m4

    r12448 r13224  
    195195]) 
    196196 
    197 AC_DEFUN([AC_COMPILER_WFLAGS], 
    198 [ 
    199         # Remove -g from compile flags, we will add via CFG variable if 
    200         # we need it. 
    201         CXXFLAGS=`echo "$CXXFLAGS " | sed "s/-g //"` 
    202         CFLAGS=`echo "$CFLAGS " | sed "s/-g //"` 
    203 ]) 
    204  
    205197AC_DEFUN([AC_COMPILER_PIC], 
    206198[ 
    207199        echo 'void f(){}' > conftest.c 
    208         if test -z "`${CC-cc} -fPIC -c conftest.c 2>&1`"; then 
    209           C_PIC=-fPIC 
    210         else 
    211           C_PIC= 
     200        if test -z "`${CC-cc} $CFLAGS -fPIC -c conftest.c 2>&1`"; then 
     201          CFLAGS="$CFLAGS -fPIC" 
    212202        fi 
    213         if test -z "`${CXX-g++} -fPIC -c conftest.c 2>&1`"; then 
    214           CXX_PIC=-fPIC 
    215         else 
    216           CXX_PIC= 
     203        if test -z "`${CXX-g++} $CXXFLAGS -fPIC -c conftest.c 2>&1`"; then 
     204          CXXFLAGS="$CXXFLAGS -fPIC" 
    217205        fi 
    218206        rm -f conftest* 
    219  
    220         AC_SUBST(CXX_PIC,$CXX_PIC) 
    221         AC_SUBST(C_PIC,$C_PIC) 
    222207]) 
    223208