mirror of
https://github.com/edeproject/ede.git
synced 2023-08-10 21:13:03 +03:00
Updated wrongly named AC_INIT parameter
Removed edeconf.h.in; now is generated by autogen.sh autogen.sh content of configure.in dump moved to dump_config() but is not called by default
This commit is contained in:
parent
e7789fa31e
commit
c102595bcb
24
autogen.sh
24
autogen.sh
@ -1,22 +1,24 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
if aclocal -I m4 && autoheader && autoconf; then
|
dump_config() {
|
||||||
conffile="Jamconfig.in"
|
cat > $1 <<EOF
|
||||||
|
#
|
||||||
echo "#" > $conffile
|
# Do not edit this file. Edit configure.in and m4/*.m4 files
|
||||||
echo "# Do not edit this file. Edit configure.in and *.m4 files" >> $conffile
|
# and run './autogen.sh' again.
|
||||||
echo "# and run './prepare'" >> $conffile
|
#
|
||||||
echo "#" >> $conffile
|
EOF
|
||||||
echo "" >> $conffile
|
|
||||||
|
|
||||||
# a cool trict from autojam
|
# a cool trict from autojam
|
||||||
autoconf --trace=AC_SUBST \
|
autoconf --trace=AC_SUBST \
|
||||||
| sed -e 's/configure.in:[0-9]*:AC_SUBST:\([^:]*\).*/\1 ?= "@\1@" ;/g' \
|
| sed -e 's/configure.in:[0-9]*:AC_SUBST:\([^:]*\).*/\1 ?= "@\1@" ;/g' \
|
||||||
| sed -e '/ac_*/d' -e '/ECHO_*/d' \
|
| sed -e '/ac_*/d' -e '/ECHO_*/d' \
|
||||||
| sort -u \
|
| sort -u \
|
||||||
>> $conffile
|
>> $1
|
||||||
|
|
||||||
echo 'INSTALL_DIR ?= "@INSTALL_DIR@" ;' >> $conffile
|
echo 'INSTALL_DIR ?= "@INSTALL_DIR@" ;' >> $1
|
||||||
|
}
|
||||||
|
|
||||||
|
if aclocal -I m4 && autoheader && autoconf; then
|
||||||
|
#dump_config "Jamconfig.in"
|
||||||
|
|
||||||
# a junk from autoheader
|
# a junk from autoheader
|
||||||
rm -f "edeconf.h.in~"
|
rm -f "edeconf.h.in~"
|
||||||
|
@ -15,7 +15,7 @@ m4_define([ede_version_short], [200])
|
|||||||
m4_define([ede_version], [ede_major_version.ede_minor_version.ede_patch_version])
|
m4_define([ede_version], [ede_major_version.ede_minor_version.ede_patch_version])
|
||||||
|
|
||||||
AC_PREREQ(2.13)
|
AC_PREREQ(2.13)
|
||||||
AC_INIT(edewm, ede_version, [karijes@users.sourceforge.net])
|
AC_INIT(EDE, ede_version, [karijes@users.sourceforge.net])
|
||||||
AC_CONFIG_SRCDIR(COPYING)
|
AC_CONFIG_SRCDIR(COPYING)
|
||||||
AC_CONFIG_HEADER(edeconf.h:edeconf.h.in)
|
AC_CONFIG_HEADER(edeconf.h:edeconf.h.in)
|
||||||
|
|
||||||
|
82
edeconf.h.in
82
edeconf.h.in
@ -1,82 +0,0 @@
|
|||||||
/* edeconf.h.in. Generated from configure.in by autoheader. */
|
|
||||||
|
|
||||||
/* Define 1 if you want native language support */
|
|
||||||
#undef ENABLE_NLS
|
|
||||||
|
|
||||||
/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
|
|
||||||
*/
|
|
||||||
#undef HAVE_DIRENT_H
|
|
||||||
|
|
||||||
/* Define to 1 if you have the <inttypes.h> header file. */
|
|
||||||
#undef HAVE_INTTYPES_H
|
|
||||||
|
|
||||||
/* Define to 1 if you have the <memory.h> header file. */
|
|
||||||
#undef HAVE_MEMORY_H
|
|
||||||
|
|
||||||
/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
|
|
||||||
#undef HAVE_NDIR_H
|
|
||||||
|
|
||||||
/* Define to 1 if you have the <stdint.h> header file. */
|
|
||||||
#undef HAVE_STDINT_H
|
|
||||||
|
|
||||||
/* Define to 1 if you have the <stdlib.h> header file. */
|
|
||||||
#undef HAVE_STDLIB_H
|
|
||||||
|
|
||||||
/* Define to 1 if you have the <strings.h> header file. */
|
|
||||||
#undef HAVE_STRINGS_H
|
|
||||||
|
|
||||||
/* Define to 1 if you have the <string.h> header file. */
|
|
||||||
#undef HAVE_STRING_H
|
|
||||||
|
|
||||||
/* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'.
|
|
||||||
*/
|
|
||||||
#undef HAVE_SYS_DIR_H
|
|
||||||
|
|
||||||
/* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'.
|
|
||||||
*/
|
|
||||||
#undef HAVE_SYS_NDIR_H
|
|
||||||
|
|
||||||
/* Define to 1 if you have the <sys/stat.h> header file. */
|
|
||||||
#undef HAVE_SYS_STAT_H
|
|
||||||
|
|
||||||
/* Define to 1 if you have the <sys/types.h> header file. */
|
|
||||||
#undef HAVE_SYS_TYPES_H
|
|
||||||
|
|
||||||
/* Define to 1 if you have the <unistd.h> header file. */
|
|
||||||
#undef HAVE_UNISTD_H
|
|
||||||
|
|
||||||
/* Define to 1 if you have the <linux/soundcard.h> header file. */
|
|
||||||
#undef HAVE_ALSA
|
|
||||||
|
|
||||||
/* Define to 1 if you have the <time.h> header file and it defines stime() function. */
|
|
||||||
#undef HAVE_STIME
|
|
||||||
|
|
||||||
/* Define 1 if XWindows has Xutf extension. */
|
|
||||||
#undef HAVE_X11_UTF_TEXT_PROP
|
|
||||||
|
|
||||||
/* Define to the address where bug reports for this package should be sent. */
|
|
||||||
#undef PACKAGE_BUGREPORT
|
|
||||||
|
|
||||||
/* Define to the full name of this package. */
|
|
||||||
#undef PACKAGE_NAME
|
|
||||||
|
|
||||||
/* Define to the full name and version of this package. */
|
|
||||||
#undef PACKAGE_STRING
|
|
||||||
|
|
||||||
/* Define to the one symbol short name of this package. */
|
|
||||||
#undef PACKAGE_TARNAME
|
|
||||||
|
|
||||||
/* Define to the version of this package. */
|
|
||||||
#undef PACKAGE_VERSION
|
|
||||||
|
|
||||||
/* Default installation place. Overwrite if you like */
|
|
||||||
#undef PREFIX
|
|
||||||
|
|
||||||
/* Define to 1 if you have the ANSI C header files. */
|
|
||||||
#undef STDC_HEADERS
|
|
||||||
|
|
||||||
/* Short version number */
|
|
||||||
#undef VERSION
|
|
||||||
|
|
||||||
/* Define to 1 if the X Window System is missing or not being used. */
|
|
||||||
#undef X_DISPLAY_MISSING
|
|
Loading…
Reference in New Issue
Block a user