Add a parameter to the FIND_STD_PROGRAM macro that allows an alternate name
for the command line options. This helps with situations where the executable name sought is too generic and a more meaningful name needs to be used for the command line options. It also helps satisfy picky project leaders. llvm-svn: 22461
This commit is contained in:
		
							parent
							
								
									e7e3c214cf
								
							
						
					
					
						commit
						012d35ae17
					
				| 
						 | 
					@ -24,23 +24,29 @@ fi
 | 
				
			||||||
dnl Find a program via --with options, in the path, or well known places
 | 
					dnl Find a program via --with options, in the path, or well known places
 | 
				
			||||||
dnl
 | 
					dnl
 | 
				
			||||||
dnl Parameters:
 | 
					dnl Parameters:
 | 
				
			||||||
dnl   $1 - program name
 | 
					dnl   $1 - program's executable name
 | 
				
			||||||
dnl   $2 - header file name to check (optional)
 | 
					dnl   $2 - header file name to check (optional)
 | 
				
			||||||
dnl   $3 - library file name to check (optional)
 | 
					dnl   $3 - library file name to check (optional)
 | 
				
			||||||
 | 
					dnl   $4 - alternate (long) name for the program
 | 
				
			||||||
AC_DEFUN([FIND_STD_PROGRAM],
 | 
					AC_DEFUN([FIND_STD_PROGRAM],
 | 
				
			||||||
[m4_define([allcapsname],translit($1,a-z,A-Z))
 | 
					[m4_define([allcapsname],translit($1,a-z,A-Z))
 | 
				
			||||||
AC_MSG_CHECKING([for ]$1[ bin/lib/include locations])
 | 
					m4_define([stdprog_long_name],ifelse($4,,translit($1,[ !@#$%^&*()-+={}[]:;"',./?],[-]),translit($4,[ !@#$%^&*()-+={}[]:;"',./?],[-])))
 | 
				
			||||||
 | 
					AC_MSG_CHECKING([for ]stdprog_long_name()[ bin/lib/include locations])
 | 
				
			||||||
AC_ARG_WITH($1,
 | 
					AC_ARG_WITH($1,
 | 
				
			||||||
  AS_HELP_STRING([--with-]$1[=DIR],[Specify that ]$1['s install prefix is DIR]),
 | 
					  AS_HELP_STRING([--with-]stdprog_long_name()[=DIR],
 | 
				
			||||||
    $1[pfxdir=$withval],$1[pfxdir=nada])
 | 
					  [Specify that the ]stdprog_long_name()[ install prefix is DIR]),
 | 
				
			||||||
 | 
					  $1[pfxdir=$withval],$1[pfxdir=nada])
 | 
				
			||||||
AC_ARG_WITH($1[-bin],
 | 
					AC_ARG_WITH($1[-bin],
 | 
				
			||||||
  AS_HELP_STRING([--with-]$1[-bin=DIR],[Specify that ]$1[ binary are in DIR]),
 | 
					  AS_HELP_STRING([--with-]stdprog_long_name()[-bin=DIR],
 | 
				
			||||||
 | 
					  [Specify that the ]stdprog_long_name()[ binary is in DIR]),
 | 
				
			||||||
    $1[bindir=$withval],$1[bindir=nada])
 | 
					    $1[bindir=$withval],$1[bindir=nada])
 | 
				
			||||||
AC_ARG_WITH($1[-lib],
 | 
					AC_ARG_WITH($1[-lib],
 | 
				
			||||||
  AS_HELP_STRING([--with-]$1[-lib=DIR],[Specify that ]$1[ libs are in DIR]),
 | 
					  AS_HELP_STRING([--with-]stdprog_long_name()[-lib=DIR],
 | 
				
			||||||
 | 
					  [Specify that ]stdprog_long_name()[ libraries are in DIR]),
 | 
				
			||||||
  $1[libdir=$withval],$1[libdir=nada])
 | 
					  $1[libdir=$withval],$1[libdir=nada])
 | 
				
			||||||
AC_ARG_WITH($1[-inc],
 | 
					AC_ARG_WITH($1[-inc],
 | 
				
			||||||
  AS_HELP_STRING([--with-]$1[-inc=DIR],[Specify that ]$1[ includes are in DIR]),
 | 
					  AS_HELP_STRING([--with-]stdprog_long_name()[-inc=DIR],
 | 
				
			||||||
 | 
					  [Specify that the ]stdprog_long_name()[ includes are in DIR]),
 | 
				
			||||||
  $1[incdir=$withval],$1[incdir=nada])
 | 
					  $1[incdir=$withval],$1[incdir=nada])
 | 
				
			||||||
pfxvar=$1pfxdir
 | 
					pfxvar=$1pfxdir
 | 
				
			||||||
binvar=$1bindir
 | 
					binvar=$1bindir
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue