Lili Yang / ctools

Commit 591bda567c6849b2614d8cfc6f57d53e820ecd12

Authored by knodlseder
1 parent 28256161

adjust to latest GammaLib configuration

Inline Side-by-side
Showing 1 changed file with 115 additions and 34 deletions
configure.ac
  View file @591bda5
... ... @@ -72,12 +72,37 @@ AC_PROG_CXX
72 72  
73 73  
74 74 #############################################################################
  75 +# Darwin option: Determine architecture of universal library to be built #
  76 +# ------------------------------------------------------------------------- #
  77 +# --with-univeral-archs=VALUE, where VALUE is one of: #
  78 +# 32-bit - ppc, i386 #
  79 +# 64-bit - ppc64, x86_64 #
  80 +# 3-way - ppc, i386, x86_64 (default) #
  81 +# intel - i386, x86_64 #
  82 +# all - ppc, ppc64, i386, x86_64 #
  83 +#############################################################################
  84 +UNIVERSAL_ARCHS="3-way"
  85 +AC_SUBST(LIPO_32BIT_FLAGS)
  86 +AC_MSG_CHECKING(for --with-universal-archs)
  87 +AC_ARG_WITH(universal-archs,
  88 + AS_HELP_STRING([--with-universal-archs=ARCH], [select architectures for universal build ("32-bit", "64-bit", "3-way", "intel" or "all")]),
  89 +[
  90 + AC_MSG_RESULT($withval)
  91 + UNIVERSAL_ARCHS="$withval"
  92 +],
  93 +[
  94 + AC_MSG_RESULT(3-way)
  95 +])
  96 +
  97 +
  98 +#############################################################################
75 99 # Darwin option: Determine if a universal library should be built #
76 100 # ------------------------------------------------------------------------- #
77 101 # --enable-universalsdk=PATH takes an optional argument that specifies #
78   -# which OSX SDK should be used to perform the build. This defaults to #
79   -# "/Developer/SDKs/MacOSX.10.4u.sdk". Specify "/" when building on a 10.5 #
80   -# system or larger, especially when building 64-bit code. #
  102 +# which OSX SDK should be used to perform the build. #
  103 +# This defaults to: #
  104 +# "/Developer/SDKs/MacOSX.10.4u.sdk" for a '32-bit' build #
  105 +# "/Developer/SDKs/MacOSX.10.5.sdk" for any other build #
81 106 #############################################################################
82 107 AC_MSG_CHECKING([for --enable-universalsdk])
83 108 AC_ARG_ENABLE(universalsdk,
... ... @@ -85,11 +110,14 @@ AC_ARG_ENABLE(universalsdk,
85 110 [
86 111 case $enableval in
87 112 yes)
88   - enableval=/Developer/SDKs/MacOSX10.4u.sdk
89   - if test ! -d "${enableval}"
90   - then
  113 + if [test "${UNIVERSAL_ARCHS}" = "32-bit";] then
  114 + enableval=/Developer/SDKs/MacOSX10.4u.sdk
  115 + else
  116 + enableval=/Developer/SDKs/MacOSX10.5.sdk
  117 + fi
  118 + if [test ! -d "${enableval}";] then
91 119 enableval=/
92   - fi
  120 + fi
93 121 ;;
94 122 esac
95 123 case $enableval in
... ... @@ -99,8 +127,7 @@ AC_ARG_ENABLE(universalsdk,
99 127 ;;
100 128 *)
101 129 UNIVERSALSDK=$enableval
102   - if test ! -d "${UNIVERSALSDK}"
103   - then
  130 + if [test ! -d "${UNIVERSALSDK}"]; then
104 131 AC_MSG_ERROR([--enable-universalsdk specifies non-existing SDK: ${UNIVERSALSDK}])
105 132 fi
106 133 ;;
... ... @@ -110,8 +137,7 @@ AC_ARG_ENABLE(universalsdk,
110 137 UNIVERSALSDK=
111 138 enable_universalsdk=
112 139 ])
113   -if test -n "${UNIVERSALSDK}"
114   -then
  140 +if [test -n "${UNIVERSALSDK}"]; then
115 141 AC_MSG_RESULT(${UNIVERSALSDK})
116 142 else
117 143 AC_MSG_RESULT(no)
... ... @@ -120,28 +146,16 @@ AC_SUBST(UNIVERSALSDK)
120 146  
121 147  
122 148 #############################################################################
123   -# Darwin option: Determine archirecture of universal library to be built #
124   -# ------------------------------------------------------------------------- #
125   -# --with-univeral-archs=VALUE, where VALUE is one of "32-bit", "64-bit", #
126   -# "3-way", "intel" or "all". Defaults to "32-bit". #
  149 +# Darwin option: Check whether --with-universal-archs was specified without #
  150 +# --enable-universalsdk #
127 151 #############################################################################
128   -UNIVERSAL_ARCHS="32-bit"
129   -AC_SUBST(LIPO_32BIT_FLAGS)
130   -AC_MSG_CHECKING(for --with-universal-archs)
131   -AC_ARG_WITH(universal-archs,
132   - AS_HELP_STRING([--with-universal-archs=ARCH], [select architectures for universal build ("32-bit", "64-bit", "3-way", "intel" or "all")]),
133   -[
134   - AC_MSG_RESULT($withval)
135   - UNIVERSAL_ARCHS="$withval"
136   - if test "${enable_universalsdk}" ; then
  152 +if [test "${withval}"]; then
  153 + if [test "${enable_universalsdk}"]; then
137 154 :
138 155 else
139 156 AC_MSG_ERROR([--with-universal-archs without --enable-universalsdk.])
140 157 fi
141   -],
142   -[
143   - AC_MSG_RESULT(32-bit)
144   -])
  158 +fi
145 159  
146 160  
147 161 #############################################################################
... ... @@ -190,6 +204,58 @@ AC_MSG_RESULT($ac_sys_machine)
190 204  
191 205  
192 206 #############################################################################
  207 +# Set system-dependent library definitions #
  208 +#############################################################################
  209 +AC_MSG_CHECKING([for the shared library paths environment variable])
  210 +case $ac_sys_system in
  211 + BeOS*)
  212 + SHAREDSUFFIX='.so'
  213 + ;;
  214 + CYGWIN*)
  215 + SHAREDSUFFIX='.dll.a'
  216 + ;;
  217 + SunOS*)
  218 + SHAREDSUFFIX='.so'
  219 + RUNSHARED='LD_LIBRARY_PATH'
  220 + ;;
  221 + Linux*|GNU*|NetBSD*|FreeBSD*|DragonFly*)
  222 + SHAREDSUFFIX='.so'
  223 + RUNSHARED='LD_LIBRARY_PATH'
  224 + ;;
  225 + hp*|HP*)
  226 + case `uname -m` in
  227 + ia64)
  228 + SHAREDSUFFIX='.so'
  229 + ;;
  230 + *)
  231 + SHAREDSUFFIX='.sl'
  232 + ;;
  233 + esac
  234 + RUNSHARED='SHLIB_PATH'
  235 + ;;
  236 + OSF*)
  237 + SHAREDSUFFIX='.so'
  238 + RUNSHARED='LD_LIBRARY_PATH'
  239 + ;;
  240 + atheos*)
  241 + SHAREDSUFFIX='.so'
  242 + RUNSHARED='DLL_PATH'
  243 + ;;
  244 + Darwin*)
  245 + SHAREDSUFFIX='.dylib'
  246 + RUNSHARED='DYLD_LIBRARY_PATH'
  247 + ;;
  248 + AIX*)
  249 + SHAREDSUFFIX='.so'
  250 + RUNSHARED='LIBPATH'
  251 + ;;
  252 +esac
  253 +AC_MSG_RESULT($RUNSHARED)
  254 +AC_SUBST(SHAREDSUFFIX)
  255 +AC_SUBST(RUNSHARED)
  256 +
  257 +
  258 +#############################################################################
193 259 # Set -arch flags for universal builds on OSX and tweak BASECFLAGS based on #
194 260 # compiler and platform (note that BASECFLAGS are not yet used). #
195 261 #############################################################################
... ... @@ -238,7 +304,6 @@ yes)
238 304 fi
239 305  
240 306 # Calculate the right deployment target for this build.
241   - #
242 307 cur_target=`sw_vers -productVersion | sed 's/\(10\.[[0-9]]*\).*/\1/'`
243 308 if test ${cur_target} '>' 10.2; then
244 309 cur_target=10.3
... ... @@ -255,11 +320,8 @@ yes)
255 320 cur_target='10.5'
256 321 elif test "${UNIVERSAL_ARCHS}" = "64-bit"; then
257 322 cur_target='10.5'
258   - elif test `/usr/bin/arch` = "i386"; then
259   - # On Intel macs default to a deployment
260   - # target of 10.4, that's the first OSX
261   - # release with Intel support.
262   - cur_target="10.4"
  323 + elif test "${UNIVERSAL_ARCHS}" = "32-bit"; then
  324 + cur_target='10.4'
263 325 fi
264 326 else
265 327 if test `/usr/bin/arch` = "i386"; then
... ... @@ -272,6 +334,25 @@ yes)
272 334 fi
273 335 CONFIGURE_MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET-${cur_target}}
274 336  
  337 + # Make sure that deployment target is >= SDK
  338 + case "${UNIVERSALSDK}" in
  339 + */MacOSX10.4u.sdk)
  340 + if [test ${cur_target} '>' 10.4;] then
  341 + AC_MSG_ERROR([Invalid MACOSX_DEPLOYMENT_TARGET=$CONFIGURE_MACOSX_DEPLOYMENT_TARGET for SDK 10.4. Specify --enable-universalsdk=/Developer/SDKs/MacOSX${cur_target}.sdk])
  342 + fi
  343 + ;;
  344 + */MacOSX10.5.sdk)
  345 + if [test ${cur_target} '>' 10.5;] then
  346 + AC_MSG_ERROR([Invalid MACOSX_DEPLOYMENT_TARGET=$CONFIGURE_MACOSX_DEPLOYMENT_TARGET for SDK 10.5. Specify --enable-universalsdk=/Developer/SDKs/MacOSX${cur_target}.sdk])
  347 + fi
  348 + ;;
  349 + */MacOSX10.6.sdk)
  350 + if [test ${cur_target} '>' 10.6;] then
  351 + AC_MSG_ERROR([Invalid MACOSX_DEPLOYMENT_TARGET=$CONFIGURE_MACOSX_DEPLOYMENT_TARGET for SDK 10.6. Specify --enable-universalsdk=/Developer/SDKs/MacOSX${cur_target}.sdk])
  352 + fi
  353 + ;;
  354 + esac
  355 +
275 356 # Make sure that MACOSX_DEPLOYMENT_TARGET is set in the
276 357 # environment with a value that is the same as what we'll use
277 358 # in the Makefile to ensure that we'll get the same compiler
... ...