Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
emulab
emulab-devel
Commits
d1bf7d11
Commit
d1bf7d11
authored
Feb 02, 2005
by
Timothy Stack
Browse files
Fix python detection so it works on linux. Detect ulsshxmlrpc so we
can avoid building robots/tbsetdest.
parent
0489a3a0
Changes
3
Hide whitespace changes
Inline
Side-by-side
Makeconf.in
View file @
d1bf7d11
...
...
@@ -75,3 +75,5 @@ GTK_CONFIG = @GTK_CONFIG@
BRAINSTEM_DIR = @BRAINSTEM_DIR@
host_cpu = @host_cpu@
HAVE_ULXMLRPCPP = @HAVE_ULXMLRPCPP@
configure
View file @
d1bf7d11
...
...
@@ -598,6 +598,183 @@ fi
CPPFLAGS
=
"-I/usr/local/include"
# BEGIN Python detection.
for
ac_prog
in
python python2.4 python2.3 python2.2
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set
dummy
$ac_prog
;
ac_word
=
$2
echo
$ac_n
"checking for
$ac_word
""...
$ac_c
"
1>&6
echo
"configure:610: checking for
$ac_word
"
>
&5
if
eval
"test
\"
`
echo
'$''{'
ac_cv_path_PYTHON
'+set}'
`
\"
= set"
;
then
echo
$ac_n
"(cached)
$ac_c
"
1>&6
else
case
"
$PYTHON
"
in
/
*
)
ac_cv_path_PYTHON
=
"
$PYTHON
"
# Let the user override the test with a path.
;;
?:/
*
)
ac_cv_path_PYTHON
=
"
$PYTHON
"
# Let the user override the test with a dos path.
;;
*
)
IFS
=
"
${
IFS
=
}
"
;
ac_save_ifs
=
"
$IFS
"
;
IFS
=
":"
ac_dummy
=
"
$PATH
"
for
ac_dir
in
$ac_dummy
;
do
test
-z
"
$ac_dir
"
&&
ac_dir
=
.
if
test
-f
$ac_dir
/
$ac_word
;
then
ac_cv_path_PYTHON
=
"
$ac_dir
/
$ac_word
"
break
fi
done
IFS
=
"
$ac_save_ifs
"
;;
esac
fi
PYTHON
=
"
$ac_cv_path_PYTHON
"
if
test
-n
"
$PYTHON
"
;
then
echo
"
$ac_t
""
$PYTHON
"
1>&6
else
echo
"
$ac_t
""no"
1>&6
fi
test
-n
"
$PYTHON
"
&&
break
done
if
test
x
"
$PYTHON
"
=
x
""
;
then
{
echo
"configure: error: python not detected"
1>&2
;
exit
1
;
}
fi
PYTHON_VERSION
=
`
${
PYTHON
}
-V
2>&1 |
cut
-d
' '
-f
2 |
cut
-d
'.'
-f
1,2
`
PYTHON_PATH
=
`
dirname
${
PYTHON
}
`
PYTHON_PATH
=
`
dirname
${
PYTHON_PATH
}
`
PYTHON_INCLUDE
=
"
${
PYTHON_PATH
}
/include/python
${
PYTHON_VERSION
}
"
CPPFLAGS
=
"
${
CPPFLAGS
}
-I
${
PYTHON_INCLUDE
}
"
echo
$ac_n
"checking how to run the C preprocessor""...
$ac_c
"
1>&6
echo
"configure:656: checking how to run the C preprocessor"
>
&5
# On Suns, sometimes $CPP names a directory.
if
test
-n
"
$CPP
"
&&
test
-d
"
$CPP
"
;
then
CPP
=
fi
if
test
-z
"
$CPP
"
;
then
if
eval
"test
\"
`
echo
'$''{'
ac_cv_prog_CPP
'+set}'
`
\"
= set"
;
then
echo
$ac_n
"(cached)
$ac_c
"
1>&6
else
# This must be in double quotes, not single quotes, because CPP may get
# substituted into the Makefile and "${CC-cc}" will confuse make.
CPP
=
"
${
CC
-cc
}
-E"
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp.
cat
>
conftest.
$ac_ext
<<
EOF
#line 671 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try
=
"
$ac_cpp
conftest.
$ac_ext
>/dev/null 2>conftest.out"
{
(
eval echo
configure:677:
\"
$ac_try
\"
)
1>&5
;
(
eval
$ac_try
)
2>&5
;
}
ac_err
=
`
grep
-v
'^ *+'
conftest.out |
grep
-v
"^conftest.
${
ac_ext
}
\$
"
`
if
test
-z
"
$ac_err
"
;
then
:
else
echo
"
$ac_err
"
>
&5
echo
"configure: failed program was:"
>
&5
cat
conftest.
$ac_ext
>
&5
rm
-rf
conftest
*
CPP
=
"
${
CC
-cc
}
-E -traditional-cpp"
cat
>
conftest.
$ac_ext
<<
EOF
#line 688 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try
=
"
$ac_cpp
conftest.
$ac_ext
>/dev/null 2>conftest.out"
{
(
eval echo
configure:694:
\"
$ac_try
\"
)
1>&5
;
(
eval
$ac_try
)
2>&5
;
}
ac_err
=
`
grep
-v
'^ *+'
conftest.out |
grep
-v
"^conftest.
${
ac_ext
}
\$
"
`
if
test
-z
"
$ac_err
"
;
then
:
else
echo
"
$ac_err
"
>
&5
echo
"configure: failed program was:"
>
&5
cat
conftest.
$ac_ext
>
&5
rm
-rf
conftest
*
CPP
=
"
${
CC
-cc
}
-nologo -E"
cat
>
conftest.
$ac_ext
<<
EOF
#line 705 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try
=
"
$ac_cpp
conftest.
$ac_ext
>/dev/null 2>conftest.out"
{
(
eval echo
configure:711:
\"
$ac_try
\"
)
1>&5
;
(
eval
$ac_try
)
2>&5
;
}
ac_err
=
`
grep
-v
'^ *+'
conftest.out |
grep
-v
"^conftest.
${
ac_ext
}
\$
"
`
if
test
-z
"
$ac_err
"
;
then
:
else
echo
"
$ac_err
"
>
&5
echo
"configure: failed program was:"
>
&5
cat
conftest.
$ac_ext
>
&5
rm
-rf
conftest
*
CPP
=
/lib/cpp
fi
rm
-f
conftest
*
fi
rm
-f
conftest
*
fi
rm
-f
conftest
*
ac_cv_prog_CPP
=
"
$CPP
"
fi
CPP
=
"
$ac_cv_prog_CPP
"
else
ac_cv_prog_CPP
=
"
$CPP
"
fi
echo
"
$ac_t
""
$CPP
"
1>&6
for
ac_hdr
in
Python.h
do
ac_safe
=
`
echo
"
$ac_hdr
"
|
sed
'y%./+-%__p_%'
`
echo
$ac_n
"checking for
$ac_hdr
""...
$ac_c
"
1>&6
echo
"configure:739: checking for
$ac_hdr
"
>
&5
if
eval
"test
\"
`
echo
'$''{'
ac_cv_header_
$ac_safe
'+set}'
`
\"
= set"
;
then
echo
$ac_n
"(cached)
$ac_c
"
1>&6
else
cat
>
conftest.
$ac_ext
<<
EOF
#line 744 "configure"
#include "confdefs.h"
#include <
$ac_hdr
>
EOF
ac_try
=
"
$ac_cpp
conftest.
$ac_ext
>/dev/null 2>conftest.out"
{
(
eval echo
configure:749:
\"
$ac_try
\"
)
1>&5
;
(
eval
$ac_try
)
2>&5
;
}
ac_err
=
`
grep
-v
'^ *+'
conftest.out |
grep
-v
"^conftest.
${
ac_ext
}
\$
"
`
if
test
-z
"
$ac_err
"
;
then
rm
-rf
conftest
*
eval
"ac_cv_header_
$ac_safe
=yes"
else
echo
"
$ac_err
"
>
&5
echo
"configure: failed program was:"
>
&5
cat
conftest.
$ac_ext
>
&5
rm
-rf
conftest
*
eval
"ac_cv_header_
$ac_safe
=no"
fi
rm
-f
conftest
*
fi
if
eval
"test
\"
`
echo
'$ac_cv_header_'
$ac_safe
`
\"
= yes"
;
then
echo
"
$ac_t
""yes"
1>&6
ac_tr_hdr
=
HAVE_
`
echo
$ac_hdr
|
sed
'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'
`
cat
>>
confdefs.h
<<
EOF
#define
$ac_tr_hdr
1
EOF
else
echo
"
$ac_t
""no"
1>&6
{
echo
"configure: error: "
Cannot find Python.h
in
${
PYTHON_INCLUDE
}
""
1>&2
;
exit
1
;
}
fi
done
# END Python detection.
# Make sure we can run config.sub.
if
${
CONFIG_SHELL
-/bin/sh
}
$ac_config_sub
sun4
>
/dev/null 2>&1
;
then
:
...
...
@@ -605,7 +782,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
fi
echo
$ac_n
"checking host system type""...
$ac_c
"
1>&6
echo
"configure:
609
: checking host system type"
>
&5
echo
"configure:
786
: checking host system type"
>
&5
host_alias
=
$host
case
"
$host_alias
"
in
...
...
@@ -626,7 +803,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
echo
"
$ac_t
""
$host
"
1>&6
echo
$ac_n
"checking build system type""...
$ac_c
"
1>&6
echo
"configure:
630
: checking build system type"
>
&5
echo
"configure:
807
: checking build system type"
>
&5
build_alias
=
$build
case
"
$build_alias
"
in
...
...
@@ -652,7 +829,7 @@ fi
# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
set
dummy
${
ac_tool_prefix
}
gcc
;
ac_word
=
$2
echo
$ac_n
"checking for
$ac_word
""...
$ac_c
"
1>&6
echo
"configure:
656
: checking for
$ac_word
"
>
&5
echo
"configure:
833
: checking for
$ac_word
"
>
&5
if
eval
"test
\"
`
echo
'$''{'
ac_cv_prog_CC
'+set}'
`
\"
= set"
;
then
echo
$ac_n
"(cached)
$ac_c
"
1>&6
else
...
...
@@ -684,7 +861,7 @@ fi
# Extract the first word of "${ac_tool_prefix}g++", so it can be a program name with args.
set
dummy
${
ac_tool_prefix
}
g++
;
ac_word
=
$2
echo
$ac_n
"checking for
$ac_word
""...
$ac_c
"
1>&6
echo
"configure:
688
: checking for
$ac_word
"
>
&5
echo
"configure:
865
: checking for
$ac_word
"
>
&5
if
eval
"test
\"
`
echo
'$''{'
ac_cv_prog_CXX
'+set}'
`
\"
= set"
;
then
echo
$ac_n
"(cached)
$ac_c
"
1>&6
else
...
...
@@ -716,7 +893,7 @@ fi
# Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
set
dummy
${
ac_tool_prefix
}
ar
;
ac_word
=
$2
echo
$ac_n
"checking for
$ac_word
""...
$ac_c
"
1>&6
echo
"configure:
720
: checking for
$ac_word
"
>
&5
echo
"configure:
897
: checking for
$ac_word
"
>
&5
if
eval
"test
\"
`
echo
'$''{'
ac_cv_prog_AR
'+set}'
`
\"
= set"
;
then
echo
$ac_n
"(cached)
$ac_c
"
1>&6
else
...
...
@@ -748,7 +925,7 @@ fi
# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
set
dummy
${
ac_tool_prefix
}
ranlib
;
ac_word
=
$2
echo
$ac_n
"checking for
$ac_word
""...
$ac_c
"
1>&6
echo
"configure:
752
: checking for
$ac_word
"
>
&5
echo
"configure:
929
: checking for
$ac_word
"
>
&5
if
eval
"test
\"
`
echo
'$''{'
ac_cv_prog_RANLIB
'+set}'
`
\"
= set"
;
then
echo
$ac_n
"(cached)
$ac_c
"
1>&6
else
...
...
@@ -780,7 +957,7 @@ fi
# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
set
dummy
${
ac_tool_prefix
}
strip
;
ac_word
=
$2
echo
$ac_n
"checking for
$ac_word
""...
$ac_c
"
1>&6
echo
"configure:
784
: checking for
$ac_word
"
>
&5
echo
"configure:
961
: checking for
$ac_word
"
>
&5
if
eval
"test
\"
`
echo
'$''{'
ac_cv_prog_STRIP
'+set}'
`
\"
= set"
;
then
echo
$ac_n
"(cached)
$ac_c
"
1>&6
else
...
...
@@ -813,7 +990,7 @@ fi
# Extract the first word of "elvin-config", so it can be a program name with args.
set
dummy elvin-config
;
ac_word
=
$2
echo
$ac_n
"checking for
$ac_word
""...
$ac_c
"
1>&6
echo
"configure:
817
: checking for
$ac_word
"
>
&5
echo
"configure:
994
: checking for
$ac_word
"
>
&5
if
eval
"test
\"
`
echo
'$''{'
ac_cv_path_ELVIN_CONFIG
'+set}'
`
\"
= set"
;
then
echo
$ac_n
"(cached)
$ac_c
"
1>&6
else
...
...
@@ -848,7 +1025,7 @@ fi
# Extract the first word of "javac", so it can be a program name with args.
set
dummy javac
;
ac_word
=
$2
echo
$ac_n
"checking for
$ac_word
""...
$ac_c
"
1>&6
echo
"configure:
852
: checking for
$ac_word
"
>
&5
echo
"configure:
1029
: checking for
$ac_word
"
>
&5
if
eval
"test
\"
`
echo
'$''{'
ac_cv_path_JAVAC
'+set}'
`
\"
= set"
;
then
echo
$ac_n
"(cached)
$ac_c
"
1>&6
else
...
...
@@ -883,7 +1060,7 @@ fi
# Extract the first word of "jar", so it can be a program name with args.
set
dummy jar
;
ac_word
=
$2
echo
$ac_n
"checking for
$ac_word
""...
$ac_c
"
1>&6
echo
"configure:
887
: checking for
$ac_word
"
>
&5
echo
"configure:
1064
: checking for
$ac_word
"
>
&5
if
eval
"test
\"
`
echo
'$''{'
ac_cv_path_JAR
'+set}'
`
\"
= set"
;
then
echo
$ac_n
"(cached)
$ac_c
"
1>&6
else
...
...
@@ -919,7 +1096,7 @@ fi
# Extract the first word of "${ac_tool_prefix}ssh", so it can be a program name with args.
set
dummy
${
ac_tool_prefix
}
ssh
;
ac_word
=
$2
echo
$ac_n
"checking for
$ac_word
""...
$ac_c
"
1>&6
echo
"configure:
923
: checking for
$ac_word
"
>
&5
echo
"configure:
1100
: checking for
$ac_word
"
>
&5
if
eval
"test
\"
`
echo
'$''{'
ac_cv_prog_SSH
'+set}'
`
\"
= set"
;
then
echo
$ac_n
"(cached)
$ac_c
"
1>&6
else
...
...
@@ -1593,103 +1770,73 @@ fi
#
# Check for
the robot vision system dependencies.
# Check for
ulsshxmlrpc header
#
echo
$ac_n
"checking how to run the C preprocessor""...
$ac_c
"
1>&6
echo
"configure:1600: checking how to run the C preprocessor"
>
&5
# On Suns, sometimes $CPP names a directory.
if
test
-n
"
$CPP
"
&&
test
-d
"
$CPP
"
;
then
CPP
=
fi
if
test
-z
"
$CPP
"
;
then
if
eval
"test
\"
`
echo
'$''{'
ac_cv_prog_CPP
'+set}'
`
\"
= set"
;
then
for
ac_hdr
in
ulxmlrpcpp/ulxr_config.h
do
ac_safe
=
`
echo
"
$ac_hdr
"
|
sed
'y%./+-%__p_%'
`
echo
$ac_n
"checking for
$ac_hdr
""...
$ac_c
"
1>&6
echo
"configure:1781: checking for
$ac_hdr
"
>
&5
if
eval
"test
\"
`
echo
'$''{'
ac_cv_header_
$ac_safe
'+set}'
`
\"
= set"
;
then
echo
$ac_n
"(cached)
$ac_c
"
1>&6
else
# This must be in double quotes, not single quotes, because CPP may get
# substituted into the Makefile and "${CC-cc}" will confuse make.
CPP
=
"
${
CC
-cc
}
-E"
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp.
cat
>
conftest.
$ac_ext
<<
EOF
#line 1615 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try
=
"
$ac_cpp
conftest.
$ac_ext
>/dev/null 2>conftest.out"
{
(
eval echo
configure:1621:
\"
$ac_try
\"
)
1>&5
;
(
eval
$ac_try
)
2>&5
;
}
ac_err
=
`
grep
-v
'^ *+'
conftest.out |
grep
-v
"^conftest.
${
ac_ext
}
\$
"
`
if
test
-z
"
$ac_err
"
;
then
:
else
echo
"
$ac_err
"
>
&5
echo
"configure: failed program was:"
>
&5
cat
conftest.
$ac_ext
>
&5
rm
-rf
conftest
*
CPP
=
"
${
CC
-cc
}
-E -traditional-cpp"
cat
>
conftest.
$ac_ext
<<
EOF
#line 1
632
"configure"
#line 1
786
"configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
#include <
$ac_hdr
>
EOF
ac_try
=
"
$ac_cpp
conftest.
$ac_ext
>/dev/null 2>conftest.out"
{
(
eval echo
configure:1
638
:
\"
$ac_try
\"
)
1>&5
;
(
eval
$ac_try
)
2>&5
;
}
{
(
eval echo
configure:1
791
:
\"
$ac_try
\"
)
1>&5
;
(
eval
$ac_try
)
2>&5
;
}
ac_err
=
`
grep
-v
'^ *+'
conftest.out |
grep
-v
"^conftest.
${
ac_ext
}
\$
"
`
if
test
-z
"
$ac_err
"
;
then
:
else
echo
"
$ac_err
"
>
&5
echo
"configure: failed program was:"
>
&5
cat
conftest.
$ac_ext
>
&5
rm
-rf
conftest
*
CPP
=
"
${
CC
-cc
}
-nologo -E"
cat
>
conftest.
$ac_ext
<<
EOF
#line 1649 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try
=
"
$ac_cpp
conftest.
$ac_ext
>/dev/null 2>conftest.out"
{
(
eval echo
configure:1655:
\"
$ac_try
\"
)
1>&5
;
(
eval
$ac_try
)
2>&5
;
}
ac_err
=
`
grep
-v
'^ *+'
conftest.out |
grep
-v
"^conftest.
${
ac_ext
}
\$
"
`
if
test
-z
"
$ac_err
"
;
then
:
eval
"ac_cv_header_
$ac_safe
=yes"
else
echo
"
$ac_err
"
>
&5
echo
"configure: failed program was:"
>
&5
cat
conftest.
$ac_ext
>
&5
rm
-rf
conftest
*
CPP
=
/lib/cpp
fi
rm
-f
conftest
*
fi
rm
-f
conftest
*
eval
"ac_cv_header_
$ac_safe
=no"
fi
rm
-f
conftest
*
ac_cv_prog_CPP
=
"
$CPP
"
fi
CPP
=
"
$ac_cv_prog_CPP
"
if
eval
"test
\"
`
echo
'$ac_cv_header_'
$ac_safe
`
\"
= yes"
;
then
echo
"
$ac_t
""yes"
1>&6
ac_tr_hdr
=
HAVE_
`
echo
$ac_hdr
|
sed
'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'
`
cat
>>
confdefs.h
<<
EOF
#define
$ac_tr_hdr
1
EOF
cat
>>
confdefs.h
<<
\
EOF
#define HAVE_ULXMLRPCPP 1
EOF
HAVE_ULXMLRPCPP
=
"yes"
else
ac_cv_prog_CPP
=
"
$CPP
"
echo
"
$ac_t
""no"
1>&6
fi
echo
"
$ac_t
""
$CPP
"
1>&6
done
#
# Check for the robot vision system dependencies.
#
for
ac_hdr
in
linux/videodev.h
do
ac_safe
=
`
echo
"
$ac_hdr
"
|
sed
'y%./+-%__p_%'
`
echo
$ac_n
"checking for
$ac_hdr
""...
$ac_c
"
1>&6
echo
"configure:1
6
83: checking for
$ac_hdr
"
>
&5
echo
"configure:183
0
: checking for
$ac_hdr
"
>
&5
if
eval
"test
\"
`
echo
'$''{'
ac_cv_header_
$ac_safe
'+set}'
`
\"
= set"
;
then
echo
$ac_n
"(cached)
$ac_c
"
1>&6
else
cat
>
conftest.
$ac_ext
<<
EOF
#line 1
688
"configure"
#line 1
835
"configure"
#include "confdefs.h"
#include <
$ac_hdr
>
EOF
ac_try
=
"
$ac_cpp
conftest.
$ac_ext
>/dev/null 2>conftest.out"
{
(
eval echo
configure:1
693
:
\"
$ac_try
\"
)
1>&5
;
(
eval
$ac_try
)
2>&5
;
}
{
(
eval echo
configure:1
840
:
\"
$ac_try
\"
)
1>&5
;
(
eval
$ac_try
)
2>&5
;
}
ac_err
=
`
grep
-v
'^ *+'
conftest.out |
grep
-v
"^conftest.
${
ac_ext
}
\$
"
`
if
test
-z
"
$ac_err
"
;
then
rm
-rf
conftest
*
...
...
@@ -1722,7 +1869,7 @@ done
# Extract the first word of "gtk-config", so it can be a program name with args.
set
dummy gtk-config
;
ac_word
=
$2
echo
$ac_n
"checking for
$ac_word
""...
$ac_c
"
1>&6
echo
"configure:1
726
: checking for
$ac_word
"
>
&5
echo
"configure:1
873
: checking for
$ac_word
"
>
&5
if
eval
"test
\"
`
echo
'$''{'
ac_cv_prog_GTK_CONFIG
'+set}'
`
\"
= set"
;
then
echo
$ac_n
"(cached)
$ac_c
"
1>&6
else
...
...
@@ -1786,17 +1933,6 @@ else
fi
# Deal with Python mess.
PYTHON_VERSION
=
`
python
-V
2>&1 |
sed
-E
-e
's/^[a-zA-Z\ ]*//'
-e
's/([0-9].[0-9]).*$/\1/'
`
PYTHON_INCLUDE
=
"/usr/local/include/python
${
PYTHON_VERSION
}
"
PYTHON_HEADER
=
"
${
PYTHON_INCLUDE
}
/Python.h"
if
test
!
-f
$PYTHON_HEADER
;
then
{
echo
"configure: error: Cannot find the Python header file Python.h"
1>&2
;
exit
1
;
}
fi
# Make sure $INSTALL is valid at any depth in our tree, i.e. make it absoulte.
# This can be needed when no valid install is found and autoconf falls back on
# the supplied install.sh, but we called 'configure' with a relative path.
...
...
@@ -1812,7 +1948,7 @@ fi
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
# ./install, which can be erroneously created by make from ./install.sh.
echo
$ac_n
"checking for a BSD compatible install""...
$ac_c
"
1>&6
echo
"configure:1
816
: checking for a BSD compatible install"
>
&5
echo
"configure:1
952
: checking for a BSD compatible install"
>
&5
if
test
-z
"
$INSTALL
"
;
then
if
eval
"test
\"
`
echo
'$''{'
ac_cv_path_install
'+set}'
`
\"
= set"
;
then
echo
$ac_n
"(cached)
$ac_c
"
1>&6
...
...
@@ -1873,7 +2009,7 @@ esac
# Extract the first word of "rsync", so it can be a program name with args.
set
dummy rsync
;
ac_word
=
$2
echo
$ac_n
"checking for
$ac_word
""...
$ac_c
"
1>&6
echo
"configure:
1877
: checking for
$ac_word
"
>
&5
echo
"configure:
2013
: checking for
$ac_word
"
>
&5
if
eval
"test
\"
`
echo
'$''{'
ac_cv_path_RSYNC
'+set}'
`
\"
= set"
;
then
echo
$ac_n
"(cached)
$ac_c
"
1>&6
else
...
...
@@ -2192,6 +2328,9 @@ s%@oldincludedir@%$oldincludedir%g
s%@infodir@%
$infodir
%g
s%@mandir@%
$mandir
%g
s%@PATH@%
$PATH
%g
s%@PYTHON@%
$PYTHON
%g
s%@CPP@%
$CPP
%g
s%@PYTHON_INCLUDE@%
$PYTHON_INCLUDE
%g
s%@host@%
$host
%g
s%@host_alias@%
$host_alias
%g
s%@host_cpu@%
$host_cpu
%g
...
...
@@ -2320,11 +2459,10 @@ s%@OPT_CFLAGS@%$OPT_CFLAGS%g
s%@EVENTSYS@%
$EVENTSYS
%g
s%@WINSUPPORT@%
$WINSUPPORT
%g
s%@EXE_SUFFIX@%
$EXE_SUFFIX
%g
s%@
CPP@%
$
CPP
%g
s%@
HAVE_ULXMLRPCPP@%
$HAVE_ULXMLRP
CPP
%g
s%@GTK_CONFIG@%
$GTK_CONFIG
%g
s%@HAVE_MEZZANINE@%
$HAVE_MEZZANINE
%g
s%@TESTMODE@%
$TESTMODE
%g
s%@PYTHON_INCLUDE@%
$PYTHON_INCLUDE
%g
s%@INSTALL_PROGRAM@%
$INSTALL_PROGRAM
%g
s%@INSTALL_SCRIPT@%
$INSTALL_SCRIPT
%g
s%@INSTALL_DATA@%
$INSTALL_DATA
%g
...
...
configure.in
View file @
d1bf7d11
...
...
@@ -21,6 +21,26 @@ fi
AC_SUBST(PATH)
CPPFLAGS="-I/usr/local/include"
# BEGIN Python detection.
AC_PATH_PROGS(PYTHON, python python2.4 python2.3 python2.2)
if test x"$PYTHON" = x""; then
AC_MSG_ERROR([python not detected])
fi
PYTHON_VERSION=`${PYTHON} -V 2>&1 | cut -d ' ' -f 2 | cut -d '.' -f 1,2`
PYTHON_PATH=`dirname ${PYTHON}`
PYTHON_PATH=`dirname ${PYTHON_PATH}`
PYTHON_INCLUDE="${PYTHON_PATH}/include/python${PYTHON_VERSION}"
CPPFLAGS="${CPPFLAGS} -I${PYTHON_INCLUDE}"
AC_CHECK_HEADERS([Python.h],
[],
[AC_MSG_ERROR("Cannot find Python.h in ${PYTHON_INCLUDE}")])
AC_SUBST(PYTHON_INCLUDE)
# END Python detection.
AC_CHECK_TOOL(CC,gcc)
AC_CHECK_TOOL(CXX,g++)
AC_CHECK_TOOL(AR,ar)
...
...
@@ -550,6 +570,15 @@ else
fi
AC_SUBST(EXE_SUFFIX)
#
# Check for ulsshxmlrpc header
#
AC_CHECK_HEADERS([ulxmlrpcpp/ulxr_config.h],
[AC_DEFINE(HAVE_ULXMLRPCPP)
HAVE_ULXMLRPCPP="yes"])
AC_SUBST(HAVE_ULXMLRPCPP)
#
# Check for the robot vision system dependencies.
#
...
...
@@ -585,19 +614,6 @@ else
fi
AC_SUBST(TESTMODE)
# Deal with Python mess.
changequote(START, END)dnl
PYTHON_VERSION=`python -V 2>&1 | sed -E -e 's/^[a-zA-Z\ ]*//' -e 's/([0-9].[0-9]).*$/\1/'`
changequote([, ])dnl
PYTHON_INCLUDE="/usr/local/include/python${PYTHON_VERSION}"
PYTHON_HEADER="${PYTHON_INCLUDE}/Python.h"
if test ! -f $PYTHON_HEADER; then
AC_MSG_ERROR([Cannot find the Python header file Python.h])
fi
AC_SUBST(PYTHON_INCLUDE)
# Make sure $INSTALL is valid at any depth in our tree, i.e. make it absoulte.
# This can be needed when no valid install is found and autoconf falls back on
# the supplied install.sh, but we called 'configure' with a relative path.
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment