Changeset 940
- Timestamp:
- Feb 15, 2008 1:11:24 PM (13 years ago)
- Location:
- ThirdParty/Glpk/trunk
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
ThirdParty/Glpk/trunk/Makefile.in
r922 r940 57 57 $(srcdir)/../../ltmain.sh $(srcdir)/../../missing \ 58 58 $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ 59 $(top_srcdir)/configure $(top_srcdir)/glpk/config.h.in59 $(top_srcdir)/configure 60 60 @HAVE_EXTERNALS_TRUE@am__append_1 = Externals 61 61 @HAVE_EXTERNALS_TRUE@am__append_2 = .Externals-stamp … … 69 69 configure.lineno configure.status.lineno 70 70 mkinstalldirs = $(install_sh) -d 71 CONFIG_HEADER = $(top_builddir)/glpk/config.h72 71 CONFIG_CLEAN_FILES = 73 72 LTLIBRARIES = $(noinst_LTLIBRARIES) … … 384 383 cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) 385 384 386 glpk/config.h: glpk/stamp-h1387 @if test ! -f $@; then \388 rm -f glpk/stamp-h1; \389 $(MAKE) glpk/stamp-h1; \390 else :; fi391 392 glpk/stamp-h1: $(top_srcdir)/glpk/config.h.in $(top_builddir)/config.status393 @rm -f glpk/stamp-h1394 cd $(top_builddir) && $(SHELL) ./config.status glpk/config.h395 $(top_srcdir)/glpk/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)396 cd $(top_srcdir) && $(AUTOHEADER)397 rm -f glpk/stamp-h1398 touch $@399 400 distclean-hdr:401 -rm -f glpk/config.h glpk/stamp-h1402 403 385 clean-noinstLTLIBRARIES: 404 386 -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) … … 1117 1099 $(am__remove_distdir) 1118 1100 mkdir $(distdir) 1119 $(mkdir_p) $(distdir)/../.. $(distdir)/../../BuildTools $(distdir)/glpk1101 $(mkdir_p) $(distdir)/../.. $(distdir)/../../BuildTools 1120 1102 @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ 1121 1103 topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ … … 1280 1262 -rm -f Makefile 1281 1263 distclean-am: clean-am distclean-compile distclean-generic \ 1282 distclean- hdr distclean-libtool distclean-tags1264 distclean-libtool distclean-tags 1283 1265 1284 1266 dvi: dvi-am … … 1328 1310 dist-all dist-bzip2 dist-gzip dist-shar dist-tarZ dist-zip \ 1329 1311 distcheck distclean distclean-compile distclean-generic \ 1330 distclean- hdr distclean-libtool distclean-tags distcleancheck\1331 dist dir distuninstallcheck dvi dvi-am html html-am info\1332 in fo-am install install-am install-data install-data-am\1333 install-exec install-exec-am install-info install-info-am\1334 install- man install-strip installcheck installcheck-am\1335 installdirs maintainer-clean maintainer-clean-generic\1336 mostlyclean mostlyclean-compile mostlyclean-generic\1337 mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall\1338 uninstall- am uninstall-info-am1312 distclean-libtool distclean-tags distcleancheck distdir \ 1313 distuninstallcheck dvi dvi-am html html-am info info-am \ 1314 install install-am install-data install-data-am install-exec \ 1315 install-exec-am install-info install-info-am install-man \ 1316 install-strip installcheck installcheck-am installdirs \ 1317 maintainer-clean maintainer-clean-generic mostlyclean \ 1318 mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ 1319 pdf pdf-am ps ps-am tags uninstall uninstall-am \ 1320 uninstall-info-am 1339 1321 1340 1322 -
ThirdParty/Glpk/trunk/configure
r922 r940 20178 20178 20179 20179 20180 ac_config_headers="$ac_config_headers glpk/config.h"20181 20182 20183 20180 20184 20181 … … 20312 20309 fi 20313 20310 20314 DEFS=-DHAVE_CONFIG_H 20311 # Transform confdefs.h into DEFS. 20312 # Protect against shell expansion while executing Makefile rules. 20313 # Protect against Makefile macro expansion. 20314 # 20315 # If the first sed substitution is executed (which looks for macros that 20316 # take arguments), then we branch to the quote section. Otherwise, 20317 # look for a macro that doesn't take arguments. 20318 cat >confdef2opt.sed <<\_ACEOF 20319 t clear 20320 : clear 20321 s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\),-D\1=\2,g 20322 t quote 20323 s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\),-D\1=\2,g 20324 t quote 20325 d 20326 : quote 20327 s,[ `~#$^&*(){}\\|;'"<>?],\\&,g 20328 s,\[,\\&,g 20329 s,\],\\&,g 20330 s,\$,$$,g 20331 p 20332 _ACEOF 20333 # We use echo to avoid assuming a particular line-breaking character. 20334 # The extra dot is to prevent the shell from consuming trailing 20335 # line-breaks from the sub-command output. A line-break within 20336 # single-quotes doesn't work because, if this script is created in a 20337 # platform that uses two characters for line-breaks (e.g., DOS), tr 20338 # would break. 20339 ac_LF_and_DOT=`echo; echo .` 20340 DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'` 20341 rm -f confdef2opt.sed 20342 20315 20343 20316 20344 ac_libobjs= … … 20709 20737 --file=FILE[:TEMPLATE] 20710 20738 instantiate the configuration file FILE 20711 --header=FILE[:TEMPLATE]20712 instantiate the configuration header FILE20713 20739 20714 20740 Configuration files: 20715 20741 $config_files 20716 20717 Configuration headers:20718 $config_headers20719 20742 20720 20743 Configuration commands: … … 20838 20861 "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; 20839 20862 "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; 20840 "glpk/config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS glpk/config.h" ;;20841 20863 *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 20842 20864 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} … … 20851 20873 if $ac_need_defaults; then 20852 20874 test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files 20853 test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers20854 20875 test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands 20855 20876 fi … … 21271 21292 21272 21293 # 21273 # CONFIG_HEADER section.21274 #21275 21276 # These sed commands are passed to sed as "A NAME B NAME C VALUE D", where21277 # NAME is the cpp macro being defined and VALUE is the value it is being given.21278 #21279 # ac_d sets the value in "#define NAME VALUE" lines.21280 ac_dA='s,^\([ ]*\)#\([ ]*define[ ][ ]*\)'21281 ac_dB='[ ].*$,\1#\2'21282 ac_dC=' '21283 ac_dD=',;t'21284 # ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE".21285 ac_uA='s,^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)'21286 ac_uB='$,\1#\2define\3'21287 ac_uC=' '21288 ac_uD=',;t'21289 21290 for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue21291 # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".21292 case $ac_file in21293 - | *:- | *:-:* ) # input from stdin21294 cat >$tmp/stdin21295 ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`21296 ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;21297 *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`21298 ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;21299 * ) ac_file_in=$ac_file.in ;;21300 esac21301 21302 test x"$ac_file" != x- && { echo "$as_me:$LINENO: creating $ac_file" >&521303 echo "$as_me: creating $ac_file" >&6;}21304 21305 # First look for the input files in the build tree, otherwise in the21306 # src tree.21307 ac_file_inputs=`IFS=:21308 for f in $ac_file_in; do21309 case $f in21310 -) echo $tmp/stdin ;;21311 [\\/$]*)21312 # Absolute (can't be DOS-style, as IFS=:)21313 test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&521314 echo "$as_me: error: cannot find input file: $f" >&2;}21315 { (exit 1); exit 1; }; }21316 # Do quote $f, to prevent DOS paths from being IFS'd.21317 echo "$f";;21318 *) # Relative21319 if test -f "$f"; then21320 # Build tree21321 echo "$f"21322 elif test -f "$srcdir/$f"; then21323 # Source tree21324 echo "$srcdir/$f"21325 else21326 # /dev/null tree21327 { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&521328 echo "$as_me: error: cannot find input file: $f" >&2;}21329 { (exit 1); exit 1; }; }21330 fi;;21331 esac21332 done` || { (exit 1); exit 1; }21333 # Remove the trailing spaces.21334 sed 's/[ ]*$//' $ac_file_inputs >$tmp/in21335 21336 _ACEOF21337 21338 # Transform confdefs.h into two sed scripts, `conftest.defines' and21339 # `conftest.undefs', that substitutes the proper values into21340 # config.h.in to produce config.h. The first handles `#define'21341 # templates, and the second `#undef' templates.21342 # And first: Protect against being on the right side of a sed subst in21343 # config.status. Protect against being in an unquoted here document21344 # in config.status.21345 rm -f conftest.defines conftest.undefs21346 # Using a here document instead of a string reduces the quoting nightmare.21347 # Putting comments in sed scripts is not portable.21348 #21349 # `end' is used to avoid that the second main sed command (meant for21350 # 0-ary CPP macros) applies to n-ary macro definitions.21351 # See the Autoconf documentation for `clear'.21352 cat >confdef2sed.sed <<\_ACEOF21353 s/[\\&,]/\\&/g21354 s,[\\$`],\\&,g21355 t clear21356 : clear21357 s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*\)\(([^)]*)\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp21358 t end21359 s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp21360 : end21361 _ACEOF21362 # If some macros were called several times there might be several times21363 # the same #defines, which is useless. Nevertheless, we may not want to21364 # sort them, since we want the *last* AC-DEFINE to be honored.21365 uniq confdefs.h | sed -n -f confdef2sed.sed >conftest.defines21366 sed 's/ac_d/ac_u/g' conftest.defines >conftest.undefs21367 rm -f confdef2sed.sed21368 21369 # This sed command replaces #undef with comments. This is necessary, for21370 # example, in the case of _POSIX_SOURCE, which is predefined and required21371 # on some systems where configure will not decide to define it.21372 cat >>conftest.undefs <<\_ACEOF21373 s,^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */,21374 _ACEOF21375 21376 # Break up conftest.defines because some shells have a limit on the size21377 # of here documents, and old seds have small limits too (100 cmds).21378 echo ' # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS21379 echo ' if grep "^[ ]*#[ ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS21380 echo ' # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS21381 echo ' :' >>$CONFIG_STATUS21382 rm -f conftest.tail21383 while grep . conftest.defines >/dev/null21384 do21385 # Write a limited-size here document to $tmp/defines.sed.21386 echo ' cat >$tmp/defines.sed <<CEOF' >>$CONFIG_STATUS21387 # Speed up: don't consider the non `#define' lines.21388 echo '/^[ ]*#[ ]*define/!b' >>$CONFIG_STATUS21389 # Work around the forget-to-reset-the-flag bug.21390 echo 't clr' >>$CONFIG_STATUS21391 echo ': clr' >>$CONFIG_STATUS21392 sed ${ac_max_here_lines}q conftest.defines >>$CONFIG_STATUS21393 echo 'CEOF21394 sed -f $tmp/defines.sed $tmp/in >$tmp/out21395 rm -f $tmp/in21396 mv $tmp/out $tmp/in21397 ' >>$CONFIG_STATUS21398 sed 1,${ac_max_here_lines}d conftest.defines >conftest.tail21399 rm -f conftest.defines21400 mv conftest.tail conftest.defines21401 done21402 rm -f conftest.defines21403 echo ' fi # grep' >>$CONFIG_STATUS21404 echo >>$CONFIG_STATUS21405 21406 # Break up conftest.undefs because some shells have a limit on the size21407 # of here documents, and old seds have small limits too (100 cmds).21408 echo ' # Handle all the #undef templates' >>$CONFIG_STATUS21409 rm -f conftest.tail21410 while grep . conftest.undefs >/dev/null21411 do21412 # Write a limited-size here document to $tmp/undefs.sed.21413 echo ' cat >$tmp/undefs.sed <<CEOF' >>$CONFIG_STATUS21414 # Speed up: don't consider the non `#undef'21415 echo '/^[ ]*#[ ]*undef/!b' >>$CONFIG_STATUS21416 # Work around the forget-to-reset-the-flag bug.21417 echo 't clr' >>$CONFIG_STATUS21418 echo ': clr' >>$CONFIG_STATUS21419 sed ${ac_max_here_lines}q conftest.undefs >>$CONFIG_STATUS21420 echo 'CEOF21421 sed -f $tmp/undefs.sed $tmp/in >$tmp/out21422 rm -f $tmp/in21423 mv $tmp/out $tmp/in21424 ' >>$CONFIG_STATUS21425 sed 1,${ac_max_here_lines}d conftest.undefs >conftest.tail21426 rm -f conftest.undefs21427 mv conftest.tail conftest.undefs21428 done21429 rm -f conftest.undefs21430 21431 cat >>$CONFIG_STATUS <<\_ACEOF21432 # Let's still pretend it is `configure' which instantiates (i.e., don't21433 # use $as_me), people would be surprised to read:21434 # /* config.h. Generated by config.status. */21435 if test x"$ac_file" = x-; then21436 echo "/* Generated by configure. */" >$tmp/config.h21437 else21438 echo "/* $ac_file. Generated by configure. */" >$tmp/config.h21439 fi21440 cat $tmp/in >>$tmp/config.h21441 rm -f $tmp/in21442 if test x"$ac_file" != x-; then21443 if diff $ac_file $tmp/config.h >/dev/null 2>&1; then21444 { echo "$as_me:$LINENO: $ac_file is unchanged" >&521445 echo "$as_me: $ac_file is unchanged" >&6;}21446 else21447 ac_dir=`(dirname "$ac_file") 2>/dev/null ||21448 $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \21449 X"$ac_file" : 'X\(//\)[^/]' \| \21450 X"$ac_file" : 'X\(//\)$' \| \21451 X"$ac_file" : 'X\(/\)' \| \21452 . : '\(.\)' 2>/dev/null ||21453 echo X"$ac_file" |21454 sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }21455 /^X\(\/\/\)[^/].*/{ s//\1/; q; }21456 /^X\(\/\/\)$/{ s//\1/; q; }21457 /^X\(\/\).*/{ s//\1/; q; }21458 s/.*/./; q'`21459 { if $as_mkdir_p; then21460 mkdir -p "$ac_dir"21461 else21462 as_dir="$ac_dir"21463 as_dirs=21464 while test ! -d "$as_dir"; do21465 as_dirs="$as_dir $as_dirs"21466 as_dir=`(dirname "$as_dir") 2>/dev/null ||21467 $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \21468 X"$as_dir" : 'X\(//\)[^/]' \| \21469 X"$as_dir" : 'X\(//\)$' \| \21470 X"$as_dir" : 'X\(/\)' \| \21471 . : '\(.\)' 2>/dev/null ||21472 echo X"$as_dir" |21473 sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }21474 /^X\(\/\/\)[^/].*/{ s//\1/; q; }21475 /^X\(\/\/\)$/{ s//\1/; q; }21476 /^X\(\/\).*/{ s//\1/; q; }21477 s/.*/./; q'`21478 done21479 test ! -n "$as_dirs" || mkdir $as_dirs21480 fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&521481 echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}21482 { (exit 1); exit 1; }; }; }21483 21484 rm -f $ac_file21485 mv $tmp/config.h $ac_file21486 fi21487 else21488 cat $tmp/config.h21489 rm -f $tmp/config.h21490 fi21491 # Compute $ac_file's index in $config_headers.21492 _am_stamp_count=121493 for _am_header in $config_headers :; do21494 case $_am_header in21495 $ac_file | $ac_file:* )21496 break ;;21497 * )21498 _am_stamp_count=`expr $_am_stamp_count + 1` ;;21499 esac21500 done21501 echo "timestamp for $ac_file" >`(dirname $ac_file) 2>/dev/null ||21502 $as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \21503 X$ac_file : 'X\(//\)[^/]' \| \21504 X$ac_file : 'X\(//\)$' \| \21505 X$ac_file : 'X\(/\)' \| \21506 . : '\(.\)' 2>/dev/null ||21507 echo X$ac_file |21508 sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }21509 /^X\(\/\/\)[^/].*/{ s//\1/; q; }21510 /^X\(\/\/\)$/{ s//\1/; q; }21511 /^X\(\/\).*/{ s//\1/; q; }21512 s/.*/./; q'`/stamp-h$_am_stamp_count21513 done21514 _ACEOF21515 cat >>$CONFIG_STATUS <<\_ACEOF21516 21517 #21518 21294 # CONFIG_COMMANDS section. 21519 21295 # -
ThirdParty/Glpk/trunk/configure.ac
r735 r940 88 88 AC_CONFIG_FILES([Makefile]) 89 89 90 AC_CONFIG_HEADER([glpk/config.h])91 92 90 AC_COIN_FINALIZE
Note: See TracChangeset
for help on using the changeset viewer.