Changeset 1454 for ThirdParty/ASL


Ignore:
Timestamp:
Nov 29, 2009 1:27:05 PM (10 years ago)
Author:
stefan
Message:

add .pc files for ASL, HSL, and FilterSQP

Location:
ThirdParty/ASL/branches/BSPsplit
Files:
2 added
4 edited

Legend:

Unmodified
Added
Removed
  • ThirdParty/ASL/branches/BSPsplit/Makefile.am

    r1388 r1454  
    5252  stdio1.h arith.h
    5353
     54pkgconfiglibdir = $(prefix)/lib/ThirdParty/pkgconfig
     55pkgconfiglib_DATA = asl.pc
     56
    5457CLEANFILES = $(libampl) stdio1.h arith.h funcadd0.$(OBJEXT)
    5558
  • ThirdParty/ASL/branches/BSPsplit/Makefile.in

    r1446 r1454  
    5757        $(srcdir)/../../install-sh $(srcdir)/../../ltmain.sh \
    5858        $(srcdir)/../../missing $(srcdir)/Makefile.am \
    59         $(srcdir)/Makefile.in $(srcdir)/asl_addlibs.txt.in \
     59        $(srcdir)/Makefile.in $(srcdir)/asl-uninstalled.pc.in \
     60        $(srcdir)/asl.pc.in $(srcdir)/asl_addlibs.txt.in \
    6061        $(srcdir)/compile_MS_ASL.in $(srcdir)/compile_Unix_ASL.in \
    6162        $(thirdpartyinclude_HEADERS) $(top_srcdir)/configure
     
    7172 configure.lineno configure.status.lineno
    7273mkinstalldirs = $(install_sh) -d
    73 CONFIG_CLEAN_FILES = asl_addlibs.txt compile_MS_ASL compile_Unix_ASL
     74CONFIG_CLEAN_FILES = asl_addlibs.txt compile_MS_ASL compile_Unix_ASL \
     75        asl.pc asl-uninstalled.pc
    7476SOURCES =
    7577DIST_SOURCES =
     
    8183am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
    8284am__installdirs = "$(DESTDIR)$(addlibsdir)" \
     85        "$(DESTDIR)$(pkgconfiglibdir)" \
    8386        "$(DESTDIR)$(thirdpartyincludedir)"
    8487addlibsDATA_INSTALL = $(INSTALL_DATA)
    85 DATA = $(addlibs_DATA)
     88pkgconfiglibDATA_INSTALL = $(INSTALL_DATA)
     89DATA = $(addlibs_DATA) $(pkgconfiglib_DATA)
    8690thirdpartyincludeHEADERS_INSTALL = $(INSTALL_HEADER)
    8791HEADERS = $(thirdpartyinclude_HEADERS)
     
    253257  stdio1.h arith.h
    254258
     259pkgconfiglibdir = $(prefix)/lib/ThirdParty/pkgconfig
     260pkgconfiglib_DATA = asl.pc
    255261CLEANFILES = $(libampl) stdio1.h arith.h funcadd0.$(OBJEXT)
    256262
     
    305311compile_Unix_ASL: $(top_builddir)/config.status $(srcdir)/compile_Unix_ASL.in
    306312        cd $(top_builddir) && $(SHELL) ./config.status $@
     313asl.pc: $(top_builddir)/config.status $(srcdir)/asl.pc.in
     314        cd $(top_builddir) && $(SHELL) ./config.status $@
     315asl-uninstalled.pc: $(top_builddir)/config.status $(srcdir)/asl-uninstalled.pc.in
     316        cd $(top_builddir) && $(SHELL) ./config.status $@
    307317
    308318mostlyclean-libtool:
     
    331341          echo " rm -f '$(DESTDIR)$(addlibsdir)/$$f'"; \
    332342          rm -f "$(DESTDIR)$(addlibsdir)/$$f"; \
     343        done
     344install-pkgconfiglibDATA: $(pkgconfiglib_DATA)
     345        @$(NORMAL_INSTALL)
     346        test -z "$(pkgconfiglibdir)" || $(mkdir_p) "$(DESTDIR)$(pkgconfiglibdir)"
     347        @list='$(pkgconfiglib_DATA)'; for p in $$list; do \
     348          if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
     349          f=$(am__strip_dir) \
     350          echo " $(pkgconfiglibDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgconfiglibdir)/$$f'"; \
     351          $(pkgconfiglibDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgconfiglibdir)/$$f"; \
     352        done
     353
     354uninstall-pkgconfiglibDATA:
     355        @$(NORMAL_UNINSTALL)
     356        @list='$(pkgconfiglib_DATA)'; for p in $$list; do \
     357          f=$(am__strip_dir) \
     358          echo " rm -f '$(DESTDIR)$(pkgconfiglibdir)/$$f'"; \
     359          rm -f "$(DESTDIR)$(pkgconfiglibdir)/$$f"; \
    333360        done
    334361install-thirdpartyincludeHEADERS: $(thirdpartyinclude_HEADERS)
     
    529556all-am: Makefile $(DATA) $(HEADERS) all-local
    530557installdirs:
    531         for dir in "$(DESTDIR)$(addlibsdir)" "$(DESTDIR)$(thirdpartyincludedir)"; do \
     558        for dir in "$(DESTDIR)$(addlibsdir)" "$(DESTDIR)$(pkgconfiglibdir)" "$(DESTDIR)$(thirdpartyincludedir)"; do \
    532559          test -z "$$dir" || $(mkdir_p) "$$dir"; \
    533560        done
     
    578605info-am:
    579606
    580 install-data-am: install-addlibsDATA install-thirdpartyincludeHEADERS
     607install-data-am: install-addlibsDATA install-pkgconfiglibDATA \
     608        install-thirdpartyincludeHEADERS
    581609
    582610install-exec-am: install-exec-local
     
    607635
    608636uninstall-am: uninstall-addlibsDATA uninstall-info-am uninstall-local \
    609         uninstall-thirdpartyincludeHEADERS
     637        uninstall-pkgconfiglibDATA uninstall-thirdpartyincludeHEADERS
    610638
    611639.PHONY: CTAGS GTAGS all all-am all-local am--refresh check check-am \
     
    617645        install-data install-data-am install-exec install-exec-am \
    618646        install-exec-local install-info install-info-am install-man \
    619         install-strip install-thirdpartyincludeHEADERS installcheck \
    620         installcheck-am installdirs maintainer-clean \
    621         maintainer-clean-generic mostlyclean mostlyclean-generic \
    622         mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
    623         uninstall-addlibsDATA uninstall-am uninstall-info-am \
    624         uninstall-local uninstall-thirdpartyincludeHEADERS
     647        install-pkgconfiglibDATA install-strip \
     648        install-thirdpartyincludeHEADERS installcheck installcheck-am \
     649        installdirs maintainer-clean maintainer-clean-generic \
     650        mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
     651        ps ps-am tags uninstall uninstall-addlibsDATA uninstall-am \
     652        uninstall-info-am uninstall-local uninstall-pkgconfiglibDATA \
     653        uninstall-thirdpartyincludeHEADERS
    625654
    626655#endif
  • ThirdParty/ASL/branches/BSPsplit/configure

    r1446 r1454  
    1981719817}
    1981819818
    19819 # See what we're actually going to do for ASL. This will define ampllib.
    19820 #AC_COIN_HAS_ASL
    19821 
    19822 # Determine the name of the ASL library
    19823 case "$CC" in
    19824   cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
    19825     ampllib=amplsolv.lib ;;
    19826   *)
    19827     ampllib=amplsolver.a ;;
    19828 esac
    19829 
    19830 
    1983119819#############################################################################
    1983219820#                          AMPL SOLVER LIBRARY                              #
    1983319821#############################################################################
    1983419822
    19835 if test x$skip_further_test != xyes; then
    19836 
    19837 # Set a substitutable variable with the library name, and determine the
    19838 # compilation style.
    19839 
    19840 
    19841   AMPLSOLVER_A=$ampllib
    19842   case "$CC" in
    19843     cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
    19844       msvc_compile=yes ;;
    19845     *)
    19846       msvc_compile=no ;;
    19847   esac
    19848   { echo "$as_me:$LINENO: Configuring ASL to build $AMPLSOLVER_A." >&5
     19823# Determine the name of the ASL library
     19824
     19825# Set a substitutable variable with the library name, and determine the compilation style.
     19826
     19827case "$CC" in
     19828  cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
     19829    AMPLSOLVER_A=amplsolv.lib
     19830    msvc_compile=yes
     19831    ;;
     19832  *)
     19833    AMPLSOLVER_A=amplsolver.a
     19834    msvc_compile=no
     19835    ;;
     19836esac
     19837{ echo "$as_me:$LINENO: Configuring ASL to build $AMPLSOLVER_A." >&5
    1984919838echo "$as_me: Configuring ASL to build $AMPLSOLVER_A." >&6;}
    1985019839
     
    1985519844# No_Control87 seems to be specific to DEC Alpha. Try leaving it undefined.
    1985619845
    19857   if test -z "$ASLMAKEFLAGS" ; then
    19858     asladdcflags=
    19859     case $build in
    19860       *-linux*)
    19861         case $CC in
    19862           pgcc* | */pgcc* | xlc* | */xlc* | blrts_xlc* | */blrts_xlc*)
    19863             asladdcflags="$asladdcflags -DNO_fpu_control";;
    19864         esac
    19865         ;;
    19866     esac
     19846if test -z "$ASLMAKEFLAGS" ; then
     19847  asladdcflags=
     19848  case $build in
     19849    *-linux*)
     19850      case $CC in
     19851        pgcc* | */pgcc* | xlc* | */xlc* | blrts_xlc* | */blrts_xlc*)
     19852          asladdcflags="$asladdcflags -DNO_fpu_control";;
     19853      esac
     19854      ;;
     19855  esac
    1986719856
    1986819857# Various feature checks. Force the language to be C while we do this to avoid
    1986919858# issues with C++ (re)declarations.
    19870 
    19871     ac_ext=c
     19859  ac_ext=c
    1987219860ac_cpp='$CPP $CPPFLAGS'
    1987319861ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
     
    1987819866# The critical function for NO_RUSAGE is getrusage(). Use a standard test.
    1987919867
    19880     echo "$as_me:$LINENO: checking for getrusage" >&5
     19868  echo "$as_me:$LINENO: checking for getrusage" >&5
    1988119869echo $ECHO_N "checking for getrusage... $ECHO_C" >&6
    19882     cat >conftest.$ac_ext <<_ACEOF
     19870  cat >conftest.$ac_ext <<_ACEOF
    1988319871/* confdefs.h.  */
    1988419872_ACEOF
     
    1992419912
    1992519913asladdcflags="$asladdcflags -DNO_RUSAGE"
    19926        echo "$as_me:$LINENO: result: no" >&5
     19914     echo "$as_me:$LINENO: result: no" >&5
    1992719915echo "${ECHO_T}no" >&6
    1992819916fi
     
    1993719925# system, but it's easy to check.
    1993819926
    19939     echo "$as_me:$LINENO: checking for long long" >&5
     19927  echo "$as_me:$LINENO: checking for long long" >&5
    1994019928echo $ECHO_N "checking for long long... $ECHO_C" >&6
    1994119929if test "${ac_cv_type_long_long+set}" = set; then
     
    2000119989
    2000219990# Back to whatever language we were in.
    20003 
    20004     ac_ext=c
     19991  ac_ext=c
    2000519992ac_cpp='$CPP $CPPFLAGS'
    2000619993ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
     
    2001019997
    2001119998# On BlueGene disable dynamic library loading
    20012 
    20013     if test x"$enable_bg" = xyes; then
    20014       asladdcflags="$asladdcflags -DNO_FUNCADD"
    20015     fi
     19999  if test x"$enable_bg" = xyes; then
     20000    asladdcflags="$asladdcflags -DNO_FUNCADD"
     20001  fi
    2001620002
    2001720003# Groom CFLAGS before we merge it with asladdcflags.
    2001820004# Remove -Werror if present, to make sure we are not interrupting compilation
    2001920005# of ASL because of warning messages. The cl equivalent is -WX.
    20020 
    20021     bla=
    20022     if test x$msvc_compile = xyes ; then
    20023       warnToErr="-WX"
    20024     else
    20025       warnToErr="-Werror"
     20006  bla=
     20007  if test x$msvc_compile = xyes ; then
     20008    warnToErr="-WX"
     20009  else
     20010    warnToErr="-Werror"
     20011  fi
     20012  for i in $CFLAGS; do
     20013    if test "$i" != "$warnToErr"; then
     20014      bla="$bla $i"
    2002620015    fi
    20027     for i in $CFLAGS; do
    20028       if test "$i" != "$warnToErr"; then
    20029         bla="$bla $i"
    20030       fi
    20031     done
    20032     ASLMAKEFLAGS="CFLAGS=\"$bla $asladdcflags\""
     20016  done
     20017  ASLMAKEFLAGS="CFLAGS=\"$bla $asladdcflags\""
    2003320018
    2003420019# Somehow, the flags specified here cause ASL to segfault on the AIX
    2003520020# compiler, so take them out.
    20036 
    20037     case $CC in
    20038       xlc* | */xlc* | mpxlc* | */mpxlc*)
    20039         ASLMAKEFLAGS=`echo $ASLMAKEFLAGS | sed -e 's/-qtune=auto//g' -e 's/-qarch=auto//g' -e 's/-qcache=auto//g' -e 's/-qhot//g' -e sed 's/-O3/-O/g'`
    20040         ;;
    20041       pgcc* | */pgcc*)
    20042         ASLMAKEFLAGS=`echo $ASLMAKEFLAGS | sed -e 's/-fast/-O1/g'`
    20043         ;;
    20044     esac
     20021  case $CC in
     20022    xlc* | */xlc* | mpxlc* | */mpxlc*)
     20023      ASLMAKEFLAGS=`echo $ASLMAKEFLAGS | sed -e 's/-qtune=auto//g' -e 's/-qarch=auto//g' -e 's/-qcache=auto//g' -e 's/-qhot//g' -e sed 's/-O3/-O/g'`
     20024      ;;
     20025    pgcc* | */pgcc*)
     20026      ASLMAKEFLAGS=`echo $ASLMAKEFLAGS | sed -e 's/-fast/-O1/g'`
     20027      ;;
     20028  esac
    2004520029
    2004620030# Limit GNU make to one thread. But remember that if we're building with
    2004720031# cl, ultimately we're going to use nmake, which knows nothing of this.
    20048 
    20049     if test x$msvc_compile = xno ; then
    20050       rm -rf conftest.mak
    20051       ($am_make -v > conftest.grp) 2>&5
    20052       if $EGREP GNU conftest.grp >&5 ; then
    20053         ASLMAKEFLAGS="-j 1 $ASLMAKEFLAGS"
    20054       fi
    20055       rm -f conftest.grp
     20032  if test x$msvc_compile = xno ; then
     20033    rm -rf conftest.mak
     20034    ($am_make -v > conftest.grp) 2>&5
     20035    if $EGREP GNU conftest.grp >&5 ; then
     20036      ASLMAKEFLAGS="-j 1 $ASLMAKEFLAGS"
    2005620037    fi
     20038    rm -f conftest.grp
    2005720039  fi
    20058 
     20040fi
    2005920041# End if-then to construct ASLMAKEFLAGS. Announce the result.
    2006020042
    20061   { echo "$as_me:$LINENO: Command line flags for (n)make \"$ASLMAKEFLAGS\"." >&5
     20043{ echo "$as_me:$LINENO: Command line flags for (n)make \"$ASLMAKEFLAGS\"." >&5
    2006220044echo "$as_me: Command line flags for (n)make \"$ASLMAKEFLAGS\"." >&6;}
    2006320045
    20064 
    20065 fi
    2006620046
    2006720047# Set automake conditional and generate the output files.
     
    2008320063
    2008420064          ac_config_files="$ac_config_files compile_Unix_ASL"
     20065
     20066                    ac_config_files="$ac_config_files asl.pc asl-uninstalled.pc"
    2008520067
    2008620068
     
    2076620748  "compile_MS_ASL" ) CONFIG_FILES="$CONFIG_FILES compile_MS_ASL" ;;
    2076720749  "compile_Unix_ASL" ) CONFIG_FILES="$CONFIG_FILES compile_Unix_ASL" ;;
     20750  "asl.pc" ) CONFIG_FILES="$CONFIG_FILES asl.pc" ;;
     20751  "asl-uninstalled.pc" ) CONFIG_FILES="$CONFIG_FILES asl-uninstalled.pc" ;;
    2076820752  "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
    2076920753  *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
  • ThirdParty/ASL/branches/BSPsplit/configure.ac

    r1446 r1454  
    5959AC_COIN_INIT_AUTO_TOOLS
    6060
    61 # See what we're actually going to do for ASL. This will define ampllib.
    62 #AC_COIN_HAS_ASL
    63 
    64 # Determine the name of the ASL library
    65 case "$CC" in
    66   cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
    67     ampllib=amplsolv.lib ;;
    68   *)
    69     ampllib=amplsolver.a ;;
    70 esac
    71 
    72 
    7361#############################################################################
    7462#                          AMPL SOLVER LIBRARY                              #
    7563#############################################################################
    7664
    77 if test x$skip_further_test != xyes; then
     65# Determine the name of the ASL library
    7866
    79 # Set a substitutable variable with the library name, and determine the
    80 # compilation style.
    81 
    82   AC_SUBST(AMPLSOLVER_A)
    83   AMPLSOLVER_A=$ampllib
    84   case "$CC" in
    85     cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
    86       msvc_compile=yes ;;
    87     *)
    88       msvc_compile=no ;;
    89   esac
    90   AC_MSG_NOTICE([Configuring ASL to build $AMPLSOLVER_A.])
     67# Set a substitutable variable with the library name, and determine the compilation style.
     68AC_SUBST(AMPLSOLVER_A)
     69case "$CC" in
     70  cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
     71    AMPLSOLVER_A=amplsolv.lib
     72    msvc_compile=yes
     73    ;;
     74  *)
     75    AMPLSOLVER_A=amplsolver.a
     76    msvc_compile=no
     77    ;;
     78esac
     79AC_MSG_NOTICE([Configuring ASL to build $AMPLSOLVER_A.])
    9180
    9281# Determine flags to be passed on the command line to (n)make. The main
     
    9685# No_Control87 seems to be specific to DEC Alpha. Try leaving it undefined.
    9786
    98   if test -z "$ASLMAKEFLAGS" ; then
    99     asladdcflags=
    100     case $build in
    101       *-linux*)
    102         case $CC in
    103           pgcc* | */pgcc* | xlc* | */xlc* | blrts_xlc* | */blrts_xlc*)
    104             asladdcflags="$asladdcflags -DNO_fpu_control";;
    105         esac
    106         ;;
    107     esac
     87if test -z "$ASLMAKEFLAGS" ; then
     88  asladdcflags=
     89  case $build in
     90    *-linux*)
     91      case $CC in
     92        pgcc* | */pgcc* | xlc* | */xlc* | blrts_xlc* | */blrts_xlc*)
     93          asladdcflags="$asladdcflags -DNO_fpu_control";;
     94      esac
     95      ;;
     96  esac
    10897
    10998# Various feature checks. Force the language to be C while we do this to avoid
    11099# issues with C++ (re)declarations.
    111 
    112     AC_LANG_PUSH(C)
     100  AC_LANG_PUSH(C)
    113101
    114102# The critical function for NO_RUSAGE is getrusage(). Use a standard test.
    115103
    116     AC_MSG_CHECKING([for getrusage])
    117     AC_LINK_IFELSE(
    118       [AC_LANG_PROGRAM([[]],[[getrusage()]])],
    119       [AC_MSG_RESULT([yes])],
    120       [asladdcflags="$asladdcflags -DNO_RUSAGE"
    121        AC_MSG_RESULT([no])])
     104  AC_MSG_CHECKING([for getrusage])
     105  AC_LINK_IFELSE(
     106    [AC_LANG_PROGRAM([[]],[[getrusage()]])],
     107    [AC_MSG_RESULT([yes])],
     108    [asladdcflags="$asladdcflags -DNO_RUSAGE"
     109     AC_MSG_RESULT([no])])
    122110
    123111# Check for long long; we need to define NO_LONG_LONG if it's not present.  ASL
     
    128116# system, but it's easy to check.
    129117
    130     AC_CHECK_TYPE([long long],[],
    131       [asladdcflags="$asladdcflags -DNO_LONG_LONG"],[])
     118  AC_CHECK_TYPE([long long],[],
     119    [asladdcflags="$asladdcflags -DNO_LONG_LONG"],[])
    132120
    133121# Back to whatever language we were in.
    134 
    135     AC_LANG_POP(C)
     122  AC_LANG_POP(C)
    136123
    137124# On BlueGene disable dynamic library loading
    138 
    139     if test x"$enable_bg" = xyes; then
    140       asladdcflags="$asladdcflags -DNO_FUNCADD"
    141     fi
     125  if test x"$enable_bg" = xyes; then
     126    asladdcflags="$asladdcflags -DNO_FUNCADD"
     127  fi
    142128
    143129# Groom CFLAGS before we merge it with asladdcflags.
    144130# Remove -Werror if present, to make sure we are not interrupting compilation
    145131# of ASL because of warning messages. The cl equivalent is -WX.
    146 
    147     bla=
    148     if test x$msvc_compile = xyes ; then
    149       warnToErr="-WX"
    150     else
    151       warnToErr="-Werror"
     132  bla=
     133  if test x$msvc_compile = xyes ; then
     134    warnToErr="-WX"
     135  else
     136    warnToErr="-Werror"
     137  fi
     138  for i in $CFLAGS; do
     139    if test "$i" != "$warnToErr"; then
     140      bla="$bla $i"
    152141    fi
    153     for i in $CFLAGS; do
    154       if test "$i" != "$warnToErr"; then
    155         bla="$bla $i"
    156       fi
    157     done
    158     ASLMAKEFLAGS="CFLAGS=\"$bla $asladdcflags\""
     142  done
     143  ASLMAKEFLAGS="CFLAGS=\"$bla $asladdcflags\""
    159144
    160145# Somehow, the flags specified here cause ASL to segfault on the AIX
    161146# compiler, so take them out.
    162 
    163     case $CC in
    164       xlc* | */xlc* | mpxlc* | */mpxlc*)
    165         ASLMAKEFLAGS=`echo $ASLMAKEFLAGS | sed -e 's/-qtune=auto//g' -e 's/-qarch=auto//g' -e 's/-qcache=auto//g' -e 's/-qhot//g' -e sed 's/-O3/-O/g'`
    166         ;;
    167       pgcc* | */pgcc*)
    168         ASLMAKEFLAGS=`echo $ASLMAKEFLAGS | sed -e 's/-fast/-O1/g'`
    169         ;;
    170     esac
     147  case $CC in
     148    xlc* | */xlc* | mpxlc* | */mpxlc*)
     149      ASLMAKEFLAGS=`echo $ASLMAKEFLAGS | sed -e 's/-qtune=auto//g' -e 's/-qarch=auto//g' -e 's/-qcache=auto//g' -e 's/-qhot//g' -e sed 's/-O3/-O/g'`
     150      ;;
     151    pgcc* | */pgcc*)
     152      ASLMAKEFLAGS=`echo $ASLMAKEFLAGS | sed -e 's/-fast/-O1/g'`
     153      ;;
     154  esac
    171155
    172156# Limit GNU make to one thread. But remember that if we're building with
    173157# cl, ultimately we're going to use nmake, which knows nothing of this.
    174 
    175     if test x$msvc_compile = xno ; then
    176       rm -rf conftest.mak
    177       ($am_make -v > conftest.grp) 2>&5
    178       if $EGREP GNU conftest.grp >&5 ; then
    179         ASLMAKEFLAGS="-j 1 $ASLMAKEFLAGS"
    180       fi
    181       rm -f conftest.grp
     158  if test x$msvc_compile = xno ; then
     159    rm -rf conftest.mak
     160    ($am_make -v > conftest.grp) 2>&5
     161    if $EGREP GNU conftest.grp >&5 ; then
     162      ASLMAKEFLAGS="-j 1 $ASLMAKEFLAGS"
    182163    fi
     164    rm -f conftest.grp
    183165  fi
    184 
     166fi
    185167# End if-then to construct ASLMAKEFLAGS. Announce the result.
    186168
    187   AC_MSG_NOTICE([Command line flags for (n)make \"$ASLMAKEFLAGS\".])
    188   AC_ARG_VAR(ASLMAKEFLAGS,
    189         [Compilation flags necessary for compiling the AMPL solver library])
    190 
    191 fi
     169AC_MSG_NOTICE([Command line flags for (n)make \"$ASLMAKEFLAGS\".])
     170AC_ARG_VAR(ASLMAKEFLAGS, [Compilation flags necessary for compiling the AMPL solver library])
    192171
    193172# Set automake conditional and generate the output files.
     
    198177AC_CONFIG_FILES([compile_MS_ASL],[chmod a+x compile_MS_ASL])
    199178AC_CONFIG_FILES([compile_Unix_ASL],[chmod a+x compile_Unix_ASL])
     179AC_CONFIG_FILES([asl.pc asl-uninstalled.pc])
    200180
    201181AC_COIN_FINALIZE
Note: See TracChangeset for help on using the changeset viewer.