Changeset 1159
- Timestamp:
- Aug 10, 2010, 3:20:04 PM (12 years ago)
- Location:
- branches/0.8-stable
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/0.8-stable/bin/Makefile.am
r1119 r1159 34 34 LDADD = $(top_builddir)/lib/libsvndigest.a \ 35 35 $(top_builddir)/yat/libyat.a $(SVN_LIBS) $(APR_LIBS) $(PLPLOT_LIBS) 36 AM_LDFLAGS = $( APR_LDFLAGS) $(SVN_LDFLAGS) $(PLPLOT_LDFLAGS)36 AM_LDFLAGS = $(SVNDIGEST_LDFLAGS) 37 37 38 AM_CPPFLAGS = -I$(top_srcdir) $(DEFAULT_CPPFLAGS) \ 39 $(APR_CPPFLAGS) $(SVN_CPPFLAGS) $(PLPLOT_CPPFLAGS) 40 AM_CXXFLAGS = $(DEFAULT_CXXFLAGS) 38 AM_CPPFLAGS = -I$(top_srcdir) $(SVNDIGEST_CPPFLAGS) 39 AM_CXXFLAGS = $(SVNDIGEST_CXXFLAGS) 41 40 42 41 ##svndigest_LDADD = $(LDADD) $(PLPLOT_LIBS) -
branches/0.8-stable/configure.ac
r1139 r1159 143 143 for i in $apr_link_ld; do 144 144 AS_IF([test ${i:0:2} = "-l"],[APR_LIBS="$i $APR_LIBS"], 145 [YAT_LD_ADD_FLAG([ APR_LDFLAGS], [$i])])145 [YAT_LD_ADD_FLAG([LDFLAGS], [$i])]) 146 146 done 147 YAT_CPP_ADD_FLAG([APR_CPPFLAGS],[`$apr_config --includes --cppflags`]) 148 save_CPPFLAGS=$CPPFLAGS 149 CPPFLAGS="$APR_CPPFLAGS $CPPFLAGS" 147 YAT_CPP_ADD_FLAG([CPPFLAGS],[`$apr_config --includes --cppflags`]) 150 148 AC_CHECK_HEADER([apr_allocator.h],,[apr_found="no"]) 151 CPPFLAGS=$save_CPPFLAGS 152 fi 153 AC_SUBST([APR_CPPFLAGS]) 154 AC_SUBST([APR_LDFLAGS]) 149 fi 155 150 AC_SUBST([APR_LIBS]) 156 151 … … 166 161 with_svn=`cd $with_svn && pwd` 167 162 DISTCHECK_CONFIGURE_FLAGS="$DISTCHECK_CONFIGURE_FLAGS --with-svn=$with_svn" 168 YAT_LD_ADD_FLAG([ SVN_LDFLAGS], [-L$with_svn/lib])169 YAT_CPP_ADD_FLAG([ SVN_CPPFLAGS], [-I$with_svn/include])163 YAT_LD_ADD_FLAG([LDFLAGS], [-L$with_svn/lib]) 164 YAT_CPP_ADD_FLAG([CPPFLAGS], [-I$with_svn/include]) 170 165 ]) 171 166 # svn needs needs apr headers 172 save_CPPFLAGS=$CPPFLAGS173 CPPFLAGS="$APR_CPPFLAGS $SVN_CPPFLAGS $CPPFLAGS"174 167 AC_CHECK_HEADER([subversion-1/svn_types.h],,[svn_found="no"]) 175 CPPFLAGS=$save_CPPFLAGS 176 177 save_LDFLAGS=$LDFLAGS 168 178 169 save_LIBS=$LIBS 179 170 tmp_LIBS="$APR_LIBS $save_LIBS" 180 171 LIBS="" 181 LDFLAGS="$SVN_LDFLAGS $APR_LDFLAGS"182 172 AC_SEARCH_LIBS([svn_cmdline_setup_auth_baton],[svn_subr-1], 183 173 [], [svn_found="no"], [$tmp_LIBS]) … … 189 179 SVN_LIBS=$LIBS 190 180 LIBS=$save_LIBS 191 LDFLAGS=$save_LDFLAGS192 AC_SUBST([SVN_CPPFLAGS])193 AC_SUBST([SVN_LDFLAGS])194 181 AC_SUBST([SVN_LIBS]) 195 182 … … 236 223 # copy flags if we have found pc file 237 224 AS_IF([test "$use_plplot_pc" = "yes"], [ 238 YAT_LD_ADD_FLAG([ PLPLOT_LDFLAGS], [`$PKG_CONFIG plplotd-c++ --libs-only-L`])225 YAT_LD_ADD_FLAG([LDFLAGS], [`$PKG_CONFIG plplotd-c++ --libs-only-L`]) 239 226 PLPLOT_LIBS="`$PKG_CONFIG plplotd-c++ --libs-only-l --libs-only-other`" 240 227 ],[ … … 242 229 PLPLOT_LIBS="-lplplotcxxd -lplplotd"; 243 230 AS_IF([test -n "$with_plplot" && test "x$with_plplot" != "xyes"], [ 244 YAT_LD_ADD_FLAG([ PLPLOT_LDFLAGS], [-L$with_plplot/libs])231 YAT_LD_ADD_FLAG([LDFLAGS], [-L$with_plplot/libs]) 245 232 ]) 246 233 ]) … … 248 235 # `PREFIX/include/plplot' rather than `PREFIX/include' 249 236 AS_IF([test -n "$with_plplot" && test "x$with_plplot" != "xyes"], [ 250 YAT_CPP_ADD_FLAG([ PLPLOT_CPPFLAGS], [-I$with_plplot/include])237 YAT_CPP_ADD_FLAG([CPPFLAGS], [-I$with_plplot/include]) 251 238 ]) 252 239 ]) 253 240 254 241 AS_IF([test "x$plplot_found" = "xyes"], [ 255 save_CPPFLAGS=$CPPFLAGS256 CPPFLAGS="$PLPLOT_CPPFLAGS $CPPFLAGS"257 242 AC_CHECK_HEADER([plplot/plstream.h], [], [plplot_found="noheader"]) 258 CPPFLAGS=$save_CPPFLAGS259 243 ]) 260 244 … … 271 255 272 256 AS_IF([test "x$plplot_found" = "xyes"], [ 273 save_CPPFLAGS=$CPPFLAGS274 CPPFLAGS="$PLPLOT_CPPFLAGS $CPPFLAGS"275 save_LDFLAGS=$LDFLAGS276 LDFLAGS="$PLPLOT_LDFLAGS $LDFLAGS"277 257 save_LIBS=$LIBS 278 258 LIBS="$PLPLOT_LIBS $LIBS" … … 287 267 [AC_MSG_RESULT([no]) 288 268 plplot_found=nolib;]) 289 CPPFLAGS=$save_CPPFLAGS290 LDFLAGS=$save_LDFLAGS291 269 LIBS=$save_LIBS 292 270 ]) 293 271 # restore variable 294 272 export PKG_CONFIG_PATH=$save_PKG_CONFIG_PATH 295 AC_SUBST(PLPLOT_CPPFLAGS)296 AC_SUBST(PLPLOT_LDFLAGS)297 273 AC_SUBST(PLPLOT_LIBS) 298 274 … … 320 296 321 297 # Restore FLAGS 322 APR_RESTORE_THE_ENVIRONMENT([CPPFLAGS], [DEFAULT_]) 323 APR_RESTORE_THE_ENVIRONMENT([CXXFLAGS], [DEFAULT_]) 298 APR_RESTORE_THE_ENVIRONMENT([CPPFLAGS], [SVNDIGEST_]) 299 APR_RESTORE_THE_ENVIRONMENT([CXXFLAGS], [SVNDIGEST_]) 300 APR_RESTORE_THE_ENVIRONMENT([LDFLAGS], [SVNDIGEST_]) 324 301 325 302 AC_CONFIG_FILES([Makefile … … 428 405 +++++++++++++++++++++++++++++++++++++++++++++++ 429 406 Compiler: $CXX 430 Preprocessor flags: $SD_CPPFLAGS $CPPFLAGS 431 CPPFLAGS: $CPPFLAGS 432 DEFAULT_CPPFLAGS: $DEFAULT_CPPFLAGS 433 APR_CPPFLAGS: $APR_CPPFLAGS 434 SVN_CPPFLAGS: $SVN_CPPFLAGS 435 PLPLOT_CPPFLAGS: $PLPLOT_CPPFLAGS 407 Preprocessor flags: 408 CPPFLAGS: $CPPFLAGS 409 SVNDIGEST_CPPFLAGS: $SVNDIGEST_CPPFLAGS 436 410 C++ flags: 437 CXXFLAGS: $CXXFLAGS438 DEFAULT_CXXFLAGS: $DEFAULT_CXXFLAGS411 CXXFLAGS: $CXXFLAGS 412 SVNDIGEST_CXXFLAGS: $SVNDIGEST_CXXFLAGS 439 413 Linker flags: 440 LDFLAGS: $LDFLAGS 441 APR_LDFLAGS: $APR_LDFLAGS 442 SVN_LDFLAGS: $SVN_LDFLAGS 443 PLPLOT_LDFLAGS: $PLPLOT_LDFLAGS 414 LDFLAGS: $LDFLAGS 415 SVNDIGEST_LDFLAGS: $SVNDIGEST_LDFLAGS 444 416 Libraries: 445 LIBS $LIBS446 APR_LIBS $APR_LIBS447 SVN_LIBS $SVN_LIBS448 PLPLOT_LIBS $PLPLOT_LIBS417 LIBS $LIBS 418 APR_LIBS $APR_LIBS 419 SVN_LIBS $SVN_LIBS 420 PLPLOT_LIBS $PLPLOT_LIBS 449 421 +++++++++++++++++++++++++++++++++++++++++++++++]dnl 450 422 ) -
branches/0.8-stable/lib/Makefile.am
r1119 r1159 25 25 SVN_REVISION = `$(SVNVERSION) $(top_srcdir)` 26 26 27 AM_CPPFLAGS = -I$(top_srcdir) $(DEFAULT_CPPFLAGS) \ 28 $(APR_CPPFLAGS) $(SVN_CPPFLAGS) $(PLPLOT_CPPFLAGS) 29 AM_CXXFLAGS = $(DEFAULT_CXXFLAGS) 27 AM_CPPFLAGS = -I$(top_srcdir) $(SVNDIGEST_CPPFLAGS) 28 AM_CXXFLAGS = $(SVNDIGEST_CXXFLAGS) 30 29 31 30 noinst_LIBRARIES = libsvndigest.a -
branches/0.8-stable/test/Makefile.am
r1119 r1159 60 60 $(top_builddir)/yat/libyat.a \ 61 61 $(SVN_LIBS) $(APR_LIBS) $(PLPLOT_LIBS) 62 AM_LDFLAGS = $( APR_LDFLAGS) $(SVN_LDFLAGS) $(PLPLOT_LDFLAGS)62 AM_LDFLAGS = $(SVNDIGEST_LDFLAGS) 63 63 64 AM_CPPFLAGS = -I$(top_srcdir) $(APR_CPPFLAGS) $(SVN_CPPFLAGS) \ 65 $(DEFAULT_CPPFLAGS) $(PLPLOT_CPPFLAGS) 66 AM_CXXFLAGS = $(DEFAULT_CXXFLAGS) 64 AM_CPPFLAGS = -I$(top_srcdir) $(SVNDIGEST_CPPFLAGS) 65 AM_CXXFLAGS = $(SVNDIGEST_CXXFLAGS) 67 66 68 67 libsvndigesttest_a_SOURCES = Suite.cc
Note: See TracChangeset
for help on using the changeset viewer.