Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated configure scripts

Browse Source 
svn: r1171
This commit is contained in:
Don Allingham 2002-11-08 05:25:53 +00:00
parent acab84a596
commit 01557d9444
22 changed files with 21 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@ -20,7 +20,7 @@ install-data-hook:
rm -rf $(DESTDIR)$(scrollkeeper_localstate_dir)
$(mkinstalldirs) $(DESTDIR)$(scrollkeeper_localstate_dir)
$(mkinstalldirs) $(DESTDIR)$(localstatedir)/log
scrollkeeper-rebuilddb -p $(DESTDIR)$(scrollkeeper_localstate_dir)
# scrollkeeper-rebuilddb -p $(DESTDIR)$(scrollkeeper_localstate_dir)
# Remove generated files
uninstall-local:

3
Makefile.in
View File

@ -97,7 +97,6 @@ PYTHON_PLATFORM = @PYTHON_PLATFORM@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
RELEASE = @RELEASE@
SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@
STRIP = @STRIP@
SWIG = @SWIG@
@ -482,7 +481,7 @@ install-data-hook:
rm -rf $(DESTDIR)$(scrollkeeper_localstate_dir)
$(mkinstalldirs) $(DESTDIR)$(scrollkeeper_localstate_dir)
$(mkinstalldirs) $(DESTDIR)$(localstatedir)/log
scrollkeeper-rebuilddb -p $(DESTDIR)$(scrollkeeper_localstate_dir)
# scrollkeeper-rebuilddb -p $(DESTDIR)$(scrollkeeper_localstate_dir)
# Remove generated files
uninstall-local:

47
configure vendored
View File

@ -3811,53 +3811,9 @@ echo "${ECHO_T}ok" >&6
SCROLLKEEPER_REQUIRED=0.1.4
# Extract the first word of "scrollkeeper-config", so it can be a program name with args.
set dummy scrollkeeper-config; ac_word=$2
echo "$as_me:$LINENO: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_path_SCROLLKEEPER_CONFIG+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
case $SCROLLKEEPER_CONFIG in
[\\/]* | ?:[\\/]*)
ac_cv_path_SCROLLKEEPER_CONFIG="$SCROLLKEEPER_CONFIG" # 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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_SCROLLKEEPER_CONFIG="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
test -z "$ac_cv_path_SCROLLKEEPER_CONFIG" && ac_cv_path_SCROLLKEEPER_CONFIG="no"
;;
esac
fi
SCROLLKEEPER_CONFIG=$ac_cv_path_SCROLLKEEPER_CONFIG
DISABLE_SCROLLKEEPER=1
if test -n "$SCROLLKEEPER_CONFIG"; then
echo "$as_me:$LINENO: result: $SCROLLKEEPER_CONFIG" >&5
echo "${ECHO_T}$SCROLLKEEPER_CONFIG" >&6
else
echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6
fi
if test x$SCROLLKEEPER_CONFIG = xno; then
{ { echo "$as_me:$LINENO: error: Couldn't find scrollkeeper-config. Please install the scrollkeeper package." >&5
echo "$as_me: error: Couldn't find scrollkeeper-config. Please install the scrollkeeper package." >&2;}
{ (exit 1); exit 1; }; }
DISABLE_SCROLLKEEPER=1
fi
# Extract the first word of "jw", so it can be a program name with args.
set dummy jw; ac_word=$2
@ -4590,7 +4546,6 @@ s,@CCDEPMODE@,$CCDEPMODE,;t t
s,@CPP@,$CPP,;t t
s,@HAVE_PKG_CONFIG@,$HAVE_PKG_CONFIG,;t t
s,@SCROLLKEEPER_REQUIRED@,$SCROLLKEEPER_REQUIRED,;t t
s,@SCROLLKEEPER_CONFIG@,$SCROLLKEEPER_CONFIG,;t t
s,@DISABLE_SCROLLKEEPER@,$DISABLE_SCROLLKEEPER,;t t
s,@JW@,$JW,;t t
s,@HAVE_JW@,$HAVE_JW,;t t

15
configure.in
View File

@ -231,12 +231,15 @@ SCROLLKEEPER_REQUIRED=0.1.4
AC_SUBST(SCROLLKEEPER_REQUIRED)
dnl First see that *some* version of scrollkeeper is installed
AC_PATH_PROG(SCROLLKEEPER_CONFIG, scrollkeeper-config, no)
if test x$SCROLLKEEPER_CONFIG = xno; then
AC_MSG_ERROR(Couldn't find scrollkeeper-config. Please install the scrollkeeper package.)
DISABLE_SCROLLKEEPER=1
AC_SUBST(DISABLE_SCROLLKEEPER)
fi
dnl AC_PATH_PROG(SCROLLKEEPER_CONFIG, scrollkeeper-config, no)
dnl if test x$SCROLLKEEPER_CONFIG = xno; then
dnl AC_MSG_ERROR(Couldn't find scrollkeeper-config. Please install the scrollkeeper package.)
dnl DISABLE_SCROLLKEEPER=1
dnl AC_SUBST(DISABLE_SCROLLKEEPER)
dnl fi
DISABLE_SCROLLKEEPER=1
AC_SUBST(DISABLE_SCROLLKEEPER)
dnl ======================================================
dnl == GNOME modified DTD's need jw, not db2html

1
doc/Makefile.in
View File

@ -97,7 +97,6 @@ PYTHON_PLATFORM = @PYTHON_PLATFORM@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
RELEASE = @RELEASE@
SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@
STRIP = @STRIP@
SWIG = @SWIG@

1
doc/extending-gramps/C/Makefile.in
View File

@ -95,7 +95,6 @@ PYTHON_PLATFORM = @PYTHON_PLATFORM@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
RELEASE = @RELEASE@
SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@
STRIP = @STRIP@
SWIG = @SWIG@

1
doc/extending-gramps/Makefile.in
View File

@ -97,7 +97,6 @@ PYTHON_PLATFORM = @PYTHON_PLATFORM@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
RELEASE = @RELEASE@
SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@
STRIP = @STRIP@
SWIG = @SWIG@

1
doc/gramps-manual/C/Makefile.in
View File

@ -129,7 +129,6 @@ PYTHON_PLATFORM = @PYTHON_PLATFORM@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
RELEASE = @RELEASE@
SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@
STRIP = @STRIP@
SWIG = @SWIG@

1
doc/gramps-manual/Makefile.in
View File

@ -97,7 +97,6 @@ PYTHON_PLATFORM = @PYTHON_PLATFORM@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
RELEASE = @RELEASE@
SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@
STRIP = @STRIP@
SWIG = @SWIG@

2
doc/gramps.1
View File

@ -1,4 +1,4 @@
.TH gramps 1 "0.9.0pre2" "man page by Brandon L. Griffith" ""
.TH gramps 1 "0.9.0" "man page by Brandon L. Griffith" ""
.SH "NAME"
.LP
gramps \- Genealogical Research and Analysis Management Programming System

7
gramps.spec
View File

@ -64,6 +64,7 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/gramps/*.xpm
%{_datadir}/gramps/*.jpg
%{_datadir}/gramps/gramps.desktop
%{_datadir}/gramps/*.png
%{_datadir}/gramps/*.py
%{_datadir}/gramps/*.pyo
@ -84,12 +85,6 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/omf/gramps
%post
if which scrollkeeper-update>/dev/null 2>&1; then scrollkeeper-update; fi
%postun
if which scrollkeeper-update>/dev/null 2>&1; then scrollkeeper-update; fi
%changelog
* Fri Jun 14 2002 Donald Peterson <dpeterso@engr.ors.edu>
- add scrollkeeper dependencies and some file cleanup

7
gramps.spec.in
View File

@ -64,6 +64,7 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/gramps/*.xpm
%{_datadir}/gramps/*.jpg
%{_datadir}/gramps/gramps.desktop
%{_datadir}/gramps/*.png
%{_datadir}/gramps/*.py
%{_datadir}/gramps/*.pyo
@ -84,12 +85,6 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/omf/gramps
%post
if which scrollkeeper-update>/dev/null 2>&1; then scrollkeeper-update; fi
%postun
if which scrollkeeper-update>/dev/null 2>&1; then scrollkeeper-update; fi
%changelog
* Fri Jun 14 2002 Donald Peterson <dpeterso@engr.ors.edu>
- add scrollkeeper dependencies and some file cleanup

4
omf-install/Makefile.am
View File

@ -5,11 +5,11 @@ install-data-local:
-for file in $(srcdir)/*.omf; do \
$(INSTALL_DATA) $(srcdir)/$$file $(DESTDIR)$(omf_dest_dir); \
done
-scrollkeeper-update -p $(localstatedir)/scrollkeeper
# -scrollkeeper-update -p $(localstatedir)/scrollkeeper
uninstall-local:
-for file in $(srcdir)/*.omf; do \
basefile=`basename $$file`; \
rm -f $(omf_dest_dir)/$$basefile; \
done
-scrollkeeper-update -p $(localstatedir)/scrollkeeper
# -scrollkeeper-update -p $(localstatedir)/scrollkeeper

5
omf-install/Makefile.in
View File

@ -95,7 +95,6 @@ PYTHON_PLATFORM = @PYTHON_PLATFORM@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
RELEASE = @RELEASE@
SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@
STRIP = @STRIP@
SWIG = @SWIG@
@ -234,14 +233,14 @@ install-data-local:
-for file in $(srcdir)/*.omf; do \
$(INSTALL_DATA) $(srcdir)/$$file $(DESTDIR)$(omf_dest_dir); \
done
-scrollkeeper-update -p $(localstatedir)/scrollkeeper
# -scrollkeeper-update -p $(localstatedir)/scrollkeeper
uninstall-local:
-for file in $(srcdir)/*.omf; do \
basefile=`basename $$file`; \
rm -f $(omf_dest_dir)/$$basefile; \
done
-scrollkeeper-update -p $(localstatedir)/scrollkeeper
# -scrollkeeper-update -p $(localstatedir)/scrollkeeper
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:

2
src/Makefile.am
View File

@ -21,7 +21,7 @@ GLADEFILES := ${wildcard *.glade}
GRAPHICS := ${wildcard *.xpm} ${wildcard *.png} ${wildcard *.jpg}
# Other stuff that we need to install
pkgdata_DATA = ${INTLLIBS} ${GLADEFILES} ${GRAPHICS} gramps.desktop
pkgdata_DATA = ${INTLLIBS} ${GLADEFILES} ${GRAPHICS} gramps.desktop grampslib.so
EXTRA_DIST = grampslib.i

3
src/Makefile.in
View File

@ -95,7 +95,6 @@ PYTHON_PLATFORM = @PYTHON_PLATFORM@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
RELEASE = @RELEASE@
SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@
STRIP = @STRIP@
SWIG = @SWIG@
@ -133,7 +132,7 @@ GLADEFILES := ${wildcard *.glade}
GRAPHICS := ${wildcard *.xpm} ${wildcard *.png} ${wildcard *.jpg}
# Other stuff that we need to install
pkgdata_DATA = ${INTLLIBS} ${GLADEFILES} ${GRAPHICS} gramps.desktop
pkgdata_DATA = ${INTLLIBS} ${GLADEFILES} ${GRAPHICS} gramps.desktop grampslib.so
EXTRA_DIST = grampslib.i

1
src/data/Makefile.in
View File

@ -95,7 +95,6 @@ PYTHON_PLATFORM = @PYTHON_PLATFORM@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
RELEASE = @RELEASE@
SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@
STRIP = @STRIP@
SWIG = @SWIG@

1
src/data/templates/Makefile.in
View File

@ -96,7 +96,6 @@ PYTHON_PLATFORM = @PYTHON_PLATFORM@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
RELEASE = @RELEASE@
SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@
STRIP = @STRIP@
SWIG = @SWIG@

1
src/docgen/Makefile.in
View File

@ -95,7 +95,6 @@ PYTHON_PLATFORM = @PYTHON_PLATFORM@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
RELEASE = @RELEASE@
SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@
STRIP = @STRIP@
SWIG = @SWIG@

1
src/filters/Makefile.in
View File

@ -95,7 +95,6 @@ PYTHON_PLATFORM = @PYTHON_PLATFORM@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
RELEASE = @RELEASE@
SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@
STRIP = @STRIP@
SWIG = @SWIG@

1
src/plugins/Makefile.in
View File

@ -96,7 +96,6 @@ PYTHON_PLATFORM = @PYTHON_PLATFORM@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
RELEASE = @RELEASE@
SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@
STRIP = @STRIP@
SWIG = @SWIG@

1
src/po/Makefile.in
View File

@ -95,7 +95,6 @@ PYTHON_PLATFORM = @PYTHON_PLATFORM@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
RELEASE = @RELEASE@
SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@
STRIP = @STRIP@
SWIG = @SWIG@