Changeset 5679 for pjproject


Ignore:
Timestamp:
Nov 1, 2017 5:23:36 AM (2 years ago)
Author:
riza
Message:

Re #2054: When setting CXXCFLAGS manually, make sure it's applied correctly.

Location:
pjproject/trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • pjproject/trunk/aconfigure

    r5658 r5679  
    759759oldincludedir 
    760760includedir 
     761runstatedir 
    761762localstatedir 
    762763sharedstatedir 
     
    883884sharedstatedir='${prefix}/com' 
    884885localstatedir='${prefix}/var' 
     886runstatedir='${localstatedir}/run' 
    885887includedir='${prefix}/include' 
    886888oldincludedir='/usr/include' 
     
    11351137    silent=yes ;; 
    11361138 
     1139  -runstatedir | --runstatedir | --runstatedi | --runstated \ 
     1140  | --runstate | --runstat | --runsta | --runst | --runs \ 
     1141  | --run | --ru | --r) 
     1142    ac_prev=runstatedir ;; 
     1143  -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ 
     1144  | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ 
     1145  | --run=* | --ru=* | --r=*) 
     1146    runstatedir=$ac_optarg ;; 
     1147 
    11371148  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) 
    11381149    ac_prev=sbindir ;; 
     
    12721283                datadir sysconfdir sharedstatedir localstatedir includedir \ 
    12731284                oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ 
    1274                 libdir localedir mandir 
     1285                libdir localedir mandir runstatedir 
    12751286do 
    12761287  eval ac_val=\$$ac_var 
     
    14251436  --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com] 
    14261437  --localstatedir=DIR     modifiable single-machine data [PREFIX/var] 
     1438  --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run] 
    14271439  --libdir=DIR            object code libraries [EPREFIX/lib] 
    14281440  --includedir=DIR        C header files [PREFIX/include] 
     
    25872599if test "$CFLAGS" = ""; then 
    25882600  CFLAGS="-O2" 
    2589 else 
    2590   CFLAGS="$CFLAGS" 
    2591 fi 
    2592  
    2593 CXXFLAGS="$CFLAGS $CXXFLAGS" 
     2601fi 
    25942602 
    25952603ac_ext=c 
  • pjproject/trunk/aconfigure.ac

    r5658 r5679  
    2828if test "$CFLAGS" = ""; then 
    2929  CFLAGS="-O2" 
    30 else 
    31   CFLAGS="$CFLAGS" 
    3230fi 
    33  
    34 CXXFLAGS="$CFLAGS $CXXFLAGS" 
    3531 
    3632dnl # 
  • pjproject/trunk/build.mak.in

    r5656 r5679  
    205205        -I$(PJDIR)/pjmedia/include\ 
    206206        -I$(PJDIR)/pjsip/include 
    207 export APP_CXXFLAGS := $(APP_CFLAGS) 
     207export APP_CXXFLAGS := @CXXFLAGS@ $(APP_CFLAGS) 
    208208export APP_LDFLAGS := -L$(PJDIR)/pjlib/lib\ 
    209209        -L$(PJDIR)/pjlib-util/lib\ 
     
    315315export PJ_INSTALL_INC_DIR := @includedir@ 
    316316export PJ_INSTALL_LIB_DIR := @libdir@ 
    317 export PJ_INSTALL_CFLAGS := -I$(PJ_INSTALL_INC_DIR) -DPJ_AUTOCONF=1     @CFLAGS@ 
    318 export PJ_INSTALL_CXXFLAGS := $(PJ_INSTALL_CFLAGS) 
     317export PJ_INSTALL_CFLAGS := -I$(PJ_INSTALL_INC_DIR) -DPJ_AUTOCONF=1 @CFLAGS@ 
     318export PJ_INSTALL_CXXFLAGS := @CXXFLAGS@ $(PJ_INSTALL_CFLAGS) 
    319319export PJ_INSTALL_LDFLAGS := -L$(PJ_INSTALL_LIB_DIR) $(APP_LDLIBS) 
  • pjproject/trunk/pjsip-apps/build/Footprint.mak

    r1352 r5679  
    1111# 
    1212export _CFLAGS  := $(APP_CFLAGS) $(CFLAGS) 
    13 export _CXXFLAGS:= $(_CFLAGS) 
     13export _CXXFLAGS:= $(APP_CXXFLAGS) $(CXXFLAGS) 
    1414 
    1515export _LDFLAGS := $(APP_LDFLAGS) $(APP_LDLIBS) $(LDFLAGS) 
  • pjproject/trunk/pjsip/build/Makefile

    r5069 r5679  
    141141                           siptypes.o call.o presence.o media.o 
    142142export PJSUA2_LIB_CFLAGS += $(_CFLAGS) $(PJ_VIDEO_CFLAGS) 
    143 export PJSUA2_LIB_CXXFLAGS = $(PJSUA2_LIB_CFLAGS)  
     143export PJSUA2_LIB_CXXFLAGS = $(_CXXFLAGS) $(PJSUA2_LIB_CFLAGS)  
    144144export PJSUA2_LIB_LDFLAGS += $(PJSUA_LIB_LDLIB) \ 
    145145                             $(PJSIP_UA_LDLIB) \ 
     
    164164                           main.o 
    165165export PJSUA2_TEST_CFLAGS += $(_CFLAGS) $(PJ_VIDEO_CFLAGS) 
    166 export PJSUA2_TEST_CXXFLAGS = $(PJSUA2_LIB_CFLAGS)  
     166export PJSUA2_TEST_CXXFLAGS = $(_CXXFLAGS) $(PJSUA2_LIB_CFLAGS)  
    167167export PJSUA2_TEST_LDFLAGS += $(PJ_LDXXFLAGS) $(PJ_LDXXLIBS) $(LDFLAGS) 
    168168export PJSUA2_TEST_EXE := pjsua2-test-$(TARGET_NAME)$(HOST_EXE) 
  • pjproject/trunk/tests/pjsua/tools/Makefile

    r5066 r5679  
    88LDLIBS  = $(APP_LDLIBS) 
    99CFLAGS  = $(APP_CFLAGS) 
    10 CPPFLAGS= ${CFLAGS} 
     10CPPFLAGS= $(APP_CXXFLAGS) 
    1111 
    1212# If your application is in a file named myapp.cpp or myapp.c 
Note: See TracChangeset for help on using the changeset viewer.