[Gnupos-cvs] gnp-server .cvsignore,1.3,1.4 acconfig.h,1.1.1.1,1.2 aclocal.m4,1.1.1.1,1.2 config.h.in
Status: Pre-Alpha
Brought to you by:
conrad_c
Menu
▾
▴
[Gnupos-cvs] gnp-server .cvsignore,1.3,1.4 acconfig.h,1.1.1.1,1.2 aclocal.m4,1.1.1.1,1.2 config.h.in,1.1.1.1,1.2 configure.in,1.1.1.1,1.2
|
From: <con...@us...> - 2003-02-09 12:36:55
|
Update of /cvsroot/gnupos/gnp-server
In directory sc8-pr-cvs1:/tmp/cvs-serv7122
Modified Files:
.cvsignore acconfig.h aclocal.m4 config.h.in configure.in
Log Message:
Updates to make builds work, and fixes to popt stuff (so we don't require
gnome).
Index: .cvsignore
===================================================================
RCS file: /cvsroot/gnupos/gnp-server/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** .cvsignore 27 Jan 2003 12:34:02 -0000 1.3
--- .cvsignore 9 Feb 2003 12:36:49 -0000 1.4
***************
*** 6,7 ****
--- 6,11 ----
.deps
.libs
+ *.cache
+ .tm_project.cache
+ acconfig.h
+ aclocal.m4
Index: acconfig.h
===================================================================
RCS file: /cvsroot/gnupos/gnp-server/acconfig.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** acconfig.h 27 Jan 2003 12:21:48 -0000 1.1.1.1
--- acconfig.h 9 Feb 2003 12:36:49 -0000 1.2
***************
*** 5,8 ****
--- 5,9 ----
#undef HAVE_STPCPY
#undef HAVE_LIBSM
+ #undef HAVE_GUILE
#undef PACKAGE_LOCALE_DIR
#undef PACKAGE_DOC_DIR
Index: aclocal.m4
===================================================================
RCS file: /cvsroot/gnupos/gnp-server/aclocal.m4,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** aclocal.m4 27 Jan 2003 12:22:17 -0000 1.1.1.1
--- aclocal.m4 9 Feb 2003 12:36:49 -0000 1.2
***************
*** 561,564 ****
--- 561,581 ----
]) # _AM_DIRNAME
+ # aclocal-include.m4
+ #
+ # This macro adds the name macrodir to the set of directories
+ # that `aclocal' searches for macros.
+
+ # serial 1
+
+ dnl AM_ACLOCAL_INCLUDE(macrodir)
+ AC_DEFUN([AM_ACLOCAL_INCLUDE],
+ [
+ AM_CONDITIONAL(INSIDE_GNOME_COMMON, test x = y)
+
+ test -n "$ACLOCAL_FLAGS" && ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
+
+ for k in $1 ; do ACLOCAL="$ACLOCAL -I $k" ; done
+ ])
+
# isc-posix.m4 serial 1 (gettext-0.10.40)
dnl Copyright (C) 1995-2002 Free Software Foundation, Inc.
***************
*** 4166,4168 ****
--- 4183,4305 ----
# This is just to silence aclocal about the macro not being used
ifelse([AC_DISABLE_FAST_INSTALL])
+
+ dnl
+ dnl GNOME_CHECK_GUILE (failflag)
+ dnl
+ dnl if failflag is "fail" then GNOME_CHECK_GUILE will abort if guile is not found.
+ dnl
+
+ AC_DEFUN([GNOME_CHECK_GUILE],
+ [
+ saved_ldflags="$LDFLAGS"
+ saved_cppflags="$CPPFLAGS"
+ LDFLAGS="$LDFLAGS $GNOME_LIBDIR"
+
+ AC_CHECK_LIB(qthreads,qt_null,[
+ QTTHREADS_LIB="-lqthreads"
+ ],[
+ AC_CHECK_LIB(qt, qt_null, QTTHREADS_LIB="-lqt")
+ ],$LIBS)
+ AC_SUBST(QTTHREADS_LIB)
+
+ AC_CHECK_LIB(termcap,main,TERMCAP_LIB="-ltermcap")
+ AC_CHECK_LIB(readline,main,READLINE_LIB="-lreadline",,$TERMCAP_LIB)
+
+ AC_SUBST(TERMCAP_LIB)
+ AC_SUBST(READLINE_LIB)
+
+ if test "x$cross_compiling" = "xyes" ; then
+ name_build_guile="$target_alias-guile-config"
+ else
+ name_build_guile="guile-config"
+ fi
+
+ AC_CHECK_PROG(BUILD_GUILE, $name_build_guile, yes, no)
+
+ if test "x$BUILD_GUILE" = "xyes"; then
+ AC_MSG_CHECKING(whether $name_build_guile works)
+ if test x`$name_build_guile --version >/dev/null 2>&1 || \
+ echo no` = xno; then
+ BUILD_GUILE=no
+ fi
+ AC_MSG_RESULT($BUILD_GUILE)
+ else
+
+ if test "x$cross_compiling" = "xyes" ; then
+ name_build_guile="$target_alias-build-guile"
+ else
+ name_build_guile="build-guile"
+ fi
+
+ AC_CHECK_PROG(BUILD_GUILE, $name_build_guile, yes, no)
+
+ if test "x$BUILD_GUILE" = "xyes"; then
+ AC_MSG_CHECKING(whether $name_build_guile works)
+ if test x`$name_build_guile --version >/dev/null 2>&1 || \
+ echo no` = xno; then
+ BUILD_GUILE=no
+ fi
+ AC_MSG_RESULT($BUILD_GUILE)
+ fi
+ fi
+
+ AC_CHECK_LIB(m, sin)
+
+ if test "x$BUILD_GUILE" = "xyes"; then
+ AC_MSG_CHECKING(for guile libraries)
+ GUILE_LIBS="`$name_build_guile link`"
+ AC_MSG_RESULT($GUILE_LIBS)
+ AC_MSG_CHECKING(for guile headers)
+ GUILE_INCS="`$name_build_guile compile`"
+ AC_MSG_RESULT($GUILE_INCS)
+ else
+ GUILE_LIBS="$GNOME_LIBDIR"
+ GUILE_INCS="$GNOME_INCLUDEDIR"
+ AC_CHECK_LIB(rx, main, GUILE_LIBS="-lrx $GUILE_LIBS")
+ AC_CHECK_LIB(qt, qt_null, GUILE_LIBS="-lqt $GUILE_LIBS")
+ AC_CHECK_LIB(dl, dlopen, GUILE_LIBS="-ldl $GUILE_LIBS")
+ AC_CHECK_LIB(nsl, t_accept, GUILE_LIBS="$GUILE_LIBS -lnsl")
+ AC_CHECK_LIB(socket, socket, GUILE_LIBS="$GUILE_LIBS -lsocket")
+ GUILE_LIBS="-lguile $GUILE_LIBS $QTTHREADS_LIB $READLINE_LIB $TERMCAP_LIB"
+ fi
+
+ AC_SUBST(GUILE_LIBS)
+ AC_SUBST(GUILE_INCS)
+
+ saved_LIBS="$LIBS"
+ LIBS="$LIBS $GUILE_LIBS"
+ CPPFLAGS="$saved_cppflags $GUILE_INCS"
+
+ AC_MSG_CHECKING(whether guile works)
+ AC_TRY_LINK([
+ #include <libguile.h>
+ #include <guile/gh.h>
+ ],[
+ gh_eval_str("(newline)");
+ scm_boot_guile(0,NULL,NULL,NULL);
+ ],[
+ ac_cv_guile_found=yes
+ AC_DEFINE(HAVE_GUILE)
+ ],[
+ ac_cv_guile_found=no
+ ])
+ AC_MSG_RESULT($ac_cv_guile_found)
+
+ if test x$ac_cv_guile_found = xno ; then
+ if test x$1 = xfail ; then
+ AC_MSG_ERROR(Can not find Guile on this system)
+ else
+ AC_MSG_WARN(Can not find Guile on this system)
+ fi
+ ac_cv_guile_found=no
+ GUILE_LIBS= GUILE_INCS=
+ fi
+
+ LIBS="$saved_LIBS"
+ LDFLAGS="$saved_ldflags"
+ CPPFLAGS="$saved_cppflags"
+
+ AC_SUBST(GUILE_LIBS)
+ AM_CONDITIONAL(GUILE, test x$ac_cv_guile_found = xyes)
+ ])
Index: config.h.in
===================================================================
RCS file: /cvsroot/gnupos/gnp-server/config.h.in,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** config.h.in 27 Jan 2003 12:22:17 -0000 1.1.1.1
--- config.h.in 9 Feb 2003 12:36:49 -0000 1.2
***************
*** 10,13 ****
--- 10,14 ----
#undef HAVE_STPCPY
#undef HAVE_LIBSM
+ #undef HAVE_GUILE
#undef PACKAGE_LOCALE_DIR
#undef PACKAGE_DOC_DIR
***************
*** 20,23 ****
--- 21,27 ----
/* Define if you have the <dlfcn.h> header file. */
#undef HAVE_DLFCN_H
+
+ /* Define if you have the m library (-lm). */
+ #undef HAVE_LIBM
/* Name of package */
Index: configure.in
===================================================================
RCS file: /cvsroot/gnupos/gnp-server/configure.in,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** configure.in 27 Jan 2003 12:21:49 -0000 1.1.1.1
--- configure.in 9 Feb 2003 12:36:49 -0000 1.2
***************
*** 8,11 ****
--- 8,13 ----
AM_CONFIG_HEADER(config.h)
+ AM_ACLOCAL_INCLUDE(macros)
+
AC_ISC_POSIX
AC_PROG_CC
***************
*** 18,21 ****
--- 20,24 ----
dnl Checks for libraries.
+ GNOME_CHECK_GUILE
|