Revision 543 trunk/scripts/configure/configure.ac

configure.ac (revision 543)
19 19
fi
20 20

  
21 21
ADMB_TARGET=unix
22
ADMB_TARGET2=unix
22 23

  
23 24
#ADMB_VERSION=`cat VERSION`
24 25
ADMB_VERSION=
......
57 58
  MACOS_PRODUCT_VERSION=`sw_vers -productVersion`
58 59
  MACOS_XCODE_VERSION=`xcodebuild -version | grep Xcode | awk '{print $2}'`
59 60
  INSTALLER_PACKAGEMAKER="scripts/installers/packagemaker/GNUmakefile"
60
  CLANG_VERSION=`clang++ --version | head -n 1 | awk '{print $4}'`
61 61
  if test "${CXX}" = "clang++"
62 62
  then
63
    CLANG_VERSION=`clang++ --version | head -n 1 | awk '{print $4}'`
63 64
    ADMB_TARGET="admb${ADMB_VERSION}-macos${MACOS_PRODUCT_VERSION}-clang${CLANG_VERSION}-${CXX_32OR64BIT}"
65
    ADMB_TARGET2="admb-macos${MACOS_PRODUCT_VERSION}-clang${CLANG_VERSION}-${CXX_32OR64BIT}"
64 66
  else
65 67
    ADMB_TARGET="admb${ADMB_VERSION}-macos${MACOS_PRODUCT_VERSION}-xcode${MACOS_XCODE_VERSION}-${CXX_32OR64BIT}"
68
    ADMB_TARGET2="admb-macos${MACOS_PRODUCT_VERSION}-xcode${MACOS_XCODE_VERSION}-${CXX_32OR64BIT}"
66 69
  fi
67 70
fi
68 71

  
......
78 81
  then
79 82
    GCC_VERSION=`gcc -dumpversion`
80 83
    ADMB_TARGET="admb${ADMB_VERSION}-linux-gcc${GCC_VERSION}-${CXX_32OR64BIT}"
84
    ADMB_TARGET2="admb-linux-gcc${GCC_VERSION}-${CXX_32OR64BIT}"
81 85
  fi
82 86
  if test "${CXX}" = "icpc"
83 87
  then
......
89 93
    fi
90 94
    ICC_VERSION=`icc -dumpversion`
91 95
    ADMB_TARGET="admb${ADMB_VERSION}-linux-icc${ICC_VERSION}-${CXX_32OR64BIT}"
96
    ADMB_TARGET2="admb-linux-icc${ICC_VERSION}-${CXX_32OR64BIT}"
92 97
  fi
98
  if test "${CXX}" = "CC"
99
  then
100
    ADMB_TARGET="admb${ADMB_VERSION}-linux-solarisstudio12-${CXX_32OR64BIT}"
101
    ADMB_TARGET2="admb-linux-solarisstudio12-${CXX_32OR64BIT}"
102
  fi
93 103
  MAKEFILE="linux.mak"
94 104
fi
95 105

  
......
98 108
then
99 109
  GCC_VERSION=`gcc -dumpversion`
100 110
  ADMB_TARGET="admb${ADMB_VERSION}-mingw-gcc${GCC_VERSION}-${CXX_32OR64BIT}"
111
  ADMB_TARGET2="admb-mingw-gcc${GCC_VERSION}-${CXX_32OR64BIT}"
101 112
  MAKEFILE="linux.mak"
102 113
  INSTALLER_MINGW="scripts/installers/innosetup/mingw.iss"
103 114
fi
......
105 116
if (test  "${UNAME_S:0:9}" =  "CYGWIN_NT")
106 117
then
107 118
  GCC_VERSION=`gcc -dumpversion`
108
  ADMB_TARGET="admb-${ADMB_VERSION}-cygwin-gcc${GCC_VERSION}-${CXX_32OR64BIT}"
119
  ADMB_TARGET="admb${ADMB_VERSION}-cygwin-gcc${GCC_VERSION}-${CXX_32OR64BIT}"
120
  ADMB_TARGET2="admb-cygwin-gcc${GCC_VERSION}-${CXX_32OR64BIT}"
109 121
  MAKEFILE="linux.mak"
110 122
  INSTALLER_MINGW="scripts/installers/innosetup/mingw.iss"
111 123
fi
......
115 127
  if test "${CXX}" = "CC"
116 128
  then
117 129
    ADMB_TARGET="admb${ADMB_VERSION}-opensolaris-sunstudio-${CXX_32OR64BIT}"
130
    ADMB_TARGET2="admb-opensolaris-sunstudio-${CXX_32OR64BIT}"
118 131
  else
119 132
    GCC_VERSION=`gcc -dumpversion`
120 133
    ADMB_TARGET="admb${ADMB_VERSION}-opensolaris-gcc${GCC_VERSION}-${CXX_32OR64BIT}"
134
    ADMB_TARGET2="admb-opensolaris-gcc${GCC_VERSION}-${CXX_32OR64BIT}"
121 135
  fi
122 136
  MAKEFILE="linux.mak"
123 137
fi
......
138 152
AC_SUBST(lextargets, ${LEX_TARGETS})
139 153
AC_SUBST(version, ${ADMB_VERSION})
140 154
AC_SUBST(target, ${ADMB_TARGET})
155
AC_SUBST(target2, ${ADMB_TARGET2})
141 156
AC_SUBST(disk, ../build/${ADMB_TARGET})
142 157
AC_SUBST(libpath, ../build/objects/${ADMB_TARGET})
143 158
AC_SUBST(cxxflags, ${CXXFLAGS})

Also available in: Unified diff