From 8be0e7376563386ed93b9f1c5e4858d2a943aa7b Mon Sep 17 00:00:00 2001 From: Don Allingham Date: Sun, 13 May 2001 19:42:15 +0000 Subject: [PATCH] Clean up the installation process. svn: r8 --- configure | 232 +++++++++++++++++++++++++++++++++++++++- configure.in | 2 + src/Date.py | 73 +++++++++---- src/Makefile.in | 10 +- src/OpenOfficeDoc.py | 76 ------------- src/data/Makefile.in | 6 +- src/filters/Makefile.in | 2 +- src/plugins/Makefile.in | 2 +- 8 files changed, 292 insertions(+), 111 deletions(-) diff --git a/configure b/configure index b88604054..edc94bf93 100755 --- a/configure +++ b/configure @@ -710,11 +710,234 @@ else fi +# Extract the first word of "gcc", so it can be a program name with args. +set dummy gcc; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:717: 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 + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else + 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_prog_CC="gcc" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +CC="$ac_cv_prog_CC" +if test -n "$CC"; then + echo "$ac_t""$CC" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +if test -z "$CC"; then + # Extract the first word of "cc", so it can be a program name with args. +set dummy cc; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:747: 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 + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_prog_rejected=no + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then + ac_prog_rejected=yes + continue + fi + ac_cv_prog_CC="cc" + break + fi + done + IFS="$ac_save_ifs" +if test $ac_prog_rejected = yes; then + # We found a bogon in the path, so make sure we never use it. + set dummy $ac_cv_prog_CC + shift + if test $# -gt 0; then + # We chose a different compiler from the bogus one. + # However, it has the same basename, so the bogon will be chosen + # first if we set CC to just the basename; use the full file name. + shift + set dummy "$ac_dir/$ac_word" "$@" + shift + ac_cv_prog_CC="$@" + fi +fi +fi +fi +CC="$ac_cv_prog_CC" +if test -n "$CC"; then + echo "$ac_t""$CC" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + + if test -z "$CC"; then + case "`uname -s`" in + *win32* | *WIN32*) + # Extract the first word of "cl", so it can be a program name with args. +set dummy cl; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:798: 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 + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else + 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_prog_CC="cl" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +CC="$ac_cv_prog_CC" +if test -n "$CC"; then + echo "$ac_t""$CC" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + ;; + esac + fi + test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; } +fi + +echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 +echo "configure:830: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 + +ac_ext=c +# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. +ac_cpp='$CPP $CPPFLAGS' +ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +cross_compiling=$ac_cv_prog_cc_cross + +cat > conftest.$ac_ext << EOF + +#line 841 "configure" +#include "confdefs.h" + +main(){return(0);} +EOF +if { (eval echo configure:846: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + ac_cv_prog_cc_works=yes + # If we can't run a trivial program, we are probably using a cross compiler. + if (./conftest; exit) 2>/dev/null; then + ac_cv_prog_cc_cross=no + else + ac_cv_prog_cc_cross=yes + fi +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + ac_cv_prog_cc_works=no +fi +rm -fr conftest* +ac_ext=c +# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. +ac_cpp='$CPP $CPPFLAGS' +ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +cross_compiling=$ac_cv_prog_cc_cross + +echo "$ac_t""$ac_cv_prog_cc_works" 1>&6 +if test $ac_cv_prog_cc_works = no; then + { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } +fi +echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 +echo "configure:872: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 +cross_compiling=$ac_cv_prog_cc_cross + +echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 +echo "configure:877: checking whether we are using GNU C" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.c <&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then + ac_cv_prog_gcc=yes +else + ac_cv_prog_gcc=no +fi +fi + +echo "$ac_t""$ac_cv_prog_gcc" 1>&6 + +if test $ac_cv_prog_gcc = yes; then + GCC=yes +else + GCC= +fi + +ac_test_CFLAGS="${CFLAGS+set}" +ac_save_CFLAGS="$CFLAGS" +CFLAGS= +echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 +echo "configure:905: checking whether ${CC-cc} accepts -g" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + echo 'void f(){}' > conftest.c +if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then + ac_cv_prog_cc_g=yes +else + ac_cv_prog_cc_g=no +fi +rm -f conftest* + +fi + +echo "$ac_t""$ac_cv_prog_cc_g" 1>&6 +if test "$ac_test_CFLAGS" = set; then + CFLAGS="$ac_save_CFLAGS" +elif test $ac_cv_prog_cc_g = yes; then + if test "$GCC" = yes; then + CFLAGS="-g -O2" + else + CFLAGS="-g" + fi +else + if test "$GCC" = yes; then + CFLAGS="-O2" + else + CFLAGS= + fi +fi + + # Extract the first word of "gnome-config", so it can be a program name with args. set dummy gnome-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:718: checking for $ac_word" >&5 +echo "configure:941: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_HAVE_GNOME_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -744,7 +967,7 @@ fi echo $ac_n "checking Python bindings for sax/xml""... $ac_c" 1>&6 -echo "configure:748: checking Python bindings for sax/xml" >&5 +echo "configure:971: checking Python bindings for sax/xml" >&5 cat > conftest.py <&6 echo $ac_n "checking Python bindings for gtk+""... $ac_c" 1>&6 -echo "configure:774: checking Python bindings for gtk+" >&5 +echo "configure:997: checking Python bindings for gtk+" >&5 cat > conftest.py <&6 echo $ac_n "checking Python bindings for GNOME""... $ac_c" 1>&6 -echo "configure:800: checking Python bindings for GNOME" >&5 +echo "configure:1023: checking Python bindings for GNOME" >&5 cat > conftest.py <\n') self.f.write('\n') self.f.close() - -if __name__ == "__main__": - doc = OpenOfficeDoc(PAPER_US_LETTER,PAPER_PORTRAIT) - foo = FontStyle() - foo.set_type_face(FONT_SANS_SERIF) - foo.set_color((255,0,0)) - foo.set_size(24) - - para = ParagraphStyle() - para.set_font(foo) - para.set_alignment(PARA_ALIGN_RIGHT) - doc.add_style("MyTitle",para) - - para = ParagraphStyle() - para.set_left_margin(1) - para.set_right_margin(1) - para.set_alignment(PARA_ALIGN_JUSTIFY) - doc.add_style("Normal",para) - - table = TableStyle() - table.set_width(10) - table.set_columns(2) - table.set_column_width(0,2) - table.set_column_width(1,8) - doc.add_table_style("Table1",table) - - - para = ParagraphStyle() - font = FontStyle() - font.set_type_face(FONT_SANS_SERIF) - font.set_bold(1) - font.set_size(16) - para.set_font(font) - doc.add_style("TableEntry",para) - - cell = TableCellStyle() - cell.set_bottom_border(1) - cell.set_top_border(1) - doc.add_cell_style("TableHeader",cell) - - cell = TableCellStyle() - doc.add_cell_style("TableContents",cell) - - doc.open("/home/dona/oo_test.sxw") - doc.start_paragraph("MyTitle") - doc.write_text("This is my Title") - doc.end_paragraph() - - doc.start_paragraph("Normal") - doc.write_text("This is a test of the emergency broadcast system. ") - doc.write_text("This is a only a test. Repeat. This is only a test. ") - doc.write_text("Had this been an actual emergency, we would not be here ") - doc.write_text("to give you this message.") - doc.end_paragraph() - doc.start_table("MyTable","Table1") - - doc.start_row() - doc.start_cell("TableHeader",2) - doc.start_paragraph("TableEntry") - doc.write_text("This is my Title") - doc.end_paragraph() - doc.end_cell() - doc.end_row() - - doc.start_row() - doc.start_cell("TableContents") - doc.write_text("Hello") - doc.end_cell() - doc.start_cell("TableContents") - doc.write_text("Goodbye") - doc.end_cell() - doc.end_row() - - doc.end_table() - doc.close() - diff --git a/src/data/Makefile.in b/src/data/Makefile.in index be62fa031..fcec17063 100644 --- a/src/data/Makefile.in +++ b/src/data/Makefile.in @@ -11,11 +11,11 @@ pycomp = ${srcdir}/py-compile all: install: - -mkdir ${data} - ${INSTALL} -c *.sxw ${data} + ${INSTALL} -d ${data} + ${INSTALL} -c *.sxd table.* ${data} uninstall: - rm ${data}/*.sxw + rm -f ${data}/*.sxd ${data}/table.html ${data}/table.sxc -rmdir ${data} clean: diff --git a/src/filters/Makefile.in b/src/filters/Makefile.in index 88a84e261..ceea39cef 100644 --- a/src/filters/Makefile.in +++ b/src/filters/Makefile.in @@ -13,7 +13,7 @@ all: ${pycomp} *.py install: - -mkdir ${filters} + ${INSTALL} -d ${filters} ${INSTALL} -c *.py *.pyo ${datadir}/filters uninstall: diff --git a/src/plugins/Makefile.in b/src/plugins/Makefile.in index 6c1d89a12..6718ab5b1 100644 --- a/src/plugins/Makefile.in +++ b/src/plugins/Makefile.in @@ -14,7 +14,7 @@ all: install: - -mkdir ${plugins} + ${INSTALL} -d ${plugins} ${INSTALL} -c *.py *.pyo *.glade ${plugins} uninstall: