[paragui-cvs] CVS: paragui configure.in,1.10,1.11 paragui.m4,1.2,1.3 paragui2-config.in,1.1,1.2 paragui2.m4,1.2,1.3

[Alexander Pipelka <address@hidden>]

Update of /cvsroot/paragui/paragui
In directory subversions:/tmp/cvs-serv31657

Modified Files:
        configure.in paragui.m4 paragui2-config.in paragui2.m4 
Log Message:
fixed build system



Index: configure.in
===================================================================
RCS file: /cvsroot/paragui/paragui/configure.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** configure.in        25 Jun 2002 21:31:57 -0000      1.10
--- configure.in        26 Jun 2002 08:03:53 -0000      1.11
***************
*** 523,527 ****
  src/widgets/Makefile
  data/Makefile
- test/Makefile
  paragui2.spec
  paragui2-config
--- 523,526 ----

Index: paragui.m4
===================================================================
RCS file: /cvsroot/paragui/paragui/paragui.m4,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** paragui.m4  25 Jun 2002 21:14:48 -0000      1.2
--- paragui.m4  26 Jun 2002 08:03:53 -0000      1.3
***************
*** 7,16 ****
  # Shamelessly stolen from Owen Taylor
  
! dnl AM_PATH_PARAGUI2([MINIMUM-VERSION, [ACTION-IF-FOUND [, 
ACTION-IF-NOT-FOUND]]])
  dnl Test for PARAGUI, and define PARAGUI_CFLAGS and PARAGUI_LIBS
  dnl
  AC_DEFUN(AM_PATH_PARAGUI,
  [dnl 
! dnl Get the cflags and libraries from the paragui-config script
  dnl
  AC_ARG_WITH(paragui-prefix,[  --with-paragui-prefix=PFX   Prefix where 
PARAGUI is installed (optional)],
--- 7,16 ----
  # Shamelessly stolen from Owen Taylor
  
! dnl AM_PATH_PARAGUI([MINIMUM-VERSION, [ACTION-IF-FOUND [, 
ACTION-IF-NOT-FOUND]]])
  dnl Test for PARAGUI, and define PARAGUI_CFLAGS and PARAGUI_LIBS
  dnl
  AC_DEFUN(AM_PATH_PARAGUI,
  [dnl 
! dnl Get the cflags and libraries from the paragui2-config script
  dnl
  AC_ARG_WITH(paragui-prefix,[  --with-paragui-prefix=PFX   Prefix where 
PARAGUI is installed (optional)],

Index: paragui2-config.in
===================================================================
RCS file: /cvsroot/paragui/paragui/paragui2-config.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** paragui2-config.in  25 Jun 2002 21:14:48 -0000      1.1
--- paragui2-config.in  26 Jun 2002 08:03:53 -0000      1.2
***************
*** 43,47 ****
          address@hidden@
        fi
!       echo $includes address@hidden@/paragui @PARAGUI_CFLAGS@
        ;;
      --libs)
--- 43,47 ----
          address@hidden@
        fi
!       echo $includes address@hidden@/paragui2 @PARAGUI_CFLAGS@
        ;;
      --libs)

Index: paragui2.m4
===================================================================
RCS file: /cvsroot/paragui/paragui/paragui2.m4,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** paragui2.m4 25 Jun 2002 21:31:57 -0000      1.2
--- paragui2.m4 26 Jun 2002 08:03:53 -0000      1.3
***************
*** 12,16 ****
  AC_DEFUN(AM_PATH_PARAGUI2,
  [dnl 
! dnl Get the cflags and libraries from the paragui-config2 script
  dnl
  AC_ARG_WITH(paragui-prefix,[  --with-paragui-prefix=PFX   Prefix where 
PARAGUI is installed (optional)],
--- 12,16 ----
  AC_DEFUN(AM_PATH_PARAGUI2,
  [dnl 
! dnl Get the cflags and libraries from the paragui2-config script
  dnl
  AC_ARG_WITH(paragui-prefix,[  --with-paragui-prefix=PFX   Prefix where 
PARAGUI is installed (optional)],
***************
*** 24,28 ****
       paragui_args="$paragui_args --exec-prefix=$paragui_exec_prefix"
       if test x${PARAGUI_CONFIG+set} != xset ; then
!         PARAGUI_CONFIG=$paragui_exec_prefix/bin/paragui-config2
       fi
    fi
--- 24,28 ----
       paragui_args="$paragui_args --exec-prefix=$paragui_exec_prefix"
       if test x${PARAGUI_CONFIG+set} != xset ; then
!         PARAGUI_CONFIG=$paragui_exec_prefix/bin/paragui2-config
       fi
    fi
***************
*** 30,38 ****
       paragui_args="$paragui_args --prefix=$paragui_prefix"
       if test x${PARAGUI_CONFIG+set} != xset ; then
!         PARAGUI_CONFIG=$paragui_prefix/bin/paragui-config2
       fi
    fi
  
!   AC_PATH_PROG(PARAGUI_CONFIG, paragui-config2, no)
    min_paragui_version=ifelse([$1], ,0.11.0,$1)
    AC_MSG_CHECKING(for PARAGUI - version >= $min_paragui_version)
--- 30,38 ----
       paragui_args="$paragui_args --prefix=$paragui_prefix"
       if test x${PARAGUI_CONFIG+set} != xset ; then
!         PARAGUI_CONFIG=$paragui_prefix/bin/paragui2-config
       fi
    fi
  
!   AC_PATH_PROG(PARAGUI_CONFIG, paragui2-config, no)
    min_paragui_version=ifelse([$1], ,0.11.0,$1)
    AC_MSG_CHECKING(for PARAGUI - version >= $min_paragui_version)
***************
*** 57,61 ****
  dnl
  dnl Now check if the installed PARAGUI is sufficiently new. (Also sanity
! dnl checks the results of paragui-config2 to some extent
  dnl
        rm -f conf.paraguitest
--- 57,61 ----
  dnl
  dnl Now check if the installed PARAGUI is sufficiently new. (Also sanity
! dnl checks the results of paragui2-config to some extent
  dnl
        rm -f conf.paraguitest
***************
*** 89,93 ****
    char *tmp_version;
  
!   PG_Application app;
    
    /* This hangs on some systems (?)
--- 89,93 ----
    char *tmp_version;
  
!   PG_Application& app = PG_Application::GetInstance();
    
    /* This hangs on some systems (?)
***************
*** 111,119 ****
    else
      {
!       printf("\n*** 'paragui-config2 --version' returned %d.%d.%d, but the 
minimum version\n", $paragui_major_version, $paragui_minor_version, 
$paragui_micro_version);
!       printf("*** of PARAGUI required is %d.%d.%d. If paragui-config2 is 
correct, then it is\n", major, minor, micro);
        printf("*** best to upgrade to the required version.\n");
!       printf("*** If paragui-config2 was wrong, set the environment variable 
PARAGUI_CONFIG\n");
!       printf("*** to point to the correct copy of paragui-config2, and remove 
the file\n");
        printf("*** config.cache before re-running configure\n");
        return 1;
--- 111,119 ----
    else
      {
!       printf("\n*** 'paragui2-config --version' returned %d.%d.%d, but the 
minimum version\n", $paragui_major_version, $paragui_minor_version, 
$paragui_micro_version);
!       printf("*** of PARAGUI required is %d.%d.%d. If paragui2-config is 
correct, then it is\n", major, minor, micro);
        printf("*** best to upgrade to the required version.\n");
!       printf("*** If paragui2-config was wrong, set the environment variable 
PARAGUI_CONFIG\n");
!       printf("*** to point to the correct copy of paragui2-config, and remove 
the file\n");
        printf("*** config.cache before re-running configure\n");
        return 1;
***************
*** 132,139 ****
       AC_MSG_RESULT(no)
       if test "$PARAGUI_CONFIG" = "no" ; then
!        echo "*** The paragui-config2 script installed by PARAGUI could not be 
found"
         echo "*** If PARAGUI was installed in PREFIX, make sure PREFIX/bin is 
in"
         echo "*** your path, or set the PARAGUI_CONFIG environment variable to 
the"
!        echo "*** full path to paragui-config2."
       else
         if test -f conf.paraguitest ; then
--- 132,139 ----
       AC_MSG_RESULT(no)
       if test "$PARAGUI_CONFIG" = "no" ; then
!        echo "*** The paragui2-config script installed by PARAGUI could not be 
found"
         echo "*** If PARAGUI was installed in PREFIX, make sure PREFIX/bin is 
in"
         echo "*** your path, or set the PARAGUI_CONFIG environment variable to 
the"
!        echo "*** full path to paragui2-config."
       else
         if test -f conf.paraguitest ; then
***************
*** 159,163 ****
            echo "*** exact error that occured. This usually means PARAGUI was 
incorrectly installed"
            echo "*** or that you have moved PARAGUI since it was installed. In 
the latter case, you"
!           echo "*** may want to edit the paragui-config2 script: 
$PARAGUI_CONFIG" ])
            CFLAGS="$ac_save_CFLAGS"
            LIBS="$ac_save_LIBS"
--- 159,163 ----
            echo "*** exact error that occured. This usually means PARAGUI was 
incorrectly installed"
            echo "*** or that you have moved PARAGUI since it was installed. In 
the latter case, you"
!           echo "*** may want to edit the paragui2-config script: 
$PARAGUI_CONFIG" ])
            CFLAGS="$ac_save_CFLAGS"
            LIBS="$ac_save_LIBS"