1
1
- configure: Removed double slashes in path names which make trouble when building RPMs on Fedora (see #3688)

This commit was SVN r28924.
Этот коммит содержится в:
Matthias Jurenz 2013-07-23 08:12:18 +00:00
родитель 1349b825c2
Коммит c4a7dded5f
14 изменённых файлов: 62 добавлений и 62 удалений

Просмотреть файл

@ -16,14 +16,14 @@ AC_DEFUN([ACVT_CLAPACK],
AC_ARG_WITH(clapack-inc-dir,
AC_HELP_STRING([--with-clapack-inc-dir=CLAPACKINCDIR],
[give the path for CLAPACK-include files, default: CLAPACKDIR/include)]),
[CLAPACKINCDIR="-I$withval/"],
[AS_IF([test x"$CLAPACKDIR" != x], [CLAPACKINCDIR="-I$CLAPACKDIR"include/])])
[CLAPACKINCDIR="-I$withval"],
[AS_IF([test x"$CLAPACKDIR" != x], [CLAPACKINCDIR="-I$CLAPACKDIR"include])])
AC_ARG_WITH(clapack-lib-dir,
AC_HELP_STRING([--with-clapack-lib-dir=CLAPACKLIBDIR],
[give the path for CLAPACK-libraries, default: CLAPACKDIR/lib]),
[CLAPACKLIBDIR="-L$withval/"],
[AS_IF([test x"$CLAPACKDIR" != x], [CLAPACKLIBDIR="-L$CLAPACKDIR"lib/])])
[CLAPACKLIBDIR="-L$withval"],
[AS_IF([test x"$CLAPACKDIR" != x], [CLAPACKLIBDIR="-L$CLAPACKDIR"lib])])
AC_ARG_WITH(clapack-mkl,
AC_HELP_STRING([--with-clapack-mkl], [set CLAPACK-lib for MKL]),

Просмотреть файл

@ -16,14 +16,14 @@ AC_DEFUN([ACVT_CPC],
AC_ARG_WITH(cpc-inc-dir,
AC_HELP_STRING([--with-cpc-inc-dir=CPCINCDIR],
[give the path for CPC-include files, default: CPCDIR/include]),
[CPCINCDIR="-I$withval/"],
[AS_IF([test x"$CPCDIR" != x], [CPCINCDIR="-I$CPCDIR"include/])])
[CPCINCDIR="-I$withval"],
[AS_IF([test x"$CPCDIR" != x], [CPCINCDIR="-I$CPCDIR"include])])
AC_ARG_WITH(cpc-lib-dir,
AC_HELP_STRING([--with-cpc-lib-dir=CPCLIBDIR],
[give the path for CPC-libraries, default: CPCDIR/lib]),
[CPCLIBDIR="-L$withval/"],
[AS_IF([test x"$CPCDIR" != x], [CPCLIBDIR="-L$CPCDIR"lib/])])
[CPCLIBDIR="-L$withval"],
[AS_IF([test x"$CPCDIR" != x], [CPCLIBDIR="-L$CPCDIR"lib])])
AC_ARG_WITH(cpc-lib,
AC_HELP_STRING([--with-cpc-lib=CPCLIB], [use given cpc lib, default: -lcpc]),

Просмотреть файл

@ -16,14 +16,14 @@ AC_DEFUN([ACVT_CTOOL],
AC_ARG_WITH(ctool-inc-dir,
AC_HELP_STRING([--with-ctool-inc-dir=CTOOLINCDIR],
[give the path for CTool-include files, default: CTOOLDIR/include]),
[CTOOLINCDIR="-I$withval/"],
[AS_IF([test x"$CTOOLDIR" != x], [CTOOLINCDIR="-I$CTOOLDIR"include/])])
[CTOOLINCDIR="-I$withval"],
[AS_IF([test x"$CTOOLDIR" != x], [CTOOLINCDIR="-I$CTOOLDIR"include])])
AC_ARG_WITH(ctool-lib-dir,
AC_HELP_STRING([--with-ctool-lib-dir=CTOOLLIBDIR],
[give the path for CTool-libraries, default: CTOOLDIR/lib]),
[CTOOLLIBDIR="-L$withval/"],
[AS_IF([test x"$CTOOLDIR" != x], [CTOOLLIBDIR="-L$CTOOLDIR"lib/])])
[CTOOLLIBDIR="-L$withval"],
[AS_IF([test x"$CTOOLDIR" != x], [CTOOLLIBDIR="-L$CTOOLDIR"lib])])
AC_ARG_WITH(ctool-lib,
AC_HELP_STRING([--with-ctool-lib=CTOOLLIB], [use given CTool lib, default: -lctool]),

Просмотреть файл

@ -21,14 +21,14 @@ AC_DEFUN([ACVT_CUDA],
AC_ARG_WITH(cuda-inc-dir,
AC_HELP_STRING([--with-cuda-inc-dir=CUDATKINCDIR],
[give the path for CUDA-Toolkit-include files, default: CUDATKDIR/include]),
[CUDATKINCDIR="-I$withval/"],
[AS_IF([test x"$CUDATKDIR" != x], [CUDATKINCDIR="-I$CUDATKDIR"include/])])
[CUDATKINCDIR="-I$withval"],
[AS_IF([test x"$CUDATKDIR" != x], [CUDATKINCDIR="-I$CUDATKDIR"include])])
AC_ARG_WITH(cuda-lib-dir,
AC_HELP_STRING([--with-cuda-lib-dir=CUDATKLIBDIR],
[give the path for CUDA-Toolkit-libraries, default: CUDATKDIR/lib64]),
[CUDATKLIBDIR="-L$withval/"],
[AS_IF([test x"$CUDATKDIR" != x], [CUDATKLIBDIR="-L$CUDATKDIR"lib64/])])
[CUDATKLIBDIR="-L$withval"],
[AS_IF([test x"$CUDATKDIR" != x], [CUDATKLIBDIR="-L$CUDATKDIR"lib64])])
AC_ARG_WITH(cuda-lib,
AC_HELP_STRING([--with-cuda-lib=CUDALIB], [use given CUDA driver library, default: -lcuda]),

Просмотреть файл

@ -29,14 +29,14 @@ AC_DEFUN([ACVT_CUPTI],
AC_ARG_WITH(cupti-inc-dir,
AC_HELP_STRING([--with-cupti-inc-dir=CUPTIINCDIR],
[give the path for CUPTI-include files, default: CUPTIDIR/include]),
[CUPTIINCDIR="-I$withval/"],
[AS_IF([test x"$CUPTIDIR" != x], [CUPTIINCDIR="-I$CUPTIDIR"include/])])
[CUPTIINCDIR="-I$withval"],
[AS_IF([test x"$CUPTIDIR" != x], [CUPTIINCDIR="-I$CUPTIDIR"include])])
AC_ARG_WITH(cupti-lib-dir,
AC_HELP_STRING([--with-cupti-lib-dir=CUPTILIBDIR],
[give the path for CUPTI-libraries, default: CUPTIDIR/lib64]),
[CUPTILIBDIR="-L$withval/"],
[AS_IF([test x"$CUPTIDIR" != x], [CUPTILIBDIR="-L$CUPTIDIR"lib64/])])
[CUPTILIBDIR="-L$withval"],
[AS_IF([test x"$CUPTIDIR" != x], [CUPTILIBDIR="-L$CUPTIDIR"lib64])])
AC_ARG_WITH(cupti-lib,
AC_HELP_STRING([--with-cupti-lib=CUPTILIB], [use given cupti lib, default: -lcupti CUDALIB]),

Просмотреть файл

@ -20,14 +20,14 @@ AC_DEFUN([ACVT_DL],
AC_ARG_WITH(dl-inc-dir,
AC_HELP_STRING([--with-dl-inc-dir=DLINCDIR],
[give the path for libdl-include files, default: DLDIR/include]),
[DLINCDIR="-I$withval/"],
[AS_IF([test x"$DLDIR" != x], [DLINCDIR="-I$DLDIR"include/])])
[DLINCDIR="-I$withval"],
[AS_IF([test x"$DLDIR" != x], [DLINCDIR="-I$DLDIR"include])])
AC_ARG_WITH(dl-lib-dir,
AC_HELP_STRING([--with-dl-lib-dir=DLLIBDIR],
[give the path for libdl-libraries, default: DLDIR/lib]),
[DLLIBDIR="-L$withval/"],
[AS_IF([test x"$DLDIR" != x], [DLLIBDIR="-L$DLDIR"lib/])])
[DLLIBDIR="-L$withval"],
[AS_IF([test x"$DLDIR" != x], [DLLIBDIR="-L$DLDIR"lib])])
AC_ARG_WITH(dl-lib,
AC_HELP_STRING([--with-dl-lib=DLLIB], [use given libdl lib, default: -ldl]),

Просмотреть файл

@ -32,14 +32,14 @@ AC_DEFUN([ACVT_DYNINST],
AC_ARG_WITH(dyninst-inc-dir,
AC_HELP_STRING([--with-dyninst-inc-dir=DYNIINCDIR],
[give the path for Dyninst-include files, default: DYNIDIR/include]),
[DYNIINCDIR="-I$withval/"],
[AS_IF([test x"$DYNIDIR" != x], [DYNIINCDIR="-I$DYNIDIR"include/])])
[DYNIINCDIR="-I$withval"],
[AS_IF([test x"$DYNIDIR" != x], [DYNIINCDIR="-I$DYNIDIR"include])])
AC_ARG_WITH(dyninst-lib-dir,
AC_HELP_STRING([--with-dyninst-lib-dir=DYNILIBDIR],
[give the path for Dyninst-libraries, default: DYNIDIR/lib]),
[DYNILIBDIR="-L$withval/"],
[AS_IF([test x"$DYNIDIR" != x], [DYNILIBDIR="-L$DYNIDIR"lib/])])
[DYNILIBDIR="-L$withval"],
[AS_IF([test x"$DYNIDIR" != x], [DYNILIBDIR="-L$DYNIDIR"lib])])
AC_ARG_WITH(dyninst-lib,
AC_HELP_STRING([--with-dyninst-lib=DYNILIB], [use given Dyninst lib, default: -ldyninstAPI]),

Просмотреть файл

@ -32,14 +32,14 @@ AC_DEFUN([ACVT_IOFSL],
AC_ARG_WITH(zoidfs-inc-dir,
AC_HELP_STRING([--with-zoidfs-inc-dir=ZOIDFSINCDIR],
[give the path for ZOIDFS-include files, default: ZOIDFSDIR/include]),
[ZOIDFSINCDIR="-I$withval/"],
[AS_IF([test x"$ZOIDFSDIR" != x], [ZOIDFSINCDIR="-I$ZOIDFSDIR"include/])])
[ZOIDFSINCDIR="-I$withval"],
[AS_IF([test x"$ZOIDFSDIR" != x], [ZOIDFSINCDIR="-I$ZOIDFSDIR"include])])
AC_ARG_WITH(zoidfs-lib-dir,
AC_HELP_STRING([--with-zoidfs-lib-dir=ZOIDFSLIBDIR],
[give the path for ZOIDFS-libraries, default: ZOIDFSDIR/lib]),
[ZOIDFSLIBDIR="-L$withval/"],
[AS_IF([test x"$ZOIDFSDIR" != x], [ZOIDFSLIBDIR="-L$ZOIDFSDIR"lib/])])
[ZOIDFSLIBDIR="-L$withval"],
[AS_IF([test x"$ZOIDFSDIR" != x], [ZOIDFSLIBDIR="-L$ZOIDFSDIR"lib])])
AC_ARG_WITH(zoidfs-lib,
AC_HELP_STRING([--with-zoidfs-lib=ZOIDFSLIB], [use given zoidfs lib, default: $zoidfs_lib_default BMILIBDIR BMILIB]),
@ -52,14 +52,14 @@ AC_DEFUN([ACVT_IOFSL],
AC_ARG_WITH(bmi-inc-dir,
AC_HELP_STRING([--with-bmi-inc-dir=BMIINCDIR],
[give the path for BMI-include files, default: BMIDIR/include]),
[BMIINCDIR="-I$withval/"],
[AS_IF([test x"$BMIDIR" != x], [BMIINCDIR="-I$BMIDIR"include/])])
[BMIINCDIR="-I$withval"],
[AS_IF([test x"$BMIDIR" != x], [BMIINCDIR="-I$BMIDIR"include])])
AC_ARG_WITH(bmi-lib-dir,
AC_HELP_STRING([--with-bmi-lib-dir=BMILIBDIR],
[give the path for BMI-libraries, default: BMIDIR/lib]),
[BMILIBDIR="-L$withval/"],
[AS_IF([test x"$BMIDIR" != x], [BMILIBDIR="-L$BMIDIR"lib/])])
[BMILIBDIR="-L$withval"],
[AS_IF([test x"$BMIDIR" != x], [BMILIBDIR="-L$BMIDIR"lib])])
AC_ARG_WITH(bmi-lib,
AC_HELP_STRING([--with-bmi-lib=BMILIB], [use given bmi lib, default: $bmi_lib_default]),

Просмотреть файл

@ -17,8 +17,8 @@ AC_DEFUN([ACVT_JVMTI],
AC_ARG_WITH(jvmti-inc-dir,
AC_HELP_STRING([--with-jvmti-inc-dir=JVMTIINCDIR],
[give the path for JVMTI-include files, default: JVMTI/include]),
[JVMTIINCDIR="-I$withval/"],
[AS_IF([test x"$JVMTIDIR" != x], [JVMTIINCDIR="-I$JVMTIDIR"include/])])
[JVMTIINCDIR="-I$withval"],
[AS_IF([test x"$JVMTIDIR" != x], [JVMTIINCDIR="-I$JVMTIDIR"include])])
extra_inc_dir=
case $PLATFORM in
@ -32,8 +32,8 @@ AC_DEFUN([ACVT_JVMTI],
AS_IF([test x"$extra_inc_dir" != x],
[
AS_IF([test x"$JVMTIINCDIR" != x],
[JVMTIINCDIR="$JVMTIINCDIR $JVMTIINCDIR$extra_inc_dir/"],
[JVMTIINCDIR="-I/usr/include/$extra_inc_dir/"])
[JVMTIINCDIR="$JVMTIINCDIR $JVMTIINCDIR/$extra_inc_dir"],
[JVMTIINCDIR="-I/usr/include/$extra_inc_dir"])
])
sav_CPPFLAGS=$CPPFLAGS

Просмотреть файл

@ -21,14 +21,14 @@ AC_DEFUN([ACVT_LIBERTY],
AC_ARG_WITH(liberty-inc-dir,
AC_HELP_STRING([--with-liberty-inc-dir=LIBERTYINCDIR],
[give the path for LIBERTY-include files, default: LIBERTYDIR/include]),
[LIBERTYINCDIR="-I$withval/"],
[AS_IF([test x"$LIBERTYDIR" != x], [LIBERTYINCDIR="-I$LIBERTYDIR"include/])])
[LIBERTYINCDIR="-I$withval"],
[AS_IF([test x"$LIBERTYDIR" != x], [LIBERTYINCDIR="-I$LIBERTYDIR"include])])
AC_ARG_WITH(liberty-lib-dir,
AC_HELP_STRING([--with-liberty-lib-dir=LIBERTYLIBDIR],
[give the path for LIBERTY-libraries, default: LIBERTYDIR/lib]),
[LIBERTYLIBDIR="-L$withval/"],
[AS_IF([test x"$LIBERTYDIR" != x], [LIBERTYLIBDIR="-L$LIBERTYDIR"lib/])])
[LIBERTYLIBDIR="-L$withval"],
[AS_IF([test x"$LIBERTYDIR" != x], [LIBERTYLIBDIR="-L$LIBERTYDIR"lib])])
AC_ARG_WITH(liberty-lib,
AC_HELP_STRING([--with-liberty-lib=LIBERTYLIB], [use given liberty lib, default: -liberty]),

Просмотреть файл

@ -68,19 +68,19 @@ dnl further presets below when handling '--with-openmpi[17]'
AC_ARG_WITH(mpi-inc-dir,
AC_HELP_STRING([--with-mpi-inc-dir=MPIINCDIR],
[give the path for MPI-include files, default: MPIDIR/include]),
[MPIINCDIR="-I$withval/"],
[AS_IF([test x"$MPIDIR" != x], [MPIINCDIR="-I$MPIDIR"include/])])
[MPIINCDIR="-I$withval"],
[AS_IF([test x"$MPIDIR" != x], [MPIINCDIR="-I$MPIDIR"include])])
AC_ARG_WITH(fmpi-inc-dir,
AC_HELP_STRING([--with-fmpi-inc-dir=FMPIINCDIR],
[give the path for Fortran MPI-include files, default: MPIINCDIR]),
[FMPIINCDIR="-I$withval/"], [FMPIINCDIR="$MPIINCDIR"])
[FMPIINCDIR="-I$withval"], [FMPIINCDIR="$MPIINCDIR"])
AC_ARG_WITH(mpi-lib-dir,
AC_HELP_STRING([--with-mpi-lib-dir=MPILIBDIR],
[give the path for MPI-libraries, default: MPIDIR/lib]),
[MPILIBDIR="-L$withval/"],
[AS_IF([test x"$MPIDIR" != x], [MPILIBDIR="-L$MPIDIR"lib/])])
[MPILIBDIR="-L$withval"],
[AS_IF([test x"$MPIDIR" != x], [MPILIBDIR="-L$MPIDIR"lib])])
AC_ARG_WITH(hpmpi,
AC_HELP_STRING([--with-hpmpi], [set MPI-libs for HP MPI]))

Просмотреть файл

@ -21,15 +21,15 @@ AC_DEFUN([ACVT_OTF],
AC_ARG_WITH(extern-otf-inc-dir,
AC_HELP_STRING([--with-extern-otf-inc-dir=OTFINCDIR],
[give the path for OTF-include files, default: OTFDIR/include]),
[OTFINCDIR="-I$withval/"],
[AS_IF([test x"$OTFDIR" != x], [OTFINCDIR="-I$OTFDIR"include/])])
[give the path for OTF-include files, default: OTFDIR/include/open-trace-format]),
[OTFINCDIR="-I$withval"],
[AS_IF([test x"$OTFDIR" != x], [OTFINCDIR="-I$OTFDIR"include/open-trace-format])])
AC_ARG_WITH(extern-otf-lib-dir,
AC_HELP_STRING([--with-extern-otf-lib-dir=OTFLIBDIR],
[give the path for OTF-libraries, default: OTFDIR/lib]),
[OTFLIBDIR="-L$withval/"],
[AS_IF([test x"$OTFDIR" != x], [OTFLIBDIR="-L$OTFDIR"lib/])])
[OTFLIBDIR="-L$withval"],
[AS_IF([test x"$OTFDIR" != x], [OTFLIBDIR="-L$OTFDIR"lib])])
AC_ARG_WITH(otf-lib,
AC_HELP_STRING([--with-otf-lib=OTFLIB], [use given otf lib, default: -lopen-trace-format ZLIBLIBDIR ZLIBLIB ZOIDFSLIBDIR ZOIDFSLIB BMILIBDIR BMILIB]),

Просмотреть файл

@ -16,14 +16,14 @@ AC_DEFUN([ACVT_PAPI],
AC_ARG_WITH(papi-inc-dir,
AC_HELP_STRING([--with-papi-inc-dir=PAPIINCDIR],
[give the path for PAPI-include files, default: PAPIDIR/include]),
[PAPIINCDIR="-I$withval/"],
[AS_IF([test x"$PAPIDIR" != x], [PAPIINCDIR="-I$PAPIDIR"include/])])
[PAPIINCDIR="-I$withval"],
[AS_IF([test x"$PAPIDIR" != x], [PAPIINCDIR="-I$PAPIDIR"include])])
AC_ARG_WITH(papi-lib-dir,
AC_HELP_STRING([--with-papi-lib-dir=PAPILIBDIR],
[give the path for PAPI-libraries, default: PAPIDIR/lib]),
[PAPILIBDIR="-L$withval/"],
[AS_IF([test x"$PAPIDIR" != x], [PAPILIBDIR="-L$PAPIDIR"lib/])])
[PAPILIBDIR="-L$withval"],
[AS_IF([test x"$PAPIDIR" != x], [PAPILIBDIR="-L$PAPIDIR"lib])])
AC_ARG_WITH(papi-lib,
AC_HELP_STRING([--with-papi-lib=PAPILIB], [use given papi lib, default: -lpapi]),

Просмотреть файл

@ -22,14 +22,14 @@ AC_DEFUN([ACVT_ZLIB],
AC_ARG_WITH(zlib-inc-dir,
AC_HELP_STRING([--with-zlib-inc-dir=ZLIBINCDIR],
[give the path for ZLIB-include files, default: ZLIBDIR/include]),
[ZLIBINCDIR="-I$withval/"],
[AS_IF([test x"$ZLIBDIR" != x], [ZLIBINCDIR="-I$ZLIBDIR"include/])])
[ZLIBINCDIR="-I$withval"],
[AS_IF([test x"$ZLIBDIR" != x], [ZLIBINCDIR="-I$ZLIBDIR"include])])
AC_ARG_WITH(zlib-lib-dir,
AC_HELP_STRING([--with-zlib-lib-dir=ZLIBLIBDIR],
[give the path for ZLIB-libraries, default: ZLIBDIR/lib]),
[ZLIBLIBDIR="-L$withval/"],
[AS_IF([test x"$ZLIBDIR" != x], [ZLIBLIBDIR="-L$ZLIBDIR"lib/])])
[ZLIBLIBDIR="-L$withval"],
[AS_IF([test x"$ZLIBDIR" != x], [ZLIBLIBDIR="-L$ZLIBDIR"lib])])
AC_ARG_WITH(zlib-lib,
AC_HELP_STRING([--with-zlib-lib=ZLIBLIB], [use given zlib lib, default: -lz]),