Bryan Drewery 22 лет назад
Родитель
Сommit
43c445fab4
3 измененных файлов с 3 добавлено и 55 удалено
  1. 1 3
      Makefile.in
  2. 0 12
      autotools/includes/acinclude.m4
  3. 2 40
      configure

+ 1 - 3
Makefile.in

@@ -9,9 +9,7 @@ VPATH = @srcdir@
 
 @SET_MAKE@
 VERSION = @VERSION@
-CFG = @CFG@
-PACKNAME = @PACKNAME@
-DISTRIB = @PACKNAME@-@VERSION@
+DISTRIB = wraith-@VERSION@
 CCDEPMODE = @CCDEPMODE@
 LEAFEXEC = leaf@EXEEXT@
 HUBEXEC = hub@EXEEXT@

+ 0 - 12
autotools/includes/acinclude.m4

@@ -494,22 +494,10 @@ dnl  EGG_SUBST_VERSION()
 dnl
 AC_DEFUN(EGG_SUBST_VERSION, [dnl
 VERSION=`grep "char" $srcdir/src/main.c | $AWK '/egg_version/ {print [$]5}' | sed -e 's/\"//g' | sed -e 's/\;//g'`
-if ! test -f $cfg; then
- cat << EOF >&2
-configure: error:
-
-  Your pack cfg is missing, please copy it to $srcdir/$cfg
-  Or specify the path to it with: --with-cfg=
-
-EOF
- exit 1
-fi
-PACKNAME=`grep "PACKNAME " $cfg | $AWK '/PACKNAME/ {print [$]2}'`
 version_num=`echo $VERSION | $AWK 'BEGIN {FS = "."} {printf("%d%02d%02d", [$]1, [$]2, [$]3)}'`
 AC_DEFINE_UNQUOTED(EGG_VERSION, $version_num, [Defines the current pack version])dnl
 AC_SUBST(VERSION)dnl
 AC_SUBST(NUMVER)dnl
-AC_SUBST(PACKNAME)dnl
 ])dnl
 
 

+ 2 - 40
configure

@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac Revision: 1.32 .
+# From configure.ac Revision: 1.33 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.59.
 #
@@ -313,7 +313,7 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS egg_ac_parameters CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP CCDEPMODE GCC3 CCDEBUG SET_MAKE HEAD_1 AWK BASENAME OBJCOPY STRIP UNAME DISTCC RESLIB RESINCLUDE ZLIB LIBOBJS VERSION NUMVER PACKNAME CFG WRAP MOD_UPDIR LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS egg_ac_parameters CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP CCDEPMODE GCC3 CCDEBUG SET_MAKE HEAD_1 AWK BASENAME OBJCOPY STRIP UNAME DISTCC RESLIB RESINCLUDE ZLIB LIBOBJS VERSION NUMVER WRAP MOD_UPDIR LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -846,11 +846,6 @@ Optional Features:
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
   --disable-ipv6           disable IPv6 support
 
-Optional Packages:
-  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --with-cfg=PATH      full path to pack.cfg
-
 Some influential environment variables:
   CC          C compiler command
   CFLAGS      C compiler flags
@@ -1334,15 +1329,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
-  cfg="pack/pack.cfg"
-
-# Check whether --with-cfg or --without-cfg was given.
-if test "${with_cfg+set}" = set; then
-  withval="$with_cfg"
-  cfg="$withval"
-fi;
-
-
 # Setup build environment
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -11807,17 +11793,6 @@ fi
 rm -f confcache
 
 VERSION=`grep "char" $srcdir/src/main.c | $AWK '/egg_version/ {print $5}' | sed -e 's/\"//g' | sed -e 's/\;//g'`
-if ! test -f $cfg; then
- cat << EOF >&2
-configure: error:
-
-  Your pack cfg is missing, please copy it to $srcdir/$cfg
-  Or specify the path to it with: --with-cfg=
-
-EOF
- exit 1
-fi
-PACKNAME=`grep "PACKNAME " $cfg | $AWK '/PACKNAME/ {print $2}'`
 version_num=`echo $VERSION | $AWK 'BEGIN {FS = "."} {printf("%d%02d%02d", $1, $2, $3)}'`
 
 cat >>confdefs.h <<_ACEOF
@@ -11825,17 +11800,6 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF
 
 
-CFG="$cfg"
-
-
-
-#for define in `sed -n -e '[s/^+ \([^ ]*\) .*/\1/ p]' $cfg`; do
-# u_define="S_$define"
-# AC_DEFINE_UNQUOTED($u_define)
-#done
-
-
-
 ld_line="-Wl"
 for func in `grep -hrsI __wrap_ src/compat/* | sed -e 's/^__wrap_\(.*\)(.*/\1/'`; do
 
@@ -12548,8 +12512,6 @@ s,@ZLIB@,$ZLIB,;t t
 s,@LIBOBJS@,$LIBOBJS,;t t
 s,@VERSION@,$VERSION,;t t
 s,@NUMVER@,$NUMVER,;t t
-s,@PACKNAME@,$PACKNAME,;t t
-s,@CFG@,$CFG,;t t
 s,@WRAP@,$WRAP,;t t
 s,@MOD_UPDIR@,$MOD_UPDIR,;t t
 s,@LTLIBOBJS@,$LTLIBOBJS,;t t