ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/trunk/OOPSE-3.0/ac-tools/configure.in
(Generate patch)

Comparing trunk/OOPSE-3.0/ac-tools/configure.in (file contents):
Revision 2022 by gezelter, Mon Feb 14 23:16:48 2005 UTC vs.
Revision 2203 by gezelter, Fri Apr 15 22:03:16 2005 UTC

# Line 149 | Line 149 | AC_CHECK_PROG(AR, ar, ar, NONE)
149   AC_PROG_RANLIB
150   AC_PROG_YACC
151   AC_PROG_LEX
152 + AX_SYS_PERLSHARPBANG
153   AC_CHECK_PROG(AR, ar, ar, NONE)
154   if test "$AR" = "NONE"; then
155    AC_MSG_ERROR(--> Can't find \`ar'!)
# Line 156 | Line 157 | AC_PATH_PROG(PS_PATH, ps)
157    exit 1
158   fi
159  
160 < AC_PATH_PROG(PS_PATH, ps)
161 < AC_CACHE_CHECK([for POSIX ps], ac_cv_prog_ps_posix, [
162 <        USER=${USER:-${LOGNAME:-`logname`}}
163 <        if $PS_PATH -U $USER -opid,args >/dev/null 2>&1; then
163 <                ac_cv_prog_ps_posix=yes
160 > AC_PATH_PROG(PS, ps)
161 > AC_CACHE_CHECK([for POSIX or BSD ps syntax], ac_cv_prog_ps_syntax, [
162 >        if $PS ax -o rss > /dev/null 2>&1; then
163 >                ac_cv_prog_ps_ax=yes
164          else
165 <                ac_cv_prog_ps_posix=no
165 >                ac_cv_prog_ps_ax=no
166          fi
167 +        if $PS -ef -o rss > /dev/null 2>&1; then
168 +                ac_cv_prog_ps_ef=yes
169 +        else
170 +                ac_cv_prog_ps_ef=no
171 +        fi
172 +        if test "$ac_cv_prog_ps_ax" = yes; then
173 +                ac_cv_prog_ps_syntax=BSD
174 +        else
175 +                if test "$ac_cv_prog_ps_ef" = yes; then
176 +                        ac_cv_prog_ps_syntax=POSIX
177 +                else
178 +                        AC_MSG_ERROR(Could not determine ps syntax)
179 +                fi
180 +        fi
181   ])
182 < if test "$ac_cv_prog_ps_posix" = yes; then
183 <        BSD_PS=yes
182 >
183 > AC_DEFINE_UNQUOTED(PSCOMMAND, $PS, [Path to ps program])
184 >
185 > if test "$ac_cv_prog_ps_syntax" = BSD; then
186 >  AC_DEFINE(PSTYPE_IS_BSD, 1)
187   else
188 <        POSIX_PS=yes
188 >   if test "$ac_cv_prog_ps_syntax" = POSIX; then
189 >       AC_DEFINE(PSTYPE_IS_POSIX, 1)
190 >   else
191 >       AC_MSG_ERROR(Unknown ps syntax type!)
192 >   fi
193   fi
173 – AC_SUBST(PS_PATH)
174 – AC_SUBST(BSD_PS)
175 – AC_SUBST(POSIX_PS)
194  
177 –
195   AC_ARG_WITH(mpi,
196          [AC_HELP_STRING([--with-mpi=<prefix>],
197                  [compile with MPI installed in <prefix> [default=no]])],
# Line 194 | Line 211 | AC_ARG_WITH(sprng,
211   fi
212   AC_SUBST(USE_MPI)
213  
214 < AC_ARG_WITH(sprng,
215 <        [AC_HELP_STRING([--with-sprng=<prefix>],
216 <                [compile with SPRNG installed in <prefix> [default=/usr/local]])],
217 <        with_sprng=$withval,
218 <        with_sprng="/usr/local")
219 <
220 < case "x$with_sprng" in
221 <        xyes | "x")  USE_SPRNG=yes;;
222 <        xno) USE_SPRNG=no ;;
223 <        *) SPRNG="$with_sprng"; USE_SPRNG=yes ;;
224 < esac
225 < if test "$USE_SPRNG" = "yes" -a -z "$with_sprng"; then
226 <        SPRNG="/usr/local"
227 < fi
228 < if test "$USE_SPRNG" = "yes"; then
229 <        ACX_SPRNG
230 < fi
231 < AC_SUBST(USE_SPRNG)
214 > dnl AC_ARG_WITH(sprng,
215 > dnl     [AC_HELP_STRING([--with-sprng=<prefix>],
216 > dnl             [compile with SPRNG installed in <prefix> [default=/usr/local]])],
217 > dnl     with_sprng=$withval,
218 > dnl     with_sprng="/usr/local")
219 > dnl
220 > dnl case "x$with_sprng" in
221 > dnl        xyes | "x")  USE_SPRNG=yes;;
222 > dnl        xno) USE_SPRNG=no ;;
223 > dnl        *) SPRNG="$with_sprng"; USE_SPRNG=yes ;;
224 > dnl esac
225 > dnl if test "$USE_SPRNG" = "yes" -a -z "$with_sprng"; then
226 > dnl        SPRNG="/usr/local"
227 > dnl fi
228 > dnl if test "$USE_SPRNG" = "yes"; then
229 > dnl         ACX_SPRNG
230 > dnl fi
231 > dnl AC_SUBST(USE_SPRNG)
232  
233 + dnl ########################################
234 + dnl # Check for CGAL headers and libraries #
235 + dnl ########################################
236  
237 < CHECK_MKL
237 > USE_CGAL=no
238 > cgal_makefile=auto
239 > AC_ARG_WITH(cgal-makefile,[  --with-cgal-makefile=FILE  CGAL makefile that should be used],       cgal_makefile="$withval")
240  
241 + if test "x$cgal_makefile" != xno; then
242 +
243 +  if test "x$cgal_makefile" = xauto -a "x$CGAL_MAKEFILE" != x; then
244 +    cgal_makefile="$CGAL_MAKEFILE"
245 +  fi
246 +
247 +  AC_MSG_CHECKING(for cgal_makefile: $cgal_makefile)
248 +
249 +  if test -f "$cgal_makefile"; then
250 +
251 +    cat >config.tmp.Makefile <<EOF
252 + include $cgal_makefile
253 + default:
254 +        @echo CGAL_OS_COMPILER=\"\${CGAL_OS_COMPILER}\" >config.tmp.cgalvariables
255 +        @echo CGAL_INCLDIR=\"\${CGAL_INCL_DIR}\" >>config.tmp.cgalvariables
256 +        @echo CGAL_INCLCONFDIR=\"\${CGAL_INCL_CONF_DIR}\" >>config.tmp.cgalvariables
257 +        @echo CGAL_LIBDIR=\"\${CGAL_LIB_DIR}/\${CGAL_OS_COMPILER}\" >>config.tmp.cgalvariables
258 +        @echo CGAL_RLIBDIR=\"\${CGAL_LIB_DIR}/\${CGAL_OS_COMPILER}\" >>config.tmp.cgalvariables
259 +        @echo CGAL_CXXFLAGS=\"\${CGAL_CXXFLAGS}\" >>config.tmp.cgalvariables
260 +        @echo GMP_INCLDIR=\"\${GMP_INCL_DIR}\" >>config.tmp.cgalvariables
261 +        @echo GMP_LIBDIR=\"\${GMP_LIB_DIR}\" >>config.tmp.cgalvariables
262 +        @echo GMP_RLIBDIR=\"\${GMP_LIB_DIR}\" >>config.tmp.cgalvariables
263 +        @echo LEDA_INCLDIR=\"\${LEDA_INCL_DIR}\" >>config.tmp.cgalvariables
264 +        @echo LEDA_LIBDIR=\"\${LEDA_LIB_DIR}\" >>config.tmp.cgalvariables
265 +        @echo LEDA_RLIBDIR=\"\${LEDA_LIB_DIR}\" >>config.tmp.cgalvariables
266 + EOF
267 +
268 +    make -s -f config.tmp.Makefile
269 +    . config.tmp.cgalvariables
270 +
271 +    rm -f config.tmp.Makefile config.tmp.cgalvariables
272 +
273 +    if test "x$CGAL_INCLDIR" = "x"; then
274 +      CGAL_INCLDIR=""
275 +    fi
276 +
277 +    if test "x$CGAL_LIBDIR" = "x"; then
278 +      CGAL_LIBDIR=""
279 +    fi
280 +
281 +    if test "x$CGAL_RLIBDIR" = "x"; then
282 +      CGAL_RLIBDIR=""
283 +    fi
284 +
285 +    if test "x$LEDA_INCLDIR" = "x"; then
286 +      LEDA_INCLDIR=""
287 +    fi
288 +
289 +    if test "x$LEDA_LIBDIR" = "x"; then
290 +      LEDA_LIBDIR=""
291 +    fi
292 +
293 +    if test "x$LEDA_RLIBDIR" = "x"; then
294 +      LEDA_RLIBDIR=""
295 +    fi
296 +
297 +    if test "x$GMP_INCLDIR" = "x"; then
298 +      GMP_INCLDIR=""
299 +    fi
300 +
301 +    if test "x$GMP_LIBDIR" = "x"; then
302 +      GMP_LIBDIR=""
303 +    fi
304 +
305 +    if test "x$GMP_RLIBDIR" = "x"; then
306 +      GMP_RLIBDIR=""
307 +    fi
308 +
309 +    AC_MSG_RESULT(CGAL_OS_COMPILER=   $CGAL_OS_COMPILER)
310 +    AC_MSG_RESULT(CGAL_INCLDIR=       $CGAL_INCLDIR)
311 +    AC_MSG_RESULT(CGAL_INCLCONFDIR=   $CGAL_INCLCONFDIR)
312 +    AC_MSG_RESULT(CGAL_LIBDIR=        $CGAL_LIBDIR)
313 +    AC_MSG_RESULT(CGAL_CXXFLAGS=      $CGAL_CXXFLAGS)
314 +    AC_MSG_RESULT(LEDA_INCLDIR=       $LEDA_INCLDIR)
315 +    AC_MSG_RESULT(LEDA_LIBDIR=        $LEDA_LIBDIR)
316 +    AC_MSG_RESULT(GMP_INCLDIR=        $GMP_INCLDIR)
317 +    AC_MSG_RESULT(GMP_LIBDIR=         $GMP_LIBDIR)
318 +
319 +    AC_LANG_PUSH(C++)
320 +    save_CXXFLAGS="$CXXFLAGS"
321 +    CXXFLAGS="$CXXFLAGS -I$CGAL_INCLDIR -I$CGAL_INCLCONFDIR"
322 +    AC_CHECK_HEADER(CGAL/Cartesian.h, cgal=yes, cgal=no)
323 +    CXXFLAGS="$save_CXXFLAGS"
324 +
325 +    if test "x$cgal" = xyes; then
326 +      AC_MSG_CHECKING([for CGAL version])
327 +      LOCATION=${CGAL_INCLDIR}
328 +      LOCATION=${LOCATION:-/usr/include}
329 +      if test -f $LOCATION/CGAL/version.h; then
330 +        CGAL_VERSION=`grep '#define.*\<CGAL_VERSION\>.*' $LOCATION/CGAL/version.h | sed 's/[^0-9\.]*//g'`
331 +      else
332 +        CGAL_VERSION=`grep '#define.*\<CGAL_VERSION\>.*' $LOCATION/CGAL/config.h | sed 's/[^0-9\.]*//g'`
333 +      fi
334 + changequote({, })dnl
335 +      if echo $CGAL_VERSION | grep -q "^[3456789]"; then
336 + changequote([, ])dnl
337 +        AC_MSG_RESULT([($CGAL_VERSION) yes])
338 +      else
339 +        AC_MSG_RESULT([($CGAL_VERSION) no])
340 +        cgal=no
341 +      fi
342 +    fi
343 +
344 +    if test "x$cgal" = xyes; then
345 +      CGAL_LIBS="-lCGAL"
346 +      AC_MSG_CHECKING([whether CGAL uses LEDA])
347 +      if echo $CGAL_CXXFLAGS | grep -q -- -DCGAL_USE_LEDA; then
348 +        CGAL_USES_LEDA=yes
349 +        AC_MSG_RESULT([yes])
350 +        CGAL_DEFINES="-DCGAL_USE_LEDA -DLEDA_PREFIX"
351 +      else
352 +        AC_MSG_RESULT([no])
353 +        CGAL_USES_LEDA=no
354 +      fi
355 +
356 +      AC_MSG_CHECKING([whether CGAL uses GMP])
357 +      if echo $CGAL_CXXFLAGS | grep -q -- -DCGAL_USE_GMP; then
358 +        CGAL_USES_GMP=yes
359 +        AC_MSG_RESULT([yes])
360 +        CGAL_DEFINES="-DCGAL_USE_GMP $CGAL_DEFINES"
361 +      else
362 +        AC_MSG_RESULT([no])
363 +        CGAL_USES_GMP=no
364 +      fi
365 +
366 +      CGAL_LIBS="$CGAL_LIBS -lm"
367 +
368 +      CGAL_CXXFLAGS="-ftemplate-depth-50"
369 +
370 +      AC_MSG_RESULT(CGAL_USES_LEDA=     $CGAL_USES_LEDA)
371 +      AC_MSG_RESULT(CGAL_USES_GMP =     $CGAL_USES_GMP)
372 +      AC_MSG_RESULT(CGAL_INCLDIR  =     $CGAL_INCLDIR)
373 +      AC_MSG_RESULT(CGAL_LIBDIR   =     $CGAL_LIBDIR)
374 +      AC_MSG_RESULT(CGAL_DEFINES  =     $CGAL_DEFINES)
375 +      AC_MSG_RESULT(CGAL_CXXFLAGS =     $CGAL_CXXFLAGS)
376 +      AC_MSG_RESULT(CGAL_LIBS     =     $CGAL_LIBS)
377 +    fi
378 +
379 +    if test "x$cgal" = xyes; then
380 +      save_LIBS="$LIBS"
381 +      LIBS="$LIBS -L$CGAL_LIBDIR"
382 +      if test "x$CGAL_USES_LEDA" = xyes; then
383 +        LIBS="-lL $LIBS -L$LEDA_LIBDIR"
384 +      fi
385 +      # if test "x$CGAL_USES_GMP" = xyes; then
386 +      #   LIBS="-lgmp $LIBS $GMP_LIBDIR"
387 +      # fi
388 +      AC_CHECK_CXX_LIB(CGAL, ::CGAL::Cartesian<int>::Point_2, [#include <CGAL/Cartesian.h>], [::CGAL::Cartesian<int>::Point_2 P], [cgal=yes], [cgal=no], -I$CGAL_INCLDIR -I$CGAL_INCLCONFDIR)
389 +      LIBS="$save_LIBS"
390 +    fi
391 +
392 +  fi
393 +  AC_LANG_POP()
394 +
395 + fi
396 +
397 + if test "x$cgal" = xyes; then
398 +  USE_CGAL=yes
399 +  AC_DEFINE(HAVE_CGAL, 1, [Is defined if the CGAL library is available.])
400 +  AC_DEFINE_UNQUOTED(CGAL_VERSION, $CGAL_VERSION, [The CGAL version number.])
401 + changequote({, })dnl
402 +  if ! echo $CGAL_VERSION | grep -q "^3.0"; then
403 + changequote([, ])dnl
404 +    AC_MSG_WARN(*****************************************************)
405 +    AC_MSG_WARN(*** Warning: Your CGAL version is newer than the  ***)
406 +    AC_MSG_WARN(*** supported versions. It may still work though. ***)
407 +    AC_MSG_WARN(*****************************************************)
408 +  fi
409 + else
410 +   if test "x$cgal_makefile" != xno; then
411 +    AC_MSG_RESULT(No CGAL support. These are not the droids you want.)
412 +  fi
413 +  CGAL_INCLDIR=
414 +  CGAL_LIBDIR=
415 +  CGAL_RLIBDIR=
416 +  CGAL_DEFINES=
417 +  CGAL_CXXFLAGS=
418 +  CGAL_LIBS=
419 + fi
420 +
421 + AC_SUBST(USE_CGAL)
422 + CGAL_INC_DIR="${CGAL_INCLDIR} ${CGAL_INCLCONFDIR}"
423 + AC_SUBST(CGAL_INC_DIR)
424 + CGAL_LIB_DIR=${CGAL_LIBDIR}
425 + AC_SUBST(CGAL_LIB_DIR)
426 + CGAL_RLIB_DIR=${CGAL_RLIBDIR}
427 + AC_SUBST(CGAL_RLIB_DIR)
428 + AC_SUBST(CGAL_DEFINES)
429 + AC_SUBST(CGAL_CXXFLAGS)
430 + AC_SUBST(CGAL_LIBS)
431 +
432 + dnl CHECK_MKL
433 +
434   BB_ENABLE_DOXYGEN
435  
436   AC_EXEEXT
# Line 278 | Line 493 | AC_CONFIG_FILES([make/Makefile src/utils/Makefile])
493   AC_SUBST(PREPDEFFLAG)
494   AC_SUBST(F90_MODULE_NAMES)
495   AC_CONFIG_HEADER([src/config.h])
496 < AC_CONFIG_FILES([make/Makefile src/utils/Makefile])
496 > AC_CONFIG_FILES([make/Makefile src/utils/Makefile src/applications/nanoRodBuilder/Makefile scripts/filepp], [chmod 0755 scripts/*])
497  
498   AC_OUTPUT

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines