Changeset 2416 for branches/blt4

Timestamp:

Aug 25, 2011, 8:05:51 PM (13 years ago)

Author:

gah

Message:

 

Location:

branches/blt4

Files:

• cf/rpLangPerl.m4 (modified) (1 diff)
• configure (modified) (5 diffs)
• configure.in (modified) (1 diff)
• lang/perl/Makefile.in (modified) (2 diffs)

branches/blt4/cf/rpLangPerl.m4

@@ -17 +17 @@
 PERL_CCFlAGS=
 PERL_VERSION_RV=
+XSUBPP=
 PERL_LIBSPEC=
 if test "$with_perl" != "no" ; then
   if test "$with_perl" != "yes" ; then 
     AC_PATH_PROG(PERL, perl, [], [$with_perl/bin:$with_perl])
+    AC_PATH_PROG(XSUBPP, xsubpp, [], [$with_perl/bin:$with_perl])
   else
     AC_PATH_PROG(PERL, perl)
+    AC_PATH_PROG(XSUBPP, xsubpp)
   fi
   if test "x${PERL}" != "x" ; then 

branches/blt4/configure

@@ -672 +672 @@
 JAVA
 PYTHON
+XSUBPP
 PERL
 mkoctfile2
@@ -7893 +7894 @@
 PERL_CCFlAGS=
 PERL_VERSION_RV=
+XSUBPP=
 PERL_LIBSPEC=
 if test "$with_perl" != "no" ; then
@@ -7937 +7939 @@
 
 
+    # Extract the first word of "xsubpp", so it can be a program name with args.
+set dummy xsubpp; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_XSUBPP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $XSUBPP in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_XSUBPP="$XSUBPP" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+as_dummy="$with_perl/bin:$with_perl"
+for as_dir in $as_dummy
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_XSUBPP="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+XSUBPP=$ac_cv_path_XSUBPP
+if test -n "$XSUBPP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XSUBPP" >&5
+$as_echo "$XSUBPP" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
   else
     # Extract the first word of "perl", so it can be a program name with args.
@@ -7972 +8015 @@
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PERL" >&5
 $as_echo "$PERL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+    # Extract the first word of "xsubpp", so it can be a program name with args.
+set dummy xsubpp; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_XSUBPP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $XSUBPP in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_XSUBPP="$XSUBPP" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_XSUBPP="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+XSUBPP=$ac_cv_path_XSUBPP
+if test -n "$XSUBPP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XSUBPP" >&5
+$as_echo "$XSUBPP" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
@@ -9556 +9639 @@
 
 MAKE=${make_command}
+
 
 

branches/blt4/configure.in

@@ -427 +427 @@
 AC_SUBST(TK_VERSION)
 AC_SUBST(VTKDIR)
+AC_SUBST(XSUBPP)
 
 ac_configure_args="--disable-threads --enable-shared"

branches/blt4/lang/perl/Makefile.in

@@ -46 +46 @@
 archlib         = @PERL_ARCHLIB@
 archlibexp      = @PERL_ARCHLIBEXP@
+XSUBPP          = @XSUBPP@
 
 name            = Rappture
@@ -70 +71 @@
 
 Rappture.cc: $(srcdir)/Rappture.xs
-        -$(PERL) $(privlib)/ExtUtils/xsubpp -C++ \
-                -typemap $(privlib)/ExtUtils/typemap -typemap typemap \
+        $(XSUBPP) -C++ -typemap $(privlib)/ExtUtils/typemap -typemap typemap \
                 $? > $@