|
From: | shishi-commit |
Subject: | Use m4_include stuff in automake 1.8. [...] |
Date: | Wed, 10 Dec 2003 23:42:24 +0100 |
Commit from jas | 2003-12-10 23:42 CET |
Use m4_include stuff in automake 1.8. Add progname gnulib module. Remove m4 Makefile's.
Module | File name | Revision | |||
---|---|---|---|---|---|
shishi | Makefile.am | 1.56 | >>> | 1.57 | |
shishi | configure.ac | 1.110 | >>> | 1.111 | |
shishi | gl/.cvsignore | 1.4 | >>> | 1.5 | |
shishi | gl/Makefile.am | 1.25 | >>> | 1.26 | |
+ | shishi | gl/progname.c | 1.1 | ||
+ | shishi | gl/progname.h | 1.1 | ||
- | shishi | gl/m4/Makefile.am | 1.11 | ||
shishi | m4/.cvsignore | 1.4 | >>> | 1.5 | |
- | shishi | m4/Makefile.am | 1.7 |
shishi/Makefile.am 1.56 >>> 1.57 |
---|
Line 20 |
DISTCHECK_CONFIGURE_FLAGS = --without-system-asn1 --without-libgcrypt |
- SUBDIRS = m4 po gl |
+ SUBDIRS = po gl |
if ASN1 SUBDIRS += asn1 |
Line 31 |
SUBDIRS += lib db src tests doc |
- DIST_SUBDIRS = m4 po gl asn1 crypto lib src tests doc examples extra |
+ DIST_SUBDIRS = po gl asn1 crypto lib src tests doc examples extra |
ACLOCAL_AMFLAGS = -I m4 -I gl/m4 |
shishi/configure.ac 1.110 >>> 1.111 |
---|
Line 18 |
# the Free Software Foundation, Inc., 59 Temple Place - Suite 330, # Boston, MA 02111-1307, USA. |
- AC_PREREQ(2.59) - AC_INIT([shishi],[0.0.9],address@hidden) |
+ AC_INIT([shishi], [0.0.9], address@hidden) |
# Library code modified: REVISION++ # Interfaces changed/added/removed: CURRENT++ REVISION=0 |
Line 32 |
AC_SUBST(LT_REVISION) AC_SUBST(LT_AGE) |
- AM_INIT_AUTOMAKE(gnits) |
+ AC_PREREQ(2.59) + AM_INIT_AUTOMAKE([1.8 gnits]) |
AC_CONFIG_HEADERS(config.h) # Checks for header files. |
Line 410 |
esac]) AC_MSG_NOTICE([user database root path $DBDIR]) |
- AC_CONFIG_FILES(Makefile po/Makefile.in m4/Makefile \ |
+ AC_CONFIG_FILES(Makefile po/Makefile.in \ |
asn1/Makefile crypto/Makefile examples/Makefile \ lib/Makefile lib/shishi.h db/Makefile src/Makefile tests/Makefile \ doc/Makefile doc/reference/Makefile \ extra/Makefile extra/pam_shishi/Makefile extra/rsh-redone/Makefile \ |
- gl/Makefile gl/m4/Makefile shishi.pc \ - shishi.conf shishi.skel shisa.conf) |
+ gl/Makefile shishi.pc shishi.conf shishi.skel shisa.conf) |
# We are done AC_OUTPUT |
shishi/gl/.cvsignore 1.4 >>> 1.5 |
---|
Line 1 |
- Makefile - Makefile.in |
alloca.h sysexits.h *.lo |
shishi/gl/Makefile.am 1.25 >>> 1.26 |
---|
Line 1 |
+ ## Process this file with automake to produce Makefile.in. + + # GNULIB modules: |
# strnlen strndup mempcpy alloca argp error gethostname getopt memmove memset realloc setenv strcase strchrnul strdup strerror sysexits vasprintf vasnprintf xalloc xstrndup getdate timegm linebuffer xgethostname xgetdomainname getline xreadlink |
+ + # Local not-yet-in-gnulib modules: |
# + base64 (x)memdup |
+ # After using gnulib-tool, do: |
# s/libfoo_a/libfoo_la/g # s/libfoo.a/libfoo.la/ # s/libfoo_a_LIBADD = @LIBOBJS@//g |
Line 8 |
# s/@LIBOBJS@/@LTLIBOBJS@/g # s/noinst_LIBRARIES/noinst_LTLIBRARIES/g |
- SUBDIRS = m4 - - ## Process this file with automake to produce Makefile.in. - |
AUTOMAKE_OPTIONS = 1.5 gnits no-dependencies noinst_LTLIBRARIES = libfoo.la |
Line 70 |
|
+ libfoo_la_SOURCES += progname.h progname.c + |
|
shishi/gl/progname.c 1.1 |
---|
Line 0 |
+ /* Program name management. + Copyright (C) 2001-2003 Free Software Foundation, Inc. + Written by Bruno Haible <address@hidden>, 2001. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software Foundation, + Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + + + #ifdef HAVE_CONFIG_H + # include "config.h" + #endif + + /* Specification. */ + #include "progname.h" + + #include <string.h> + + #undef set_program_name + + + /* String containing name the program is called with. + To be initialized by main(). */ + const char *program_name; + + /* Set program_name, based on argv[0]. */ + void + set_program_name (const char *argv0) + { + /* libtool creates a temporary executable whose name is sometimes prefixed + with "lt-" (depends on the platform). It also makes argv[0] absolute. + Remove this "<dirname>/.libs/" or "<dirname>/.libs/lt-" prefix here. */ + const char *slash; + const char *base; + + slash = strrchr (argv0, '/'); + base = (slash != NULL ? slash + 1 : argv0); + if (base - argv0 >= 7 && memcmp (base - 7, "/.libs/", 7) == 0) + argv0 = base; + if (strncmp (base, "lt-", 3) == 0) + argv0 = base + 3; + program_name = argv0; + } |
shishi/gl/progname.h 1.1 |
---|
Line 0 |
+ /* Program name management. + Copyright (C) 2001-2003 Free Software Foundation, Inc. + Written by Bruno Haible <address@hidden>, 2001. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software Foundation, + Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + + #ifndef _PROGNAME_H + #define _PROGNAME_H + + #include <stdbool.h> + + /* Programs using this file should do the following in main(): + set_program_name (argv[0]); + */ + + /* String containing name the program is called with. */ + extern const char *program_name; + + /* Set program_name, based on argv[0]. */ + extern void set_program_name (const char *argv0); + + #if ENABLE_RELOCATABLE + + /* Set program_name, based on argv[0], and original installation prefix and + directory, for relocatability. */ + extern void set_program_name_and_installdir (const char *argv0, + const char *orig_installprefix, + const char *orig_installdir); + #define set_program_name(ARG0) \ + set_program_name_and_installdir (ARG0, INSTALLPREFIX, INSTALLDIR) + + /* Return the full pathname of the current executable, based on the earlier + call to set_program_name_and_installdir. Return NULL if unknown. */ + extern char *get_full_program_name (void); + + #endif + + #endif /* _PROGNAME_H */ |
shishi/m4/.cvsignore 1.4 >>> 1.5 |
---|
Line 1 |
- Makefile - Makefile.in |
codeset.m4 gettext.m4 glibc21.m4 |
[Prev in Thread] | Current Thread | [Next in Thread] |