[prev in list] [next in list] [prev in thread] [next in thread]
List: klik-devel
Subject: [klik-devel] [klikclient commit] r1640 - in
From: codesite-noreply () google ! com
Date: 2008-08-20 8:55:55
Message-ID: 001636458c8659200f0454e05f15 () google ! com
[Download RAW message or body]
Author: cristian.debian
Date: Wed Aug 20 01:55:14 2008
New Revision: 1640
Added:
branches/cristian/fusioniso/fusioniso/Makefile.am
branches/cristian/fusioniso/fusioniso/configure.ac
branches/cristian/fusioniso/fusioniso/linux/Makefile.am
branches/cristian/fusioniso/fusioniso/src/Makefile.am
Removed:
branches/cristian/fusioniso/fusioniso/Makefile.in
branches/cristian/fusioniso/fusioniso/aclocal.m4
branches/cristian/fusioniso/fusioniso/config.guess
branches/cristian/fusioniso/fusioniso/config.h.in
branches/cristian/fusioniso/fusioniso/config.sub
branches/cristian/fusioniso/fusioniso/configure
branches/cristian/fusioniso/fusioniso/configure.in
branches/cristian/fusioniso/fusioniso/depcomp
branches/cristian/fusioniso/fusioniso/install-sh
branches/cristian/fusioniso/fusioniso/ltmain.sh
branches/cristian/fusioniso/fusioniso/man/fusioniso.1
branches/cristian/fusioniso/fusioniso/missing
branches/cristian/fusioniso/fusioniso/mkinstalldirs
branches/cristian/fusioniso/fusioniso/src/Makefile.in
branches/cristian/fusioniso/fusioniso/src/Makefile.klik2
Modified:
branches/cristian/fusioniso/fusioniso/INSTALL
branches/cristian/fusioniso/fusioniso/man/Makefile.am
Log:
fix and rewrote build system based on autotools
Modified: branches/cristian/fusioniso/fusioniso/INSTALL
==============================================================================
--- branches/cristian/fusioniso/fusioniso/INSTALL (original)
+++ branches/cristian/fusioniso/fusioniso/INSTALL Wed Aug 20 01:55:14 2008
@@ -1,167 +1,15 @@
-Basic Installation
-==================
+If you obtained fusioniso from the svn repository you need the following
+software:
- These are generic installation instructions.
+- autoconf 2.60
+- automake 1.10
- The `configure' shell script attempts to guess correct values for
-various system-dependent variables used during compilation. It uses
-those values to create a `Makefile' in each directory of the package.
-It may also create one or more `.h' files containing system-dependent
-definitions. Finally, it creates a shell script `config.status' that
-you can run in the future to recreate the current configuration, a file
-`config.cache' that saves the results of its tests to speed up
-reconfiguring, and a file `config.log' containing compiler output
-(useful mainly for debugging `configure').
+In order to create the configure script and related files you can use the
+following command:
- If you need to do unusual things to compile the package, please try
-to figure out how `configure' could check whether to do them, and mail
-diffs or instructions to the address given in the `README' so they can
-be considered for the next release. If at some point `config.cache'
-contains results you don't want to keep, you may remove or edit it.
+$ autoreconf -i
- The file `configure.in' is used to create `configure' by a program
-called `autoconf'. You only need `configure.in' if you want to change
-it or regenerate `configure' using a newer version of `autoconf'.
-
-The simplest way to compile this package is:
-
- 1. `cd' to the directory containing the package's source code and type
- `./configure' to configure the package for your system. If you're
- using `csh' on an old version of System V, you might need to type
- `sh ./configure' instead to prevent `csh' from trying to execute
- `configure' itself.
-
- Running `configure' takes a while. While running, it prints some
- messages telling which features it is checking for.
-
- 2. Type `make' to compile the package.
-
- 3. Type `make install' to install the programs and any data files and
- documentation.
-
- 4. You can remove the program binaries and object files from the
- source code directory by typing `make clean'.
-
-Compilers and Options
-=====================
-
- Some systems require unusual options for compilation or linking that
-the `configure' script does not know about. You can give `configure'
-initial values for variables by setting them in the environment. Using
-a Bourne-compatible shell, you can do that on the command line like
-this:
- CC=c89 CFLAGS=-O2 LIBS=-lposix ./configure
-
-Or on systems that have the `env' program, you can do it like this:
- env CPPFLAGS=-I/usr/local/include LDFLAGS=-s ./configure
-
-Compiling For Multiple Architectures
-====================================
-
- You can compile the package for more than one kind of computer at the
-same time, by placing the object files for each architecture in their
-own directory. To do this, you must use a version of `make' that
-supports the `VPATH' variable, such as GNU `make'. `cd' to the
-directory where you want the object files and executables to go and run
-the `configure' script. `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'.
-
- If you have to use a `make' that does not supports the `VPATH'
-variable, you have to compile the package for one architecture at a time
-in the source code directory. After you have installed the package for
-one architecture, use `make distclean' before reconfiguring for another
-architecture.
-
-Installation Names
-==================
-
- By default, `make install' will install the package's files in
-`/usr/local/bin', `/usr/local/man', etc. You can specify an
-installation prefix other than `/usr/local' by giving `configure' the
-option `--prefix=PATH'.
-
- You can specify separate installation prefixes for
-architecture-specific files and architecture-independent files. If you
-give `configure' the option `--exec-prefix=PATH', the package will use
-PATH as the prefix for installing programs and libraries.
-Documentation and other data files will still use the regular prefix.
-
- If the package supports it, you can cause programs to be installed
-with an extra prefix or suffix on their names by giving `configure' the
-option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
-
-Optional Features
-=================
-
- Some packages pay attention to `--enable-FEATURE' options to
-`configure', where FEATURE indicates an optional part of the package.
-They may also pay attention to `--with-PACKAGE' options, where PACKAGE
-is something like `gnu-as' or `x' (for the X Window System). The
-`README' should mention any `--enable-' and `--with-' options that the
-package recognizes.
-
- For packages that use the X Window System, `configure' can usually
-find the X include and library files automatically, but if it doesn't,
-you can use the `configure' options `--x-includes=DIR' and
-`--x-libraries=DIR' to specify their locations.
-
-Specifying the System Type
-==========================
-
- There may be some features `configure' can not figure out
-automatically, but needs to determine by the type of host the package
-will run on. Usually `configure' can figure that out, but if it prints
-a message saying it can not guess the host type, give it the
-`--host=TYPE' option. TYPE can either be a short name for the system
-type, such as `sun4', or a canonical name with three fields:
- CPU-COMPANY-SYSTEM
-
-See the file `config.sub' for the possible values of each field. If
-`config.sub' isn't included in this package, then this package doesn't
-need to know the host type.
-
- If you are building compiler tools for cross-compiling, you can also
-use the `--target=TYPE' option to select the type of system they will
-produce code for and the `--build=TYPE' option to select the type of
-system on which you are compiling the package.
-
-Sharing Defaults
-================
-
- If you want to set default values for `configure' scripts to share,
-you can create a site shell script called `config.site' that gives
-default values for variables like `CC', `cache_file', and `prefix'.
-`configure' looks for `PREFIX/share/config.site' if it exists, then
-`PREFIX/etc/config.site' if it exists. Or, you can set the
-`CONFIG_SITE' environment variable to the location of the site script.
-A warning: not all `configure' scripts look for a site script.
-
-Operation Controls
-==================
-
- `configure' recognizes the following options to control how it
-operates.
-
-`--cache-file=FILE'
- Use and save the results of the tests in FILE instead of
- `./config.cache'. Set FILE to `/dev/null' to disable caching, for
- debugging `configure'.
-
-`--help'
- Print a summary of the options to `configure', and exit.
-
-`--quiet'
-`--silent'
-`-q'
- Do not print messages saying which checks are being made.
-
-`--srcdir=DIR'
- Look for the package's source code in directory DIR. Usually
- `configure' can determine that directory automatically.
-
-`--version'
- Print the version of Autoconf used to generate the `configure'
- script, and exit.
-
-`configure' also accepts some other, not widely useful, options.
+After that, or if you obtained fusioniso from the official tarballs, the
usual
+autotools command apply:
+$ ./configure && make && make install
Added: branches/cristian/fusioniso/fusioniso/Makefile.am
==============================================================================
--- (empty file)
+++ branches/cristian/fusioniso/fusioniso/Makefile.am Wed Aug 20 01:55:14
2008
@@ -0,0 +1,10 @@
+SUBDIRS = linux man src
+EXTRA_DIST = fusioniso.spec
+
+extraclean: maintainer-clean
+ rm -rf aclocal.m4 autom4te.cache autoscan.log configure.scan \
+ config.h.in* configure depcomp install-sh Makefile.in \
+ config.guess config.sub \
+ ltmain.sh missing `find . -name Makefile.in` \
+ fusioniso-*.tar.gz \
+ fusioniso-*.tar.bz2
Added: branches/cristian/fusioniso/fusioniso/configure.ac
==============================================================================
--- (empty file)
+++ branches/cristian/fusioniso/fusioniso/configure.ac Wed Aug 20 01:55:14
2008
@@ -0,0 +1,75 @@
+# -*- Autoconf -*-
+# Process this file with autoconf to produce a configure script.
+
+AC_PREREQ(2.60)
+AC_INIT([fusioniso], [0.1], [klik.atekon.de@googlemail.com])
+AM_INIT_AUTOMAKE([-Wall -Werror foreign dist-bzip2 1.10])
+AC_CONFIG_SRCDIR([src/fusemain.c])
+AC_CONFIG_HEADER([config.h])
+
+# Checks for programs.
+AC_PROG_CC
+AC_PROG_CXX
+AC_PROG_CPP
+AC_PROG_LIBTOOL
+AC_PROG_INSTALL
+AC_PROG_LN_S
+AC_PROG_MAKE_SET
+
+# Checks for libraries.
+PKG_CHECK_MODULES(FUSE, fuse)
+AC_SUBST(FUSE_LIBS)
+AC_SUBST(FUSE_CFLAGS)
+
+PKG_CHECK_MODULES(GLIB2, glib-2.0)
+AC_SUBST(GLIB2_LIBS)
+AC_SUBST(GLIB2_CFLAGS)
+
+AC_CHECK_LIB([z], [uncompress],,
+ [AC_MSG_ERROR([Can't find zlib, please install it])])
+
+AC_MSG_CHECKING([if FUSE on this system is too new for us])
+AC_EGREP_CPP([yes], [
+#include "fuse.h"
+#if FUSE_VERSION > 26
+yes
+#endif
+], AC_DEFINE([FUSE_USE_VERSION], [26], [Version of FUSE interface])
AC_MSG_RESULT([yes]),
+ AC_DEFINE([FUSE_USE_VERSION], [FUSE_VERSION], [Version of FUSE
interface]) AC_MSG_RESULT([no]))
+
+# Checks for header files.
+AC_HEADER_DIRENT
+AC_HEADER_STDC
+AC_CHECK_HEADERS([fcntl.h langinfo.h locale.h mntent.h stdlib.h string.h
sys/param.h sys/statfs.h unistd.h utime.h])
+
+# Checks for typedefs, structures, and compiler characteristics.
+AC_HEADER_STDBOOL
+AC_C_CONST
+AC_TYPE_UID_T
+AC_C_INLINE
+AC_TYPE_MODE_T
+AC_TYPE_OFF_T
+AC_TYPE_SIZE_T
+AC_TYPE_SSIZE_T
+AC_CHECK_MEMBERS([struct stat.st_blksize])
+AC_STRUCT_ST_BLOCKS
+AC_STRUCT_TM
+
+# Checks for library functions.
+AC_FUNC_CHOWN
+AC_FUNC_CLOSEDIR_VOID
+AC_FUNC_GETMNTENT
+AC_FUNC_LSTAT
+AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK
+AC_FUNC_MALLOC
+AC_FUNC_MEMCMP
+AC_FUNC_MKTIME
+AC_FUNC_STAT
+AC_FUNC_UTIME_NULL
+AC_CHECK_FUNCS([atexit ftruncate getmntent memset mkdir nl_langinfo
realpath rmdir setlocale strdup strerror strstr utime])
+
+AC_CONFIG_FILES([Makefile
+ linux/Makefile
+ man/Makefile
+ src/Makefile])
+AC_OUTPUT
Added: branches/cristian/fusioniso/fusioniso/linux/Makefile.am
==============================================================================
--- (empty file)
+++ branches/cristian/fusioniso/fusioniso/linux/Makefile.am Wed Aug 20
01:55:14 2008
@@ -0,0 +1 @@
+noinst_HEADERS = iso_fs.h rock.h
Modified: branches/cristian/fusioniso/fusioniso/man/Makefile.am
==============================================================================
--- branches/cristian/fusioniso/fusioniso/man/Makefile.am (original)
+++ branches/cristian/fusioniso/fusioniso/man/Makefile.am Wed Aug 20
01:55:14 2008
@@ -1,3 +1,9 @@
-AUTOMAKE_OPTIONS=foreign
+dist_noinst_SCRIPTS = makeman.sh fusioniso.pod
-man_MANS = fusioniso.1
+BUILT_SOURCES = fusioniso.1
+CLEANFILE = fusioniso.1
+
+fusioniso.1: makeman.sh
+ ./makeman.sh
+
+dist_man1_MANS = fusioniso.1
Added: branches/cristian/fusioniso/fusioniso/src/Makefile.am
==============================================================================
--- (empty file)
+++ branches/cristian/fusioniso/fusioniso/src/Makefile.am Wed Aug 20
01:55:14 2008
@@ -0,0 +1,29 @@
+moddir = $(libdir)/umview/modules
+
+DEVELFLAGS =
+
+COMMONSOURCES = fusemain.c \
+ fs.c \
+ isofs.c
+
+AM_CFLAGS = $(GLIB2_CFLAGS) $(FUSE_CFLAGS) -Wall #-ggdb
+AM_LDFLAGS = -module -avoid-version -export-dynamic
+AM_LIBTOOLFLAGS = --tag=disable-static
+AM_CPPFLAGS = -I$(includedir)/umview -D_FILE_OFFSET_BITS=64 $(DEVELFLAGS)
+
+bin_PROGRAMS = fusioniso
+mod_LTLIBRARIES = umfuse_fusioniso.la
+
+noinst_HEADERS = fs.h isofs.h
+
+fusioniso_SOURCES = $(COMMONSOURCES)
+fusioniso_LDFLAGS = $(GLIB2_LIBS) $(FUSE_LIBS) -lz -lpthread
+# Leave this also if it seems a no-op
+fusioniso_CFLAGS = $(AM_CFLAGS)
+
+umfuse_fusioniso_la_SOURCES = $(COMMONSOURCES)
+umfuse_fusioniso_la_LDFLAGS = $(AM_LDFLAGS) $(GLIB2_LIBS) $(FUSE_LIBS) -lz
-lpthread #-shared
+umfuse_fusioniso_la_CPPFLAGS = $(AM_CPPFLAGS) -D_EXPERIMENTAL_
+
+install-data-hook:
+ cd "$(DESTDIR)/$(moddir)" && rm -f $(mod_LTLIBRARIES)
_______________________________________________
klik-devel mailing list
klik-devel@kde.org
https://mail.kde.org/mailman/listinfo/klik-devel
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic