gftp r974 - in trunk: . lib/fsplib

[masneyb svn gnome org]

Author: masneyb
Date: Sat Nov 29 14:18:47 2008
New Revision: 974
URL: http://svn.gnome.org/viewvc/gftp?rev=974&view=rev

Log:
2008-11-29 Brian Masney <masneyb gftp org>
        * More build fixes with the newest version of automake/autoconf


Removed:
   trunk/ltmain.sh
Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/lib/fsplib/Makefile.am

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Sat Nov 29 14:18:47 2008
@@ -33,7 +33,6 @@
 
 AC_CANONICAL_HOST
 AC_PROG_CC
-AC_PROG_LIBTOOL
 AC_EXEEXT
 AC_PROG_RANLIB
 AC_SYS_LARGEFILE

Modified: trunk/lib/fsplib/Makefile.am
==============================================================================
--- trunk/lib/fsplib/Makefile.am	(original)
+++ trunk/lib/fsplib/Makefile.am	Sat Nov 29 14:18:47 2008
@@ -1,14 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-lib_LTLIBRARIES = libfsplib.la
-libfsplib_la_SOURCES = fsplib.c lock.c
-include_HEADERS = fsplib.h
-noinst_HEADERS = lock.h 
-
-# test program
-noinst_PROGRAMS = test
-test_SOURCES = test.c
-test_LDADD   = libfsplib.la
-
-# scons files
-EXTRA_DIST = SConstruct SConscript
+noinst_LIBRARIES = libfsp.a
+libfsp_a_SOURCES=fsplib.c lock.c
+INCLUDES=-DFSP_USE_SHAREMEM_AND_SEMOP=1
+noinst_HEADERS=fsplib.h lock.h