Attachment #336912 for bug #436400

Lines 266-272 COPY_SOURCES_TGZ: COPY_SOURCES Link Here

(-)a/Makefile.in (-2 / +2 lines)
266	cd ../distr/build; tar -czf $(tm_devel).tar.gz $(tm_devel)	266	cd ../distr/build; tar -czf $(tm_devel).tar.gz $(tm_devel)
267		267
268	COPY_GUILE:	268	COPY_GUILE:
269	GUILE_DATA_PATH=`guile-config info pkgdatadir`; \	269	GUILE_DATA_PATH=`guile-config-1.8 info pkgdatadir`; \
270	export GUILE_DATA_PATH; \	270	export GUILE_DATA_PATH; \
271	GUILE_LOAD_PATH=`find $$GUILE_DATA_PATH -type d \| grep ice-9`; \	271	GUILE_LOAD_PATH=`find $$GUILE_DATA_PATH -type d \| grep ice-9`; \
272	export GUILE_LOAD_PATH; \	272	export GUILE_LOAD_PATH; \
Lines 521-527 WINDOWS_BUNDLE: TEXMACS Link Here
521	$(MV) $(WINDOWS_BUILD_DIR)/bin/texmacs.bin \	521	$(MV) $(WINDOWS_BUILD_DIR)/bin/texmacs.bin \
522	$(WINDOWS_BUILD_DIR)/bin/texmacs.exe	522	$(WINDOWS_BUILD_DIR)/bin/texmacs.exe
523	$(RM) -r $(WINDOWS_BUILD_DIR)/bin/texmacs	523	$(RM) -r $(WINDOWS_BUILD_DIR)/bin/texmacs
524	GUILE_DATA_PATH=`guile-config info pkgdatadir`; \	524	GUILE_DATA_PATH=`guile-config-1.8 info pkgdatadir`; \
525	export GUILE_DATA_PATH; \	525	export GUILE_DATA_PATH; \
526	GUILE_LOAD_PATH=`find $$GUILE_DATA_PATH -type d \| grep ice-9`; \	526	GUILE_LOAD_PATH=`find $$GUILE_DATA_PATH -type d \| grep ice-9`; \
527	export GUILE_LOAD_PATH; \	527	export GUILE_LOAD_PATH; \




## The GUILE_FLAGS macro.
  ## First, let's just see if we can find Guile at all.
  AC_MSG_CHECKING(for Guile)
  guile-config-1.8 link > /dev/null || {
    echo "configure: cannot find guile-config-1.8; is Guile installed?" 1>&2
    exit 1
  }
  GUILE_ORIGINAL_CFLAGS="`guile-config-1.8 compile`"
  GUILE_CFLAGS="$GUILE_ORIGINAL_CFLAGS"
  GUILE_VARIANT_CFLAGS="$GUILE_ORIGINAL_CFLAGS $GUILE_ORIGINAL_CFLAGS/guile $GUILE_ORIGINAL_CFLAGS/libguile"
  GUILE_LDFLAGS="`guile-config-1.8 link`"
  GUILE_VARIANT_LDFLAGS="-L`guile-config-1.8 info libdir` -lguile -lreadline -ltermcap"
  AC_SUBST(GUILE_CFLAGS)
  AC_SUBST(GUILE_LDFLAGS)
  AC_MSG_RESULT(yes)




#  Guile_LIBRARIES - link these to use Freetype
#  Guile_VERSION_STRING - version of Guile

FIND_PROGRAM(GUILECONFIG_EXECUTABLE NAMES guile-config-1.8 )

# if guile-config-1.8 has been found
IF(GUILECONFIG_EXECUTABLE)

  EXECUTE_PROCESS(COMMAND ${GUILECONFIG_EXECUTABLE} link 
    OUTPUT_VARIABLE _guileconfigDevNull RESULT_VARIABLE _return_VALUE  )

  # and if the package of interest also exists for guile-config-1.8, then get the information
  IF(NOT _return_VALUE)

    EXECUTE_PROCESS(COMMAND ${GUILECONFIG_EXECUTABLE}  link 

    
  ELSE( NOT _return_VALUE)

    MESSAGE(STATUS "guile-config-1.8 not working; I assume guile is not installed.")

  ENDIF(NOT _return_VALUE)

ELSE(GUILECONFIG_EXECUTABLE)

    MESSAGE(STATUS "guile-config-1.8 not found; I assume guile is not installed.")


ENDIF(GUILECONFIG_EXECUTABLE)




  ## First, let's just see if we can find Guile at all.
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Guile" >&5
$as_echo_n "checking for Guile... " >&6; }
  guile-config-1.8 link > /dev/null || {
    echo "configure: cannot find guile-config-1.8; is Guile installed?" 1>&2
    exit 1
  }
  GUILE_ORIGINAL_CFLAGS="`guile-config-1.8 compile`"
  GUILE_CFLAGS="$GUILE_ORIGINAL_CFLAGS"
  GUILE_VARIANT_CFLAGS="$GUILE_ORIGINAL_CFLAGS $GUILE_ORIGINAL_CFLAGS/guile $GUILE_ORIGINAL_CFLAGS/libguile"
  GUILE_LDFLAGS="`guile-config-1.8 link`"
  GUILE_VARIANT_LDFLAGS="-L`guile-config-1.8 info libdir` -lguile -lreadline -ltermcap"


  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking guile data path" >&5
$as_echo_n "checking guile data path... " >&6; }
if test -z "$GUILE_DATA_PATH" ; then
  GUILE_DATA_PATH=`guile-config-1.8 info pkgdatadir`
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $GUILE_DATA_PATH" >&5
$as_echo "$GUILE_DATA_PATH" >&6; }

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ... arguments behave correctly" >&5
$as_echo_n "checking whether ... arguments behave correctly... " >&6; }
if test -z "$GUILE_CFLAGS"; then
  CXXFLAGS="`guile-config-1.8 compile`"
else
  CXXFLAGS="$GUILE_CFLAGS"
fi

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the size_t of guile strings" >&5
$as_echo_n "checking the size_t of guile strings... " >&6; }
if test -z "$GUILE_CFLAGS"; then
  CXXFLAGS="`guile-config-1.8 compile`"
else
  CXXFLAGS="$GUILE_CFLAGS"
fi




AC_MSG_RESULT($GUILE_VERSION)
AC_MSG_CHECKING(guile data path)
if test -z "$GUILE_DATA_PATH" ; then
  GUILE_DATA_PATH=`guile-config-1.8 info pkgdatadir`
fi
AC_MSG_RESULT($GUILE_DATA_PATH)



AC_MSG_CHECKING(whether ... arguments behave correctly)
if test -z "$GUILE_CFLAGS"; then
  CXXFLAGS="`guile-config-1.8 compile`"
else
  CXXFLAGS="$GUILE_CFLAGS"
fi


AC_MSG_CHECKING(the size_t of guile strings)
if test -z "$GUILE_CFLAGS"; then
  CXXFLAGS="`guile-config-1.8 compile`"
else
  CXXFLAGS="$GUILE_CFLAGS"
fi

Lines 43-49 make STATIC_TEXMACS Link Here

(-)a/packages/redhat/TeXmacs.spec (-1 / +1 lines)
43		43
44	%install	44	%install
45	make DESTDIR=$RPM_BUILD_ROOT install	45	make DESTDIR=$RPM_BUILD_ROOT install
46	export GUILE_DATA_PATH=`guile-config info pkgdatadir`	46	export GUILE_DATA_PATH=`guile-config-1.8 info pkgdatadir`
47	export GUILE_LOAD_PATH=`find $GUILE_DATA_PATH -type d \| grep ice-9`	47	export GUILE_LOAD_PATH=`find $GUILE_DATA_PATH -type d \| grep ice-9`
48	cp -r -f $GUILE_LOAD_PATH $RPM_BUILD_ROOT%{_datadir}/TeXmacs/progs	48	cp -r -f $GUILE_LOAD_PATH $RPM_BUILD_ROOT%{_datadir}/TeXmacs/progs
49	chmod -f 644 $RPM_BUILD_ROOT%{_datadir}/TeXmacs/progs/ice-9/*	49	chmod -f 644 $RPM_BUILD_ROOT%{_datadir}/TeXmacs/progs/ice-9/*

Lines 43-49 make STATIC_TEXMACS Link Here

(-)a/packages/redhat/TeXmacs.spec.in (-1 / +1 lines)
43		43
44	%install	44	%install
45	make DESTDIR=$RPM_BUILD_ROOT install	45	make DESTDIR=$RPM_BUILD_ROOT install
46	export GUILE_DATA_PATH=`guile-config info pkgdatadir`	46	export GUILE_DATA_PATH=`guile-config-1.8 info pkgdatadir`
47	export GUILE_LOAD_PATH=`find $GUILE_DATA_PATH -type d \| grep ice-9`	47	export GUILE_LOAD_PATH=`find $GUILE_DATA_PATH -type d \| grep ice-9`
48	cp -r -f $GUILE_LOAD_PATH $RPM_BUILD_ROOT%{_datadir}/TeXmacs/progs	48	cp -r -f $GUILE_LOAD_PATH $RPM_BUILD_ROOT%{_datadir}/TeXmacs/progs
49	chmod -f 644 $RPM_BUILD_ROOT%{_datadir}/TeXmacs/progs/ice-9/*	49	chmod -f 644 $RPM_BUILD_ROOT%{_datadir}/TeXmacs/progs/ice-9/*

Return to bug 436400

Lines 3941-3955 if test -z "$GUILE_CFLAGS" -a -z "$GUILE_LDFLAGS"; then Link Here

(-)a/configure (-8 / +8 lines)
3941	## First, let's just see if we can find Guile at all.	3941	## First, let's just see if we can find Guile at all.
3942	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Guile" >&5	3942	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Guile" >&5
3943	$as_echo_n "checking for Guile... " >&6; }	3943	$as_echo_n "checking for Guile... " >&6; }
3944	guile-config link > /dev/null \|\| {	3944	guile-config-1.8 link > /dev/null \|\| {
3945	echo "configure: cannot find guile-config; is Guile installed?" 1>&2	3945	echo "configure: cannot find guile-config-1.8; is Guile installed?" 1>&2
3946	exit 1	3946	exit 1
3947	}	3947	}
3948	GUILE_ORIGINAL_CFLAGS="`guile-config compile`"	3948	GUILE_ORIGINAL_CFLAGS="`guile-config-1.8 compile`"
3949	GUILE_CFLAGS="$GUILE_ORIGINAL_CFLAGS"	3949	GUILE_CFLAGS="$GUILE_ORIGINAL_CFLAGS"
3950	GUILE_VARIANT_CFLAGS="$GUILE_ORIGINAL_CFLAGS $GUILE_ORIGINAL_CFLAGS/guile $GUILE_ORIGINAL_CFLAGS/libguile"	3950	GUILE_VARIANT_CFLAGS="$GUILE_ORIGINAL_CFLAGS $GUILE_ORIGINAL_CFLAGS/guile $GUILE_ORIGINAL_CFLAGS/libguile"
3951	GUILE_LDFLAGS="`guile-config link`"	3951	GUILE_LDFLAGS="`guile-config-1.8 link`"
3952	GUILE_VARIANT_LDFLAGS="-L`guile-config info libdir` -lguile -lreadline -ltermcap"	3952	GUILE_VARIANT_LDFLAGS="-L`guile-config-1.8 info libdir` -lguile -lreadline -ltermcap"
3953		3953
3954		3954
3955	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5	3955	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
Lines 3966-3972 $as_echo "$GUILE_VERSION" >&6; } Link Here
3966	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking guile data path" >&5	3966	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking guile data path" >&5
3967	$as_echo_n "checking guile data path... " >&6; }	3967	$as_echo_n "checking guile data path... " >&6; }
3968	if test -z "$GUILE_DATA_PATH" ; then	3968	if test -z "$GUILE_DATA_PATH" ; then
3969	GUILE_DATA_PATH=`guile-config info pkgdatadir`	3969	GUILE_DATA_PATH=`guile-config-1.8 info pkgdatadir`
3970	fi	3970	fi
3971	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $GUILE_DATA_PATH" >&5	3971	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $GUILE_DATA_PATH" >&5
3972	$as_echo "$GUILE_DATA_PATH" >&6; }	3972	$as_echo "$GUILE_DATA_PATH" >&6; }
Lines 6139-6145 fi Link Here
6139	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ... arguments behave correctly" >&5	6139	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ... arguments behave correctly" >&5
6140	$as_echo_n "checking whether ... arguments behave correctly... " >&6; }	6140	$as_echo_n "checking whether ... arguments behave correctly... " >&6; }
6141	if test -z "$GUILE_CFLAGS"; then	6141	if test -z "$GUILE_CFLAGS"; then
6142	CXXFLAGS="`guile-config compile`"	6142	CXXFLAGS="`guile-config-1.8 compile`"
6143	else	6143	else
6144	CXXFLAGS="$GUILE_CFLAGS"	6144	CXXFLAGS="$GUILE_CFLAGS"
6145	fi	6145	fi
Lines 6181-6187 CXXFLAGS="" Link Here
6181	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the size_t of guile strings" >&5	6181	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the size_t of guile strings" >&5
6182	$as_echo_n "checking the size_t of guile strings... " >&6; }	6182	$as_echo_n "checking the size_t of guile strings... " >&6; }
6183	if test -z "$GUILE_CFLAGS"; then	6183	if test -z "$GUILE_CFLAGS"; then
6184	CXXFLAGS="`guile-config compile`"	6184	CXXFLAGS="`guile-config-1.8 compile`"
6185	else	6185	else
6186	CXXFLAGS="$GUILE_CFLAGS"	6186	CXXFLAGS="$GUILE_CFLAGS"
6187	fi	6187	fi

Lines 8-22 AC_DEFUN([GUILE_FLAGS],[ Link Here

(-)a/aclocal.m4 (-5 / +5 lines)
8	## The GUILE_FLAGS macro.	8	## The GUILE_FLAGS macro.
9	## First, let's just see if we can find Guile at all.	9	## First, let's just see if we can find Guile at all.
10	AC_MSG_CHECKING(for Guile)	10	AC_MSG_CHECKING(for Guile)
11	guile-config link > /dev/null \|\| {	11	guile-config-1.8 link > /dev/null \|\| {
12	echo "configure: cannot find guile-config; is Guile installed?" 1>&2	12	echo "configure: cannot find guile-config-1.8; is Guile installed?" 1>&2
13	exit 1	13	exit 1
14	}	14	}
15	GUILE_ORIGINAL_CFLAGS="`guile-config compile`"	15	GUILE_ORIGINAL_CFLAGS="`guile-config-1.8 compile`"
16	GUILE_CFLAGS="$GUILE_ORIGINAL_CFLAGS"	16	GUILE_CFLAGS="$GUILE_ORIGINAL_CFLAGS"
17	GUILE_VARIANT_CFLAGS="$GUILE_ORIGINAL_CFLAGS $GUILE_ORIGINAL_CFLAGS/guile $GUILE_ORIGINAL_CFLAGS/libguile"	17	GUILE_VARIANT_CFLAGS="$GUILE_ORIGINAL_CFLAGS $GUILE_ORIGINAL_CFLAGS/guile $GUILE_ORIGINAL_CFLAGS/libguile"
18	GUILE_LDFLAGS="`guile-config link`"	18	GUILE_LDFLAGS="`guile-config-1.8 link`"
19	GUILE_VARIANT_LDFLAGS="-L`guile-config info libdir` -lguile -lreadline -ltermcap"	19	GUILE_VARIANT_LDFLAGS="-L`guile-config-1.8 info libdir` -lguile -lreadline -ltermcap"
20	AC_SUBST(GUILE_CFLAGS)	20	AC_SUBST(GUILE_CFLAGS)
21	AC_SUBST(GUILE_LDFLAGS)	21	AC_SUBST(GUILE_LDFLAGS)
22	AC_MSG_RESULT(yes)	22	AC_MSG_RESULT(yes)

Lines 6-20 Link Here

(-)a/cmake/FindGuile.cmake (-5 / +5 lines)
6	# Guile_LIBRARIES - link these to use Freetype	6	# Guile_LIBRARIES - link these to use Freetype
7	# Guile_VERSION_STRING - version of Guile	7	# Guile_VERSION_STRING - version of Guile
8		8
9	FIND_PROGRAM(GUILECONFIG_EXECUTABLE NAMES guile-config )	9	FIND_PROGRAM(GUILECONFIG_EXECUTABLE NAMES guile-config-1.8 )
10		10
11	# if guile-config has been found	11	# if guile-config-1.8 has been found
12	IF(GUILECONFIG_EXECUTABLE)	12	IF(GUILECONFIG_EXECUTABLE)
13		13
14	EXECUTE_PROCESS(COMMAND ${GUILECONFIG_EXECUTABLE} link	14	EXECUTE_PROCESS(COMMAND ${GUILECONFIG_EXECUTABLE} link
15	OUTPUT_VARIABLE _guileconfigDevNull RESULT_VARIABLE _return_VALUE )	15	OUTPUT_VARIABLE _guileconfigDevNull RESULT_VARIABLE _return_VALUE )
16		16
17	# and if the package of interest also exists for guile-config, then get the information	17	# and if the package of interest also exists for guile-config-1.8, then get the information
18	IF(NOT _return_VALUE)	18	IF(NOT _return_VALUE)
19		19
20	EXECUTE_PROCESS(COMMAND ${GUILECONFIG_EXECUTABLE} link	20	EXECUTE_PROCESS(COMMAND ${GUILECONFIG_EXECUTABLE} link
Lines 80-92 IF(GUILECONFIG_EXECUTABLE) Link Here
80		80
81	ELSE( NOT _return_VALUE)	81	ELSE( NOT _return_VALUE)
82		82
83	MESSAGE(STATUS "guile-config not working; I assume guile is not installed.")	83	MESSAGE(STATUS "guile-config-1.8 not working; I assume guile is not installed.")
84		84
85	ENDIF(NOT _return_VALUE)	85	ENDIF(NOT _return_VALUE)
86		86
87	ELSE(GUILECONFIG_EXECUTABLE)	87	ELSE(GUILECONFIG_EXECUTABLE)
88		88
89	MESSAGE(STATUS "guile-config not found; I assume guile is not installed.")	89	MESSAGE(STATUS "guile-config-1.8 not found; I assume guile is not installed.")
90		90
91		91
92	ENDIF(GUILECONFIG_EXECUTABLE)	92	ENDIF(GUILECONFIG_EXECUTABLE)

Lines 76-82 fi Link Here

(-)a/configure.in (-3 / +3 lines)
76	AC_MSG_RESULT($GUILE_VERSION)	76	AC_MSG_RESULT($GUILE_VERSION)
77	AC_MSG_CHECKING(guile data path)	77	AC_MSG_CHECKING(guile data path)
78	if test -z "$GUILE_DATA_PATH" ; then	78	if test -z "$GUILE_DATA_PATH" ; then
79	GUILE_DATA_PATH=`guile-config info pkgdatadir`	79	GUILE_DATA_PATH=`guile-config-1.8 info pkgdatadir`
80	fi	80	fi
81	AC_MSG_RESULT($GUILE_DATA_PATH)	81	AC_MSG_RESULT($GUILE_DATA_PATH)
82		82
Lines 445-451 fi Link Here
445		445
446	AC_MSG_CHECKING(whether ... arguments behave correctly)	446	AC_MSG_CHECKING(whether ... arguments behave correctly)
447	if test -z "$GUILE_CFLAGS"; then	447	if test -z "$GUILE_CFLAGS"; then
448	CXXFLAGS="`guile-config compile`"	448	CXXFLAGS="`guile-config-1.8 compile`"
449	else	449	else
450	CXXFLAGS="$GUILE_CFLAGS"	450	CXXFLAGS="$GUILE_CFLAGS"
451	fi	451	fi
Lines 466-472 CXXFLAGS="" Link Here
466		466
467	AC_MSG_CHECKING(the size_t of guile strings)	467	AC_MSG_CHECKING(the size_t of guile strings)
468	if test -z "$GUILE_CFLAGS"; then	468	if test -z "$GUILE_CFLAGS"; then
469	CXXFLAGS="`guile-config compile`"	469	CXXFLAGS="`guile-config-1.8 compile`"
470	else	470	else
471	CXXFLAGS="$GUILE_CFLAGS"	471	CXXFLAGS="$GUILE_CFLAGS"
472	fi	472	fi

Lines 168-174 init_guile () { Link Here

(-)a/src/System/Boot/init_texmacs.cpp (-2 / +2 lines)
168	/*	168	/*
169	if (!exists ("$GUILE_LOAD_PATH/ice-9/boot-9.scm")) {	169	if (!exists ("$GUILE_LOAD_PATH/ice-9/boot-9.scm")) {
170	int i;	170	int i;
171	string guile_data = var_eval_system ("guile-config info datadir");	171	string guile_data = var_eval_system ("guile-config-1.8 info datadir");
172	string guile_version = var_eval_system ("guile --version");	172	string guile_version = var_eval_system ("guile --version");
173	for (i=0; i<N(guile_version); i++)	173	for (i=0; i<N(guile_version); i++)
174	if (guile_version[i] == '\n') break;	174	if (guile_version[i] == '\n') break;
Lines 177-183 init_guile () { Link Here
177	if (guile_version[i-1] == ' ') break;	177	if (guile_version[i-1] == ' ') break;
178	guile_version= guile_version (i, N (guile_version));	178	guile_version= guile_version (i, N (guile_version));
179	if (guile_version == "") {	179	if (guile_version == "") {
180	var_eval_system ("guile-config info top_srcdir");	180	var_eval_system ("guile-config-1.8 info top_srcdir");
181	for (i=N(guile_version); i>0; i--)	181	for (i=N(guile_version); i>0; i--)
182	if (guile_version[i-1] == '-') break;	182	if (guile_version[i-1] == '-') break;
183	guile_version= guile_version (i, N (guile_version));	183	guile_version= guile_version (i, N (guile_version));