Changeset 4642 for trunk/osd

Show
Ignore:
Timestamp:
10/01/06 19:14:09 (2 years ago)
Author:
erijo
Message:

Added config.h and removed m4 directory. Now it configures and builds!

Location:
trunk/osd
Files:
1 removed
2 modified

Legend:

Unmodified
Added
Removed

  • trunk/osd/configure.ac

    r4639 r4642  
    11AC_PREREQ(2.57) 
    22AC_INIT(licq_osd_plugin, 1.3.2.1, martinmaurer@gmx.at) 
     3AC_DEFINE([INT_VERSION], [], [Description]) 
    34AC_CONFIG_AUX_DIR(admin) 
    45AC_CANONICAL_SYSTEM 
    … …  
    78AC_CONFIG_SRCDIR([src/my_xosd.h]) 
    89AM_INIT_AUTOMAKE 
     10AM_CONFIG_HEADER([config.h]) 
    911 
    1012dnl Chuck #defines for PACKAGE and VERSION into config.h 
    … …  
    8385LICQ_CHECK_LICQ 
    8486 
    85 AC_OUTPUT( po/Makefile.in m4/Makefile  
     87AC_OUTPUT( po/Makefile.in 
    8688  src/Makefile 
    8789  Makefile 

  • trunk/osd/Makefile.am

    r4641 r4642  
    11AUTOMAKE_OPTIONS = foreign # 1.5 # dist-bzip2 
    2 SUBDIRS = m4 src po 
     2SUBDIRS = src po 
    33 
    44EXTRA_DIST = admin/mkinstalldirs  admin/config.rpath  licq_osd.conf GPL TODO README changelog ABOUT-NLS 
    … …  
    66$(top_srcdir)/acinclude.m4: $(top_srcdir)/acinclude.m4.in $(top_srcdir)/admin/acinclude.m4.in $(top_srcdir)/admin/libtool.m4.in 
    77    @cd $(top_srcdir) && cat acinclude.m4.in admin/acinclude.m4.in admin/libtool.m4.in > acinclude.m4 
    8  
    9 ACLOCAL_AMFLAGS = -I m4