mirror of
https://github.com/Gnucash/gnucash.git
synced 2025-02-20 11:48:30 -06:00
More work on the build system.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@2364 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Dave Peticolas
parent
78a9517e1d
commit
c4073fbfcf
@ -1,5 +1,12 @@
|
||||
2000-05-20 Dave Peticolas <peticola@cs.ucdavis.edu>
|
||||
|
||||
* configure.in: remove check for readline. guile-config should
|
||||
return the right values. Also, change LOCALE_DIR definition to
|
||||
$datadir/locale. This seems to be more correct.
|
||||
|
||||
* src/swig/perl5/Makefile.in: use -fPIC because it's needed on
|
||||
sparcs and doesn't seem to hurt for others.
|
||||
|
||||
* src/gnome/window-register.c (gnc_register_sort): just sort by the
|
||||
given key and then by the standard order.
|
||||
|
||||
|
||||
78
configure
vendored
78
configure
vendored
@ -1661,7 +1661,7 @@ if test "${with_locale_dir+set}" = set; then
|
||||
withval="$with_locale_dir"
|
||||
LOCALE_DIR="$with_locale_dir"
|
||||
else
|
||||
LOCALE_DIR="$prefix/share/locale"
|
||||
LOCALE_DIR="$datadir/locale"
|
||||
fi
|
||||
|
||||
|
||||
@ -4080,63 +4080,13 @@ rm -f conftest*
|
||||
#undo damage to CPPFLAGS
|
||||
CPPFLAGS="$OLDCPPFLAGS"
|
||||
|
||||
### --------------------------------------------------------------------------
|
||||
# If readline exists, just assume that guile needs it. It probably does.
|
||||
echo $ac_n "checking for readline in -lreadline""... $ac_c" 1>&6
|
||||
echo "configure:4087: checking for readline in -lreadline" >&5
|
||||
ac_lib_var=`echo readline'_'readline | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lreadline $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 4095 "configure"
|
||||
#include "confdefs.h"
|
||||
/* Override any gcc2 internal prototype to avoid an error. */
|
||||
/* We use char because int might match the return type of a gcc2
|
||||
builtin and then its argument prototype would still apply. */
|
||||
char readline();
|
||||
|
||||
int main() {
|
||||
readline()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:4106: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
else
|
||||
echo "configure: failed program was:" >&5
|
||||
cat conftest.$ac_ext >&5
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=no"
|
||||
fi
|
||||
rm -f conftest*
|
||||
LIBS="$ac_save_LIBS"
|
||||
|
||||
fi
|
||||
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
|
||||
echo "$ac_t""yes" 1>&6
|
||||
ac_tr_lib=HAVE_LIB`echo readline | sed -e 's/[^a-zA-Z0-9_]/_/g' \
|
||||
-e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
|
||||
cat >> confdefs.h <<EOF
|
||||
#define $ac_tr_lib 1
|
||||
EOF
|
||||
|
||||
LIBS="-lreadline $LIBS"
|
||||
|
||||
else
|
||||
echo "$ac_t""no" 1>&6
|
||||
fi
|
||||
|
||||
|
||||
|
||||
### --------------------------------------------------------------------------
|
||||
EXTRALIBS=`$GNOME_CONFIG_BIN --libs gtkxmhtml`
|
||||
|
||||
#check for gtkxmhtml, export library link to variable GTK_XMHTML
|
||||
echo $ac_n "checking for gtk_xmhtml_new in -lgtkxmhtml""... $ac_c" 1>&6
|
||||
echo "configure:4140: checking for gtk_xmhtml_new in -lgtkxmhtml" >&5
|
||||
echo "configure:4090: checking for gtk_xmhtml_new in -lgtkxmhtml" >&5
|
||||
ac_lib_var=`echo gtkxmhtml'_'gtk_xmhtml_new | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
@ -4144,7 +4094,7 @@ else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lgtkxmhtml $EXTRALIBS $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 4148 "configure"
|
||||
#line 4098 "configure"
|
||||
#include "confdefs.h"
|
||||
/* Override any gcc2 internal prototype to avoid an error. */
|
||||
/* We use char because int might match the return type of a gcc2
|
||||
@ -4155,7 +4105,7 @@ int main() {
|
||||
gtk_xmhtml_new()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:4159: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:4109: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
else
|
||||
@ -4186,7 +4136,7 @@ EXTRALIBS=`$GNOME_CONFIG_BIN --libs xml`
|
||||
|
||||
#check for libxml
|
||||
echo $ac_n "checking for xmlDefaultSAXHandlerInit in -lxml""... $ac_c" 1>&6
|
||||
echo "configure:4190: checking for xmlDefaultSAXHandlerInit in -lxml" >&5
|
||||
echo "configure:4140: checking for xmlDefaultSAXHandlerInit in -lxml" >&5
|
||||
ac_lib_var=`echo xml'_'xmlDefaultSAXHandlerInit | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
@ -4194,7 +4144,7 @@ else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lxml $EXTRALIBS $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 4198 "configure"
|
||||
#line 4148 "configure"
|
||||
#include "confdefs.h"
|
||||
/* Override any gcc2 internal prototype to avoid an error. */
|
||||
/* We use char because int might match the return type of a gcc2
|
||||
@ -4205,7 +4155,7 @@ int main() {
|
||||
xmlDefaultSAXHandlerInit()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:4209: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:4159: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
else
|
||||
@ -4243,7 +4193,7 @@ EXTRALIBS=`$GNOME_CONFIG_BIN --libs print`
|
||||
# check for gnome-print and enable it via HAVE_LIBGNOMEPRINT
|
||||
# if found
|
||||
echo $ac_n "checking for gnome_print_context_new in -lgnomeprint""... $ac_c" 1>&6
|
||||
echo "configure:4247: checking for gnome_print_context_new in -lgnomeprint" >&5
|
||||
echo "configure:4197: checking for gnome_print_context_new in -lgnomeprint" >&5
|
||||
ac_lib_var=`echo gnomeprint'_'gnome_print_context_new | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
@ -4251,7 +4201,7 @@ else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lgnomeprint $EXTRALIBS $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 4255 "configure"
|
||||
#line 4205 "configure"
|
||||
#include "confdefs.h"
|
||||
/* Override any gcc2 internal prototype to avoid an error. */
|
||||
/* We use char because int might match the return type of a gcc2
|
||||
@ -4262,7 +4212,7 @@ int main() {
|
||||
gnome_print_context_new()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:4266: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:4216: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
else
|
||||
@ -4305,7 +4255,7 @@ G_WRAP_LINK_ARGS=""
|
||||
# Extract the first word of "g-wrap-config", so it can be a program name with args.
|
||||
set dummy g-wrap-config; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:4309: checking for $ac_word" >&5
|
||||
echo "configure:4259: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_path_G_WRAP_CONFIG'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
@ -4349,7 +4299,7 @@ fi
|
||||
# Extract the first word of "g-wrap", so it can be a program name with args.
|
||||
set dummy g-wrap; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:4353: checking for $ac_word" >&5
|
||||
echo "configure:4303: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_path_G_WRAP'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
@ -4407,7 +4357,7 @@ GUILE_LINK_ARGS=""
|
||||
# Extract the first word of "guile-config", so it can be a program name with args.
|
||||
set dummy guile-config; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:4411: checking for $ac_word" >&5
|
||||
echo "configure:4361: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_path_GUILE_CONFIG'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
@ -4451,7 +4401,7 @@ fi
|
||||
# Extract the first word of "guile", so it can be a program name with args.
|
||||
set dummy guile; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:4455: checking for $ac_word" >&5
|
||||
echo "configure:4405: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_path_GUILE'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
||||
@ -89,7 +89,7 @@ AC_ARG_ENABLE( warnings,
|
||||
AC_ARG_WITH( locale-dir,
|
||||
[ --with-locale-dir=PATH specify where to look for locale-specific information],
|
||||
LOCALE_DIR="$with_locale_dir",
|
||||
LOCALE_DIR="$prefix/share/locale")
|
||||
LOCALE_DIR="$datadir/locale")
|
||||
|
||||
AC_SUBST(LOCALE_DIR)
|
||||
|
||||
@ -340,10 +340,6 @@ AC_TRY_CPP([#include <gtk-xmhtml/gtk-xmhtml.h>], AC_MSG_RESULT(yes) ,
|
||||
#undo damage to CPPFLAGS
|
||||
CPPFLAGS="$OLDCPPFLAGS"
|
||||
|
||||
### --------------------------------------------------------------------------
|
||||
# If readline exists, just assume that guile needs it. It probably does.
|
||||
AC_CHECK_LIB(readline, readline)
|
||||
|
||||
|
||||
### --------------------------------------------------------------------------
|
||||
EXTRALIBS=`$GNOME_CONFIG_BIN --libs gtkxmhtml`
|
||||
|
||||
@ -29,17 +29,16 @@ INCLPATH = \
|
||||
-I@top_srcdir@/src/engine \
|
||||
-I@top_srcdir@/src/engine/guid \
|
||||
-I@PERLINCL@/CORE \
|
||||
-I$(prefix)/include \
|
||||
`glib-config --cflags glib`
|
||||
-I$(prefix)/include
|
||||
|
||||
# set -Dbool=char because the perl headers need this
|
||||
# use -fpic so that we can create loadable module
|
||||
CFLAGS := @CFLAGS@ ${INCLPATH} -Dbool=char -fPIC
|
||||
CFLAGS = @CFLAGS@ ${INCLPATH} -Dbool=char -fPIC ${GLIB_CFLAGS}
|
||||
|
||||
LDFLAGS = @LDFLAGS@
|
||||
LDFLAGS = @LDFLAGS@ ${GLIB_LIBS}
|
||||
|
||||
SWIG_FLAGS := -stat -perl5 \
|
||||
-I.. -I@top_srcdir@/src/engine
|
||||
SWIG_FLAGS = -stat -perl5 \
|
||||
-I.. -I@top_srcdir@/src/engine
|
||||
|
||||
######################################################################
|
||||
# SEE Makefile.common for information about these variables.
|
||||
|
||||
Loading…
Reference in New Issue
Block a user