mirror of
https://github.com/Gnucash/gnucash.git
synced 2025-02-25 18:55:30 -06:00
patch from rob
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@1651 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
24
configure.in
24
configure.in
@@ -16,7 +16,7 @@
|
||||
# Footer - Autoconf footer stuff
|
||||
|
||||
|
||||
### ------------------------------------------------------------------------------
|
||||
### --------------------------------------------------------------------------
|
||||
### Headers
|
||||
### check for various programs, and stuff (do this first because later
|
||||
### commands depend on them):
|
||||
@@ -29,7 +29,7 @@ AC_ISC_POSIX
|
||||
AC_C_BIGENDIAN
|
||||
AC_PROG_MAKE_SET
|
||||
|
||||
### ------------------------------------------------------------------------------
|
||||
### --------------------------------------------------------------------------
|
||||
### Variables
|
||||
### Set up all the initial variable values...
|
||||
|
||||
@@ -68,7 +68,7 @@ AC_ARG_ENABLE( warnings,
|
||||
LDFLAGS="${LDFLAGS} -g -Wall"
|
||||
AC_DEFINE(DEBUG_MEMORY,1) AC_DEFINE(USE_DEBUG,1) )
|
||||
|
||||
### ------------------------------------------------------------------------------
|
||||
### --------------------------------------------------------------------------
|
||||
### Programs
|
||||
|
||||
# Check for perl, force version 5
|
||||
@@ -145,7 +145,7 @@ AC_SUBST(GNOME_CONFIG_BIN)
|
||||
# --with-guile-config=...])
|
||||
# fi
|
||||
|
||||
### ------------------------------------------------------------------------------
|
||||
### --------------------------------------------------------------------------
|
||||
### Libraries
|
||||
LIBS="$LIBS -lm"
|
||||
|
||||
@@ -168,7 +168,7 @@ X_LIBS="$X_LIBS -lXext -lXmu -lXt -lX11"
|
||||
# XXX - Ask Motif what it wants
|
||||
MOTIF_LIBS="-lXm"
|
||||
|
||||
### ------------------------------------------------------------------------------
|
||||
### --------------------------------------------------------------------------
|
||||
### Motif libs -- these are needed for the motif builds only
|
||||
# Let the user specify motif paths:
|
||||
AC_ARG_WITH( motif,
|
||||
@@ -183,7 +183,7 @@ AC_ARG_WITH( motif-libraries,
|
||||
[ --with-motif-libraries=DIR specify where to look for motif libs],
|
||||
X_LIBS="${X_LIBS} -L$with_motif_libraries" )
|
||||
|
||||
### ------------------------------------------------------------------------------
|
||||
### --------------------------------------------------------------------------
|
||||
### Gnome libs -- these are needed for the gnome builds only
|
||||
# Let the user specify gnome paths:
|
||||
# -I...libgnomesupport is to fix bug in gnome-1.3 release
|
||||
@@ -203,12 +203,13 @@ AC_ARG_WITH( gnome-libraries,
|
||||
[ --with-gnome-libraries=DIR specify where to look for gnome libs],
|
||||
X_LIBS="${X_LIBS} -L$with_gnome_libraries" )
|
||||
|
||||
|
||||
# Let the user specify imlib paths:
|
||||
AC_ARG_WITH( imlib,
|
||||
[ --with-imlib=PATH specify where to look for imlib includes and libs],
|
||||
X_LIBS="${X_LIBS} -L$with_imlib/lib" X_CFLAGS="$X_CFLAGS -I$with_imlib/include" )
|
||||
|
||||
### ------------------------------------------------------------------------------
|
||||
### --------------------------------------------------------------------------
|
||||
# The XmHTML widget is used by motif and gnome alike.
|
||||
|
||||
AC_ARG_WITH( xmhtml-includes,
|
||||
@@ -247,7 +248,7 @@ AC_CHECK_LIB(XmHTML, XmHTMLTextScrollToLine,
|
||||
AC_SUBST(XMHTML_TARGET)
|
||||
AC_SUBST(XMHTML_INC)
|
||||
|
||||
### ------------------------------------------------------------------------------
|
||||
### --------------------------------------------------------------------------
|
||||
## Nana
|
||||
# XXX - There should probably be a --without-nana option (e.g., for
|
||||
# someone who happens to have it installed on his local machine, but
|
||||
@@ -258,7 +259,7 @@ AC_CHECK_HEADERS(nana.h)
|
||||
AC_CHECK_LIB(nana,L_buffer_create,
|
||||
LIBS="${LIBS} -lnana")
|
||||
|
||||
### ------------------------------------------------------------------------------
|
||||
### --------------------------------------------------------------------------
|
||||
# If readline exists, just assume that guile needs it. It probably does.
|
||||
AC_CHECK_LIB(readline, readline)
|
||||
|
||||
@@ -295,7 +296,7 @@ fi
|
||||
AC_SUBST(GUILE_INC)
|
||||
AC_SUBST(GUILELIBS)
|
||||
|
||||
### ------------------------------------------------------------------------------
|
||||
### --------------------------------------------------------------------------
|
||||
### Plotutils
|
||||
|
||||
AC_CHECK_LIB(plot, openpl,
|
||||
@@ -310,7 +311,7 @@ AC_SUBST(PLOTUTILS_LIBS)
|
||||
|
||||
AC_SUBST(MOTIF_LIBS)
|
||||
|
||||
### ------------------------------------------------------------------------------
|
||||
### --------------------------------------------------------------------------
|
||||
#############################################################
|
||||
### Set up the install style and all the default paths... ###
|
||||
|
||||
@@ -362,7 +363,6 @@ AC_SUBST(GTKSHEET_DIR)
|
||||
|
||||
CFLAGS="${CFLAGS} -Werror"
|
||||
|
||||
*******************************************
|
||||
AC_CONFIG_HEADER(config.h)
|
||||
|
||||
AC_OUTPUT(Makefile
|
||||
|
||||
Reference in New Issue
Block a user