- Timestamp:
- Jun 21, 2008, 6:49:12 AM (15 years ago)
- Location:
- trunk
- Files:
-
- 2 added
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Makefile.am
r1319 r1348 28 28 SUBDIRS = yat test doc 29 29 30 install-exec-hook: build_support/yat-config 31 $(INSTALL_SCRIPT) build_support/yat-config $(bindir)/yat-config 32 30 33 .PHONY: doc 31 34 doc:; @(cd doc; $(MAKE) $@) -
trunk/build_support/yat.am
r1327 r1348 25 25 ## 26 26 27 AM_CPPFLAGS = -I$(top_srcdir) $(GSL_CFLAGS) $(BOOST_CPPFLAGS) 28 29 # this assumes that gsl has been installed with default 30 # libdir = ${exec_prefix}/lib = ${prefix}/lib 31 AM_LDFLAGS = -L$(GSL_PREFIX)/lib 27 AM_CPPFLAGS = -I$(top_srcdir) $(EXTRA_CPPFLAGS) 28 AM_CXXFLAGS = $(EXTRA_CXXFLAGS) 29 AM_LDFLAGS = $(EXTRA_LDFLAGS) -
trunk/configure.ac
r1327 r1348 62 62 63 63 AM_CONDITIONAL(HAVE_DOXYGEN, test "$HAVE_DOXYGEN" = "true") 64 65 m4_sinclude(./build_support/apr_common.m4) 66 # Save user-defined environment settings for later restoration 67 APR_SAVE_THE_ENVIRONMENT(CPPFLAGS) 68 APR_SAVE_THE_ENVIRONMENT(CXXFLAGS) 69 APR_SAVE_THE_ENVIRONMENT(LDFLAGS) 64 70 65 71 # Checks for libraries. … … 90 96 if test "$gsl_found" = "yes"; then 91 97 LIBS="-lgsl $LIBS" 92 GSL_PREFIX=`$GSL_CONFIG --prefix` 93 AC_SUBST(GSL_PREFIX) 98 # grep words starting with '-L' in other words LDFLAGS 99 for i in $GSL_LIBS; do 100 if test ${i:0:2} = "-L"; then 101 LDFLAGS="$LDFLAGS $i" 102 fi 103 done 94 104 fi 95 105 … … 97 107 m4_sinclude(./build_support/ax_boost.m4) 98 108 AX_BOOST("1.33") 109 CPPFLAGS="$BOOST_CPPFLAGS $CPPFLAGS" 99 110 100 111 # Checks for header files. … … 161 172 162 173 # yat specific settings 174 YAT_LIBNAME="yat" 163 175 YAT_LIB="libyat.la" 164 176 YAT_LIB_LOCATION="yat" 177 AC_SUBST(YAT_LIBNAME) 165 178 AC_SUBST(YAT_LIB) 166 179 AC_SUBST(YAT_LIB_LOCATION) … … 187 200 yat/utility/Makefile]) 188 201 202 AC_CONFIG_FILES([build_support/yat-config], 203 [chmod +x build_support/yat-config]) 204 189 205 # warning about missing doxygen 190 206 if (test "$HAVE_DOXYGEN" != "true") ; then … … 258 274 fi 259 275 276 # Reset flags 277 APR_RESTORE_THE_ENVIRONMENT(CPPFLAGS, EXTRA_) 278 APR_RESTORE_THE_ENVIRONMENT(CXXFLAGS, EXTRA_) 279 APR_RESTORE_THE_ENVIRONMENT(LDFLAGS, EXTRA_) 280 260 281 # Create output. 261 282 AC_OUTPUT … … 267 288 AC_MSG_NOTICE([ +++++++++++++++++++++++++++++++++++++++++++++++]) 268 289 AC_MSG_NOTICE([ CPPFLAGS=\"$CPPFLAGS\"]) 290 AC_MSG_NOTICE([ EXTRA_CPPFLAGS=\"$EXTRA_CPPFLAGS\"]) 269 291 AC_MSG_NOTICE([ CXXFLAGS=\"$CXXFLAGS\"]) 292 AC_MSG_NOTICE([ EXTRA_CXXFLAGS=\"$EXTRA_CXXFLAGS\"]) 293 AC_MSG_NOTICE([ LDFLAGS=\"$LDFLAGS\"]) 294 AC_MSG_NOTICE([ EXTRA_LDFLAGS=\"$EXTRA_LDFLAGS\"]) 270 295 AC_MSG_NOTICE([ LIBS=\"$LIBS\"]) 271 AC_MSG_NOTICE([ LDFLAGS=\"$LDFLAGS\"])272 296 AC_MSG_NOTICE([ +++++++++++++++++++++++++++++++++++++++++++++++]) 273 297 AC_MSG_NOTICE([])
Note: See TracChangeset
for help on using the changeset viewer.